diff --git a/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/init.d/S25_Net b/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/init.d/S25_Net index 9bb180826..1431d2a01 100755 --- a/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/init.d/S25_Net +++ b/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/init.d/S25_Net @@ -16,7 +16,7 @@ do_wifi_init() #/etc/init.d/BS_Net_wifiap8189ftv if [ "${SF_BOOT_MODE}" = "${SF_HUNTING_BOOT_MODE}" ]; then echo "Configuring BS_Net_wifiap8189ftv sf start" - /etc/init.d/BS_Net_wifiap8189ftv + #/etc/init.d/BS_Net_wifiap8189ftv else echo "Configuring BS_Net_wifiap8189ftv sf stop" fi diff --git a/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/IOCfg.h b/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/IOCfg.h index 19d13afc3..1147df5c6 100755 --- a/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/IOCfg.h +++ b/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/IOCfg.h @@ -344,6 +344,7 @@ extern BOOL GPIOMap_DetPoweroff(void); #define SF_ADC_MUXA DSI_GPIO_0 #define SF_ADC_MUXB DSI_GPIO_1 +#define SF_WIFI_EN P_GPIO_11 #define LED_FOCUS_CTRL LED_RED_DUMMY #define GPIO_FOCUS_LED x_GPIO_x //FPGA diff --git a/code/application/source/sf_app/code/include/sf_hal_gpio.h b/code/application/source/sf_app/code/include/sf_hal_gpio.h old mode 100644 new mode 100755 index 6e2c45585..d2f930a90 --- a/code/application/source/sf_app/code/include/sf_hal_gpio.h +++ b/code/application/source/sf_app/code/include/sf_hal_gpio.h @@ -27,6 +27,8 @@ void sf_usb_mux_s(UINT32 cnt); int sf_app_pir_statu_read(void); UINT32 sf_app_data_ready_read(void); + +void sf_set_wifi_en(UINT32 cnt); #ifdef __cplusplus #if __cplusplus } diff --git a/code/application/source/sf_app/code/source/app/sf_app.c b/code/application/source/sf_app/code/source/app/sf_app.c index 00248ee90..de4d24fff 100755 --- a/code/application/source/sf_app/code/source/app/sf_app.c +++ b/code/application/source/sf_app/code/source/app/sf_app.c @@ -157,6 +157,7 @@ int main(int argc, char *argv[]) #if SF_IQ_TEST != ENABLE if((0 == isUpdate) && (puiPara->GprsSwitch)) { + sf_set_wifi_en(1); sf_4G_usb_init(); app_RegisterNet_start(); } diff --git a/code/application/source/sf_app/code/source/gpio/sf_hal_gpio.c b/code/application/source/sf_app/code/source/gpio/sf_hal_gpio.c old mode 100644 new mode 100755 index f219ee990..67758310e --- a/code/application/source/sf_app/code/source/gpio/sf_hal_gpio.c +++ b/code/application/source/sf_app/code/source/gpio/sf_hal_gpio.c @@ -182,6 +182,19 @@ UINT32 sf_app_data_ready_read(void) }*/ return gpio_getPin(GPIO_KEY_DATAREADY); } + +void sf_set_wifi_en(UINT32 cnt) +{ + static UINT8 state = 0; + if(0 == state) + { + state = 1; + gpio_direction_output(SF_WIFI_EN, 1); + } + gpio_set_value(SF_WIFI_EN, cnt); + printf("[%s:%d] e cnt:%d\n", __FUNCTION__, __LINE__,cnt); +} + #ifdef __cplusplus #if __cplusplus } 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 36ee1c745..3c2789b66 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 @@ -2600,14 +2600,14 @@ int sf_getb_mac(char *ifName, UINT8 *pbMacAddr) sock = socket(AF_INET, SOCK_STREAM, 0); if(sock < 0) { - MLOGE("error sock"); + MLOGE("error sock\n"); return 2; } strcpy(ifreq.ifr_name, ifName); if(ioctl(sock,SIOCGIFHWADDR,&ifreq) < 0) { - MLOGE("error ioctl"); + MLOGE("error ioctl\n"); return 3; } @@ -2635,10 +2635,16 @@ void sf_wifi_hw_init(void) if((WIFI_TYPE_8723DS == wifitype) || (WIFI_TYPE_8189FS == wifitype)) { //ret = system("insmod /appfs/8189fs.ko"); - - //ret = system("modprobe 8189fs"); + if((WIFI_TYPE_8189FS == wifitype)) + { + ret = system("modprobe 8189fs"); + } + else + { + ret = system("modprobe 8723ds"); + } //sleep(2); - //ret = system("ifconfig lo 127.0.0.1"); + ret = system("ifconfig lo 127.0.0.1"); sf_getb_mac(SF_WIFI_NETDEV_8189_NAME, smac); // ret = system("ifconfig ap0 192.168.1.1 netmask 255.255.255.0 up");