diff --git a/code/lib/source/sifar/code/source/common/sf_common.c b/code/lib/source/sifar/code/source/common/sf_common.c index aa6427f95..afb53979c 100755 --- a/code/lib/source/sifar/code/source/common/sf_common.c +++ b/code/lib/source/sifar/code/source/common/sf_common.c @@ -329,14 +329,14 @@ UINT8 sf_get_fw_update(void) void sf_set_fw_update(UINT8 flag) { - SF_MESSAGE_BUF_S stMessageBuf = {0}; + /*SF_MESSAGE_BUF_S stMessageBuf = {0}; if(FwUpdate != flag) { stMessageBuf.arg2 = flag; stMessageBuf.arg1 = SF_PARA_CMD_FWUP; stMessageBuf.cmdId = CMD_PARA; sf_com_message_send_to_app(&stMessageBuf); - } + }*/ FwUpdate = flag; } @@ -1294,27 +1294,6 @@ BOOL sf_cmd_usb_mux_s(unsigned char argc, char **argv) return TRUE; } -/************************************************* - Function: sf_signal_led_show - Description: signal led show - Input: signal level - Output: N/A - Return: N/A - Others: N/A -*************************************************/ -void sf_signal_led_show(UINT8 signalLevel) -{ - if(signalLevel == 0) - sf_sys_status_led_set(SF_LED_SYS_STATE_GPRS_SIGNAL_0); - else if (signalLevel == 1) - sf_sys_status_led_set(SF_LED_SYS_STATE_GPRS_SIGNAL_1); - else if (signalLevel == 2) - sf_sys_status_led_set(SF_LED_SYS_STATE_GPRS_SIGNAL_2); - else if (signalLevel == 3) - sf_sys_status_led_set(SF_LED_SYS_STATE_GPRS_SIGNAL_3); - else - sf_sys_status_led_set(SF_LED_SYS_STATE_GPRS_SIGNAL_4); -} /************************************************* Function: sf_rtsp_stop Description: @@ -1619,7 +1598,8 @@ static SINT32 sf_cardv_proccess_cmd_wifi(SF_MESSAGE_BUF_S *pMessageBuf) switch(pMessageBuf->arg1) { case SF_WIFI_CMD_START: - sf_cardv_wifi_start(); + if((0 == sf_get_fw_update()) && (sf_get_mode_flag())) + sf_cardv_wifi_start(); break; case SF_WIFI_CMD_STOP: @@ -1998,7 +1978,7 @@ void* sf_sys_do_upgrade(void *arg) } else{ sf_mcu_reg_set(SF_MCU_SOFT_UPDATE, 1); - sf_set_fw_update(1); + //sf_set_fw_update(1); sf_set_send_statu(TRUE); sf_sys_status_led_set(SF_LED_SYS_STATE_UPDATE); //BKG_PostEvent(NVTEVT_BKW_FW_UPDATE); @@ -2011,7 +1991,7 @@ void* sf_sys_do_upgrade(void *arg) Save_MenuInfo(); //sync(); } - //sf_mcu_reg_set(SF_MCU_SOFT_UPDATE, 1); + sf_mcu_reg_set(SF_MCU_SOFT_UPDATE, 0); sf_set_send_statu(FALSE); if(PWR_ON_SETUP == sf_cardv_convert_power_on_mode()){ vos_util_delay_ms(1000); @@ -2019,7 +1999,7 @@ void* sf_sys_do_upgrade(void *arg) } } - sf_set_fw_update(0); + //sf_set_fw_update(0); UpgradeTskParam.IsRun = 2; return NULL;