Browse Source

Merge pull request #1689 from chenyong111/master

 Modify SAL configure judgment, add AT Socket select LIBC.
朱天龙 (Armink) 6 years ago
parent
commit
6f012541b0

+ 16 - 14
components/net/Kconfig

@@ -9,20 +9,22 @@ config RT_USING_SAL
 
     if RT_USING_SAL
 
-        menu "protocol stack implement"
-
-            config SAL_USING_LWIP
-                bool "Support lwIP stack"
-                default y if RT_USING_LWIP
-                default n
-                depends on RT_USING_LWIP
-
-            config SAL_USING_AT
-                bool "Support AT Commands stack"
-                default y if AT_USING_SOCKET
-                default n
-                depends on AT_USING_SOCKET
-        endmenu
+        if RT_USING_LWIP || AT_USING_SOCKET
+        
+            menu "protocol stack implement"
+
+                config SAL_USING_LWIP
+                    bool "Support lwIP stack"
+                    default y
+                    depends on RT_USING_LWIP
+
+                config SAL_USING_AT
+                    bool "Support AT Commands stack"
+                    default y
+                    depends on AT_USING_SOCKET
+            endmenu
+        
+        endif
 
         config SAL_USING_POSIX
             bool "Enable BSD socket operated by file system API"

+ 1 - 0
components/net/at/Kconfig

@@ -61,6 +61,7 @@ if RT_USING_AT
             
         config AT_USING_SOCKET
             bool "Provide similar BSD Socket API by AT"
+            select RT_USING_LIBC
             default n
     endif
 

+ 1 - 0
components/net/at/at_socket/at_socket.c

@@ -26,6 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include <sys/time.h>
 
 #include <at_socket.h>
 

+ 2 - 2
components/net/sal_socket/SConscript

@@ -23,8 +23,8 @@ if GetDepend('SAL_USING_POSIX'):
     if not GetDepend('HAVE_SYS_SELECT_H'):
         CPPPATH += [cwd + '/include/dfs_net/sys_select']
 
-    if not GetDepend('HAVE_SYS_SOCKET_H'):
-        CPPPATH += [cwd + '/include/socket/sys_socket']
+if not GetDepend('HAVE_SYS_SOCKET_H'):
+    CPPPATH += [cwd + '/include/socket/sys_socket']
 
 group = DefineGroup('SAL', src, depend = ['RT_USING_SAL'], CPPPATH = CPPPATH)