diff --git a/code/application/source/sf_app/code/source/app/sf_system.c b/code/application/source/sf_app/code/source/app/sf_system.c index d3153d0a3..7c81ebd72 100755 --- a/code/application/source/sf_app/code/source/app/sf_system.c +++ b/code/application/source/sf_app/code/source/app/sf_system.c @@ -1317,7 +1317,7 @@ void* sf_sys_do_4g_upgrade(void *arg) } - ModeuleUpgradeTskParam.IsRun = 2; + ModeuleUpgradeTskParam.IsRun = 0; SLOGW("Begin to do 4G Upgrade e\n"); return NULL; @@ -1326,10 +1326,12 @@ void* sf_sys_do_4g_upgrade(void *arg) void sf_do_4g_upgrade_thread(void) { printf("ModeuleUpgradeTskParam.IsRun:%d\n", ModeuleUpgradeTskParam.IsRun); - if(ModeuleUpgradeTskParam.IsRun == 2) + if(ModeuleUpgradeTskParam.IsRun != 0) { - ModeuleUpgradeTskParam.IsRun = 0; - pthread_join(ModeuleUpgradeTskParam.TskId, NULL); + // ModeuleUpgradeTskParam.IsRun = 0; + // pthread_join(ModeuleUpgradeTskParam.TskId, NULL); + SLOGW("4G Upgrade thread run\n"); + return; } if(!ModeuleUpgradeTskParam.IsRun) 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 a4831ccd5..9724c0a24 100755 --- a/code/lib/source/sifar/code/source/common/sf_common.c +++ b/code/lib/source/sifar/code/source/common/sf_common.c @@ -2351,7 +2351,7 @@ void* sf_sys_do_upgrade(void *arg) } //sf_set_fw_update(0); - UpgradeTskParam.IsRun = 2; + UpgradeTskParam.IsRun = 0; return NULL; } @@ -2359,12 +2359,11 @@ void* sf_sys_do_upgrade(void *arg) void sf_do_upgrade_thread(void) { printf("UpgradeTskParam.IsRun:%d\n", UpgradeTskParam.IsRun); - if(UpgradeTskParam.IsRun == 2) + if(UpgradeTskParam.IsRun != 0) { - UpgradeTskParam.IsRun = 0; - pthread_join(UpgradeTskParam.TskId, NULL); + SLOGW("cam Upgrade thread run\n"); + return ; } - if(!UpgradeTskParam.IsRun) { pthread_create(&UpgradeTskParam.TskId, NULL, sf_sys_do_upgrade, NULL);