未验证 提交 6f012541 编写于 作者: armink_ztl's avatar armink_ztl 提交者: GitHub

Merge pull request #1689 from chenyong111/master

 Modify SAL configure judgment, add AT Socket select LIBC.
...@@ -9,20 +9,22 @@ config RT_USING_SAL ...@@ -9,20 +9,22 @@ config RT_USING_SAL
if RT_USING_SAL if RT_USING_SAL
menu "protocol stack implement" if RT_USING_LWIP || AT_USING_SOCKET
config SAL_USING_LWIP menu "protocol stack implement"
bool "Support lwIP stack"
default y if RT_USING_LWIP config SAL_USING_LWIP
default n bool "Support lwIP stack"
depends on RT_USING_LWIP default y
depends on RT_USING_LWIP
config SAL_USING_AT
bool "Support AT Commands stack" config SAL_USING_AT
default y if AT_USING_SOCKET bool "Support AT Commands stack"
default n default y
depends on AT_USING_SOCKET depends on AT_USING_SOCKET
endmenu endmenu
endif
config SAL_USING_POSIX config SAL_USING_POSIX
bool "Enable BSD socket operated by file system API" bool "Enable BSD socket operated by file system API"
......
...@@ -61,6 +61,7 @@ if RT_USING_AT ...@@ -61,6 +61,7 @@ if RT_USING_AT
config AT_USING_SOCKET config AT_USING_SOCKET
bool "Provide similar BSD Socket API by AT" bool "Provide similar BSD Socket API by AT"
select RT_USING_LIBC
default n default n
endif endif
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <sys/time.h>
#include <at_socket.h> #include <at_socket.h>
......
...@@ -23,8 +23,8 @@ if GetDepend('SAL_USING_POSIX'): ...@@ -23,8 +23,8 @@ if GetDepend('SAL_USING_POSIX'):
if not GetDepend('HAVE_SYS_SELECT_H'): if not GetDepend('HAVE_SYS_SELECT_H'):
CPPPATH += [cwd + '/include/dfs_net/sys_select'] CPPPATH += [cwd + '/include/dfs_net/sys_select']
if not GetDepend('HAVE_SYS_SOCKET_H'): if not GetDepend('HAVE_SYS_SOCKET_H'):
CPPPATH += [cwd + '/include/socket/sys_socket'] CPPPATH += [cwd + '/include/socket/sys_socket']
group = DefineGroup('SAL', src, depend = ['RT_USING_SAL'], CPPPATH = CPPPATH) group = DefineGroup('SAL', src, depend = ['RT_USING_SAL'], CPPPATH = CPPPATH)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册