Merge branch 'Branch_S530' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S530
This commit is contained in:
commit
8690cc72b8
|
@ -550,7 +550,7 @@ unsigned char sf_mcu_reg_set(MCUParam_t attrId, unsigned char val)
|
|||
//instant mode ,dp power on, 4G mode should power down
|
||||
temp &= ~0x60; /*bit5&bit6=0,daily mode*/
|
||||
}
|
||||
else if(simCardInsert && (puiPara->GprsMode == 1) && gModuleSleep)
|
||||
else if((simCardInsert && (puiPara->GprsMode == 1) && gModuleSleep) || (paraSyncFlag))
|
||||
{
|
||||
temp |= 0x40; /*bit6=1,instant mode*/
|
||||
}
|
||||
|
|
|
@ -249,8 +249,8 @@ static SINT32 hal_ttyusb_read(SINT32 fd, SF_CHAR *recvBuf, SINT32 waitTime)
|
|||
SINT32 s32ret = 0;
|
||||
fd_set read_fds;
|
||||
struct timeval TimeoutVal;
|
||||
// if(waitTime > 0)
|
||||
// sf_sleep_ms(waitTime);
|
||||
if(waitTime > 0)
|
||||
sf_sleep_ms(waitTime);
|
||||
|
||||
//while(waitTime--)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue
Block a user