Merge branch 'Branch_S550_Fast_Emmc' of http://192.168.6.216/linux-em-group/s530-ntk into Branch_S550_Fast_Emmc
This commit is contained in:
commit
14b2672856
|
@ -964,17 +964,7 @@ unsigned char sf_commu_parse_mcu_data(unsigned char * src, unsigned int len)
|
|||
{
|
||||
sf_set_pir_statu_flag(0);
|
||||
sf_set_module_sleep_flag(0);
|
||||
if((PWR_ON_SETUP != sf_poweron_type_get()) && (PWR_ON_USB!= sf_poweron_type_get()))
|
||||
{
|
||||
printf("[power off] %s(%d)\n", __FUNCTION__, __LINE__);
|
||||
sf_set_power_off_flag(1);
|
||||
//sf_app_battery_stop();
|
||||
system("watchdog -T 1 -t 5 /dev/watchdog");
|
||||
}
|
||||
else
|
||||
{
|
||||
sf_com_message_send_to_cardv(&stMessageBuf);
|
||||
}
|
||||
sf_com_message_send_to_cardv(&stMessageBuf);
|
||||
}
|
||||
else if(0 == stMessageBuf.arg3) //ON->OFF
|
||||
{
|
||||
|
|
|
@ -449,7 +449,7 @@ SINT32 sf_hal_ttyusb2_read_buf(SF_TTY_DATA_TYPE_S *recv)
|
|||
}
|
||||
else if (0 == s32ret) {
|
||||
waitTime--;
|
||||
MLOGW("FIFO select timeout [%d]\n",waitTime);
|
||||
//MLOGW("FIFO select timeout [%d]\n",waitTime);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -804,14 +804,7 @@ void sf_mcu_dataready_ck(UINT8 startMode)
|
|||
gModuleSleep = 0; //power off 4G module
|
||||
sf_set_power_off_flag(1);
|
||||
printf("[power off] %s(%d)\n", __FUNCTION__, __LINE__);
|
||||
if((startMode == 1) && (PWR_ON_AUTO == sf_cardv_convert_power_on_mode()))
|
||||
{
|
||||
system("watchdog -T 1 -t 5 /dev/watchdog");
|
||||
}
|
||||
else
|
||||
{
|
||||
Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 1, 0); //shutdown start
|
||||
}
|
||||
Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 1, 0); //shutdown start
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user