From 30003642015cc4b4216964828dd1af77d91f44b5 Mon Sep 17 00:00:00 2001 From: payton Date: Tue, 12 Dec 2023 19:25:14 +0800 Subject: [PATCH] =?UTF-8?q?1.WiFi=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/sf_app/code/include/sf_wifi_svr.h | 1 + .../sf_app/code/source/wifi/sf_wifi_svr.c | 20 ++++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/code/application/source/sf_app/code/include/sf_wifi_svr.h b/code/application/source/sf_app/code/include/sf_wifi_svr.h index f705dec59..80db93a3f 100755 --- a/code/application/source/sf_app/code/include/sf_wifi_svr.h +++ b/code/application/source/sf_app/code/include/sf_wifi_svr.h @@ -122,6 +122,7 @@ typedef enum WIFI_TYPE_8189FS, WIFI_TYPE_HI3881, WIFI_TYPE_8723DS, + WIFI_TYPE_8723DU, WIFI_TYPE_MAX } WIFI_TYPE_E; diff --git a/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c b/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c index a62c26c74..2842d4836 100755 --- a/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c +++ b/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c @@ -885,10 +885,15 @@ void sf_app_Get_Camera_Info(MSG_DEV_INFO_Get_Rsp_T *camInfo) //printf("[sf_app_Get_Camera_Info],sf_get_iccid\n"); strcpy((char *)camInfo->SimICCID, puiPara->SimIccid); - if(WIFI_TYPE_8189FS == sf_get_wifi_type()) - { - sf_get_mac_addr(SF_WIFI_NETDEV_8189_NAME, camInfo->WifiMac); - }else if(WIFI_TYPE_HI3881 == sf_get_wifi_type()) + if(WIFI_TYPE_8723DU == sf_get_wifi_type()) + { + sf_get_mac_addr(SF_WIFI_NETDEV_8189_NAME, camInfo->WifiMac); + } + else if(WIFI_TYPE_8189FS == sf_get_wifi_type()) + { + sf_get_mac_addr(SF_WIFI_NETDEV_8189_NAME, camInfo->WifiMac); + } + else if(WIFI_TYPE_HI3881 == sf_get_wifi_type()) { sf_get_mac_addr(SF_WIFI_NETDEV_NAME, camInfo->WifiMac); } @@ -2600,8 +2605,9 @@ void sf_get_wifi_ssid(char *ssid) UINT8 sf_get_wifi_type(void) { static int read_flag = 0; - static UINT8 wifi_type = WIFI_TYPE_NONE; + static UINT8 wifi_type = WIFI_TYPE_8723DU; + return wifi_type; if (!read_flag) { read_flag = 1; char str_content[256]={0}; @@ -2702,7 +2708,7 @@ void sf_wifi_hw_init(void) unsigned char wifitype = sf_get_wifi_type(); //ret = system("modprobe cfg80211"); - if((WIFI_TYPE_8723DS == wifitype) || (WIFI_TYPE_8189FS == wifitype)) + if((WIFI_TYPE_8723DU == wifitype) || (WIFI_TYPE_8723DS == wifitype) || (WIFI_TYPE_8189FS == wifitype)) { //ret = system("insmod /appfs/8189fs.ko"); if((WIFI_TYPE_8189FS == wifitype)) @@ -2711,7 +2717,7 @@ void sf_wifi_hw_init(void) } else { - ret = system("modprobe 8723ds"); + ret = system("modprobe 8723du"); } //sleep(2); ret = system("ifconfig lo 127.0.0.1");