diff options
| -rw-r--r-- | bsp/simulator/Kconfig | 4 | ||||
| -rw-r--r-- | bsp/simulator/applications/platform.c | 8 | ||||
| -rw-r--r-- | components/net/at/Kconfig | 1 | ||||
| -rw-r--r-- | components/net/lwip/Kconfig | 1 | ||||
| -rw-r--r-- | components/net/sal/Kconfig | 13 | ||||
| -rw-r--r-- | components/net/sal/SConscript | 20 |
6 files changed, 23 insertions, 24 deletions
diff --git a/bsp/simulator/Kconfig b/bsp/simulator/Kconfig index bb19d9575f..7338408a03 100644 --- a/bsp/simulator/Kconfig +++ b/bsp/simulator/Kconfig @@ -31,7 +31,9 @@ config RT_USING_DFS_WINSHAREDIR config BSP_USING_SAL_WINSOCK bool "Enable Windows socket (winsock) with SAL" - select RT_USING_SAL + select RT_USING_POSIX_FS + select RT_USING_POSIX_SOCKET + select SAL_USING_WINSOCK default n config BSP_USING_LVGL diff --git a/bsp/simulator/applications/platform.c b/bsp/simulator/applications/platform.c index 3af1e16a8a..da0d615133 100644 --- a/bsp/simulator/applications/platform.c +++ b/bsp/simulator/applications/platform.c @@ -23,13 +23,13 @@ int platform_init(void) /* initialize sd card */ rt_hw_sdcard_init(); -#if defined(RT_USING_MTD_NAND) +#ifdef RT_USING_MTD_NAND rt_hw_mtd_nand_init(); -#endif +#endif /* RT_USING_MTD_NAND */ -#if defined(RT_USING_MTD_NOR) +#ifdef RT_USING_MTD_NOR sst25vfxx_mtd_init("nor", 0, RT_UINT32_MAX); -#endif +#endif /* RT_USING_MTD_NOR */ #endif /* RT_USING_DFS */ diff --git a/components/net/at/Kconfig b/components/net/at/Kconfig index a1bc7ce066..59a367df4b 100644 --- a/components/net/at/Kconfig +++ b/components/net/at/Kconfig @@ -57,6 +57,7 @@ if RT_USING_AT config AT_USING_SOCKET bool "Enable BSD Socket API support by AT commnads" select RT_USING_SAL + select SAL_USING_AT default n endif diff --git a/components/net/lwip/Kconfig b/components/net/lwip/Kconfig index 78fba33b91..3ead4c43fd 100644 --- a/components/net/lwip/Kconfig +++ b/components/net/lwip/Kconfig @@ -2,6 +2,7 @@ menuconfig RT_USING_LWIP bool "LwIP: light weight TCP/IP stack" select RT_USING_DEVICE select RT_USING_DEVICE_IPC + select SAL_USING_LWIP if RT_USING_SAL default n if RT_USING_LWIP diff --git a/components/net/sal/Kconfig b/components/net/sal/Kconfig index 27a98d48d7..6e7e44f98f 100644 --- a/components/net/sal/Kconfig +++ b/components/net/sal/Kconfig @@ -13,26 +13,21 @@ if RT_USING_SAL The ability that check internet status is provided by RT-Thread. menu "Docking with protocol stacks" - config SAL_USING_LWIP bool "Docking with lwIP stack" - default y - depends on RT_USING_LWIP + default n config SAL_USING_AT bool "Docking with AT commands stack" - default y - depends on AT_USING_SOCKET + default n config SAL_USING_WINSOCK bool "Docking with Windows socket (winsock)" - default y - depends on BSP_USING_SAL_WINSOCK + default n config SAL_USING_TLS bool "Docking with MbedTLS protocol" - default y - depends on PKG_USING_MBEDTLS + default n endmenu config SAL_USING_POSIX diff --git a/components/net/sal/SConscript b/components/net/sal/SConscript index 25788e0bed..2b8164df64 100644 --- a/components/net/sal/SConscript +++ b/components/net/sal/SConscript @@ -5,30 +5,30 @@ from building import * cwd = GetCurrentDir() src = Glob('src/*.c') -src += Glob('socket/net_netdb.c') +src += ['socket/net_netdb.c'] CPPPATH = [cwd + '/include'] CPPPATH += [cwd + '/include/socket'] +if GetDepend('SAL_USING_LWIP') or GetDepend('SAL_USING_AT'): + CPPPATH += [cwd + '/docking'] + if GetDepend('SAL_USING_LWIP'): - src += Glob('docking/af_inet_lwip.c') + src += ['docking/af_inet_lwip.c'] if GetDepend('SAL_USING_AT'): - src += Glob('docking/af_inet_at.c') - -if GetDepend('SAL_USING_LWIP') or GetDepend('SAL_USING_AT'): - CPPPATH += [cwd + '/docking'] + src += ['docking/af_inet_at.c'] if GetDepend('SAL_USING_WINSOCK'): - src += Glob('docking/af_inet_winsock.c') + src += ['docking/af_inet_winsock.c'] if GetDepend('SAL_USING_TLS'): - src += Glob('docking/proto_mbedtls.c') + src += ['docking/proto_mbedtls.c'] if GetDepend('SAL_USING_POSIX'): CPPPATH += [cwd + '/include/dfs_net'] - src += Glob('socket/net_sockets.c') - src += Glob('dfs_net/*.c') + src += ['socket/net_sockets.c'] + src += ['dfs_net/*.c'] if not GetDepend('HAVE_SYS_SOCKET_H'): CPPPATH += [cwd + '/include/socket/sys_socket'] |