Merge pull request #1 from mysterywolf/winsock

[simulator][sal] improve code

Author: xiangxistu

bsp/simulator/Kconfig

@@ -49,10 +49,6 @@ menu "Peripheral Drivers"
         select SAL_USING_WINSOCK
         default y
 
-    config SAL_USING_WINSOCK
-        bool "Docking with Windows socket (winsock)"
-        default n
-
     config BSP_USING_LVGL
         bool "Enable LVGL for LCD"
         select PKG_USING_LVGL

bsp/simulator/drivers/SConscript

@@ -40,6 +40,8 @@ else:
 
 if GetDepend('BSP_USING_RTC') == False:
     SrcRemove(src, 'drv_rtc.c')
+if GetDepend('BSP_USING_SOCKET') == False:
+    SrcRemove(src, 'drv_win_eth.c')
 if GetDepend('RT_USING_DFS') == False or GetDepend('RT_USING_DFS_ELMFAT') == False:
     SrcRemove(src, 'sd_sim.c')
 if GetDepend('RT_USING_DFS') == False or GetDepend('RT_USING_MTD_NAND') == False:
@@ -50,8 +52,6 @@ if GetDepend('RT_USING_DFS') == False or GetDepend('RT_USING_DFS_WINSHAREDIR') =
     SrcRemove(src, 'dfs_win32.c')
 if GetDepend('RT_USING_DFS') == False or GetDepend('RT_USING_MODULE') == False:
     SrcRemove(src, ['module_win32.c'])
-if GetDepend('SAL_USING_WINSOCK') == False:
-    SrcRemove(src, 'af_inet_winsock.c')
 if sys.platform[0:5]=="linux": #check whether under linux
     SrcRemove(src, ['module_win32.c', 'dfs_win32.c'])
 

components/net/sal/Kconfig

@@ -21,6 +21,10 @@ if RT_USING_SAL
             bool "Docking with AT commands stack"
             default n
 
+        config SAL_USING_WINSOCK
+            bool "Docking with Windows socket (winsock)"
+            default n
+
         config SAL_USING_TLS
             bool "Docking with MbedTLS protocol"
             default n

components/net/sal/SConscript

@@ -10,7 +10,9 @@ src += ['socket/net_netdb.c']
 CPPPATH = [cwd + '/include']
 CPPPATH += [cwd + '/include/socket']
 
-if GetDepend('SAL_USING_LWIP') or GetDepend('SAL_USING_AT'):
+if GetDepend('SAL_USING_LWIP') or \
+   GetDepend('SAL_USING_AT') or \
+   GetDepend('SAL_USING_WINSOCK'):
     CPPPATH += [cwd + '/impl']
 
 if GetDepend('SAL_USING_LWIP'):
@@ -19,6 +21,9 @@ if GetDepend('SAL_USING_LWIP'):
 if GetDepend('SAL_USING_AT'):
     src += ['impl/af_inet_at.c']
 
+if GetDepend('SAL_USING_WINSOCK'):
+    src += ['impl/af_inet_winsock.c']
+
 if GetDepend('SAL_USING_TLS'):
     src += ['impl/proto_mbedtls.c']
 

components/net/sal/impl/af_inet.h

@@ -17,20 +17,21 @@
 extern "C" {
 #endif
 
-#ifdef SAL_USING_LWIP
-
 /* Set lwIP network interface device protocol family information  */
+#ifdef SAL_USING_LWIP
 int sal_lwip_netdev_set_pf_info(struct netdev *netdev);
-
 #endif /* SAL_USING_LWIP */
 
-#ifdef SAL_USING_AT
-
 /* Set AT network interface device protocol family information */
+#ifdef SAL_USING_AT
 int sal_at_netdev_set_pf_info(struct netdev *netdev);
-
 #endif /* SAL_USING_AT */
 
+/* Set lwIP network interface device protocol family information */
+#ifdef SAL_USING_WINSOCK
+int sal_win_netdev_set_pf_info(struct netdev* netdev)
+#endif /* SAL_USING_WINSOCK */
+
 #ifdef __cplusplus
 }
 #endif

bsp/simulator/drivers/af_inet_winsock.c components/net/sal/impl/af_inet_winsock.cbsp/simulator/drivers/af_inet_winsock.c renamed to components/net/sal/impl/af_inet_winsock.c

@@ -8,6 +8,7 @@
  * 2022-05-26     xiangxistu   first version
  */
 
+/* Do NOT include sys/time.h in this file */
 #include <WinSock2.h>
 #include <rtthread.h>
 #include <sal_low_lvl.h>