Browse Source

!336 完善 art-pi smart
Merge pull request !336 from guozhanxin/rt-smart

bernard 4 years ago
parent
commit
eec62578a0

+ 8 - 0
bsp/imx6ull-artpi-smart/drivers/Kconfig

@@ -180,6 +180,14 @@ menu "Select Wifi Driver"
         select PKG_USING_RW007
         select RT_USING_WIFI
         default n
+    if RT_USING_WIFI_RW007
+        config RW007_DAFAULT_SSID
+            string "default ssid"
+            default "rt-thread"
+        config RW007_DAFAULT_PASSWARD
+            string "default passward"
+            default "12345678"
+    endif
 endmenu
 
 endmenu

+ 4 - 0
bsp/imx6ull-artpi-smart/drivers/drv_rw007_port.c

@@ -60,6 +60,10 @@ int wifi_spi_device_init(void)
     rw007_version_get(sn_version);
     rt_kprintf("rw007 ver: [%s]\n\n", sn_version);
 
+#ifdef RW007_DAFAULT_SSID
+    rt_wlan_connect(RW007_DAFAULT_SSID, RW007_DAFAULT_PASSWARD);
+#endif
+
     return 0;
 }
 INIT_APP_EXPORT(wifi_spi_device_init);

+ 4 - 0
components/finsh/Kconfig

@@ -11,6 +11,10 @@ config RT_USING_MSH
 
 if RT_USING_MSH
 
+config FINSH_USING_MSH
+    bool
+    default y
+
 config FINSH_THREAD_NAME
     string "The msh thread name"
     default "tshell"

+ 12 - 0
components/net/sal_socket/src/sal_socket.c

@@ -1021,7 +1021,13 @@ int sal_ioctlsocket(int socket, long cmd, void *arg)
         {
         case SIOCGIFADDR:
             addr_in = (struct sockaddr_in *)&(ifr->ifr_ifru.ifru_addr);
+#if NETDEV_IPV4 && NETDEV_IPV6
             addr_in->sin_addr.s_addr = sock->netdev->ip_addr.u_addr.ip4.addr;
+#elif NETDEV_IPV4
+            addr_in->sin_addr.s_addr = sock->netdev->ip_addr.addr;
+#elif NETDEV_IPV6
+#error "not only support IPV6"
+#endif /* NETDEV_IPV4 && NETDEV_IPV6*/
             return 0;
 
         case SIOCSIFADDR:
@@ -1032,7 +1038,13 @@ int sal_ioctlsocket(int socket, long cmd, void *arg)
 
         case SIOCGIFNETMASK:
             addr_in = (struct sockaddr_in *)&(ifr->ifr_ifru.ifru_netmask);
+#if NETDEV_IPV4 && NETDEV_IPV6
             addr_in->sin_addr.s_addr = sock->netdev->netmask.u_addr.ip4.addr;
+#elif NETDEV_IPV4
+            addr_in->sin_addr.s_addr = sock->netdev->netmask.addr;
+#elif NETDEV_IPV6
+#error "not only support IPV6"
+#endif /* NETDEV_IPV4 && NETDEV_IPV6*/
             return 0;
 
         case SIOCSIFNETMASK: