From b78e9ddae901cb2890e0f816596d2cd454eda3eb Mon Sep 17 00:00:00 2001 From: payton Date: Fri, 21 Jul 2023 22:05:23 +0800 Subject: [PATCH] =?UTF-8?q?1.wifi=E5=90=AF=E5=8A=A8=E6=97=B6=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=BA=BF=E7=A8=8B=EF=BC=8C=E4=BB=A5=E5=85=8D=E5=8D=A1?= =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lib/source/sifar/code/include/sf_common.h | 1 + .../sifar/code/source/common/sf_common.c | 41 +++++++++++++++++-- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/code/lib/source/sifar/code/include/sf_common.h b/code/lib/source/sifar/code/include/sf_common.h index b8a2fb0bf..f6689ddc6 100644 --- a/code/lib/source/sifar/code/include/sf_common.h +++ b/code/lib/source/sifar/code/include/sf_common.h @@ -113,4 +113,5 @@ BOOL sf_cmd_cardv_4g_usb_boot(unsigned char argc, char **argv); BOOL sf_cmd_fs_ro_check(unsigned char argc, char **argv); BOOL sf_check_net_work_flag(void); void sf_save_camera_info(void); +UINT32 sf_cardv_wifi_start(void); #endif 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 3b7cc9398..b91d8b0fa 100644 --- a/code/lib/source/sifar/code/source/common/sf_common.c +++ b/code/lib/source/sifar/code/source/common/sf_common.c @@ -94,6 +94,11 @@ static SF_THREAD_S ParaTskCfg = .IsRun = 0, .TskId = -1, }; +static SF_THREAD_S WifiTskCfg = +{ + .IsRun = 0, + .TskId = -1, +}; int sf_pir_statu_read(void) { @@ -1514,8 +1519,7 @@ static SINT32 sf_cardv_proccess_cmd_mcu(SF_MESSAGE_BUF_S *pMessageBuf) //stMessageBuf.arg1 = SF_WIFI_CMD_START; //stMessageBuf.cmdId = CMD_WIFI; //sf_com_message_send_to_cardv(&stMessageBuf); - UINet_AppIpc_Init(); - sf_net_wifi_init(NET_AP_MODE, NET_AUTH_WPA2); + sf_cardv_wifi_start(); //Ux_SendEvent(0, NVTEVT_EXE_WIFI_START, 0); //sleep(2); //sf_apinfo_thread_init(); @@ -1609,8 +1613,7 @@ static SINT32 sf_cardv_proccess_cmd_wifi(SF_MESSAGE_BUF_S *pMessageBuf) switch(pMessageBuf->arg1) { case SF_WIFI_CMD_START: - UINet_AppIpc_Init(); - sf_net_wifi_init(NET_AP_MODE, NET_AUTH_WPA2); + sf_cardv_wifi_start(); break; case SF_WIFI_CMD_STOP: @@ -2021,6 +2024,7 @@ void* sf_sys_do_upgrade(void *arg) } else { SysResetFlag(); + //sync(); } sf_mcu_reg_set(SF_MCU_SOFT_UPDATE, 1); sf_set_send_statu(FALSE); @@ -2343,3 +2347,32 @@ void sf_save_camera_info(void) #endif } + +void* sf_cardv_wifi_thread(void *arg) +{ + /*wifi init*/ + UINet_AppIpc_Init(); + sf_net_wifi_init(NET_AP_MODE, NET_AUTH_WPA2); + ParaTskCfg.IsRun = 0; + + return NULL; +} + +UINT32 sf_cardv_wifi_start(void) +{ + SINT32 ret = 1; + if(WifiTskCfg.IsRun) + { + SLOGE("thread has already run !!!\n"); + return 1; + } + ret = pthread_create(&WifiTskCfg.TskId, NULL, sf_cardv_wifi_thread, NULL); + if(ret != SF_SUCCESS) + { + MLOGD("thread creat fail!\n"); + return ret; + } + WifiTskCfg.IsRun = 1; + return SF_SUCCESS; + +}