Explorar o código

[simulator] enable BSD socket by default

Meco Man %!s(int64=3) %!d(string=hai) anos
pai
achega
7d657cbf46
Modificáronse 3 ficheiros con 64 adicións e 10 borrados
  1. 37 7
      bsp/simulator/.config
  2. 2 2
      bsp/simulator/Kconfig
  3. 25 1
      bsp/simulator/rtconfig.h

+ 37 - 7
bsp/simulator/.config

@@ -78,7 +78,7 @@ CONFIG_RT_USING_DEVICE=y
 CONFIG_RT_USING_CONSOLE=y
 CONFIG_RT_CONSOLEBUF_SIZE=128
 CONFIG_RT_CONSOLE_DEVICE_NAME="console"
-CONFIG_RT_VER_NUM=0x40100
+CONFIG_RT_VER_NUM=0x40101
 # CONFIG_RT_USING_CPU_FFS is not set
 # CONFIG_ARCH_CPU_STACK_GROWS_UPWARD is not set
 
@@ -144,7 +144,9 @@ CONFIG_RT_USING_DFS_DEVFS=y
 # Device Drivers
 #
 CONFIG_RT_USING_DEVICE_IPC=y
-# CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set
+CONFIG_RT_USING_SYSTEM_WORKQUEUE=y
+CONFIG_RT_SYSTEM_WORKQUEUE_STACKSIZE=2048
+CONFIG_RT_SYSTEM_WORKQUEUE_PRIORITY=23
 CONFIG_RT_USING_SERIAL=y
 CONFIG_RT_USING_SERIAL_V1=y
 # CONFIG_RT_USING_SERIAL_V2 is not set
@@ -192,9 +194,9 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
 CONFIG_RT_USING_POSIX_FS=y
 # CONFIG_RT_USING_POSIX_DEVIO is not set
 # CONFIG_RT_USING_POSIX_STDIO is not set
-# CONFIG_RT_USING_POSIX_POLL is not set
-# CONFIG_RT_USING_POSIX_SELECT is not set
-# CONFIG_RT_USING_POSIX_SOCKET is not set
+CONFIG_RT_USING_POSIX_POLL=y
+CONFIG_RT_USING_POSIX_SELECT=y
+CONFIG_RT_USING_POSIX_SOCKET=y
 # CONFIG_RT_USING_POSIX_TERMIOS is not set
 # CONFIG_RT_USING_POSIX_AIO is not set
 # CONFIG_RT_USING_POSIX_MMAN is not set
@@ -219,8 +221,26 @@ CONFIG_RT_USING_POSIX_FS=y
 #
 # Network
 #
-# CONFIG_RT_USING_SAL is not set
-# CONFIG_RT_USING_NETDEV is not set
+CONFIG_RT_USING_SAL=y
+CONFIG_SAL_INTERNET_CHECK=y
+
+#
+# Docking with protocol stacks
+#
+# CONFIG_SAL_USING_LWIP is not set
+# CONFIG_SAL_USING_AT is not set
+CONFIG_SAL_USING_WINSOCK=y
+# CONFIG_SAL_USING_TLS is not set
+CONFIG_SAL_USING_POSIX=y
+CONFIG_RT_USING_NETDEV=y
+CONFIG_NETDEV_USING_IFCONFIG=y
+CONFIG_NETDEV_USING_PING=y
+CONFIG_NETDEV_USING_NETSTAT=y
+CONFIG_NETDEV_USING_AUTO_DEFAULT=y
+# CONFIG_NETDEV_USING_IPV6 is not set
+CONFIG_NETDEV_IPV4=1
+CONFIG_NETDEV_IPV6=0
+# CONFIG_NETDEV_IPV6_SCOPES is not set
 # CONFIG_RT_USING_LWIP is not set
 # CONFIG_RT_USING_AT is not set
 
@@ -297,6 +317,7 @@ CONFIG_RT_USING_POSIX_FS=y
 # CONFIG_PKG_USING_UCLOUD_IOT_SDK is not set
 # CONFIG_PKG_USING_JOYLINK is not set
 # CONFIG_PKG_USING_EZ_IOT_OS is not set
+# CONFIG_PKG_USING_IOTSHARP_SDK is not set
 # CONFIG_PKG_USING_NIMBLE is not set
 # CONFIG_PKG_USING_LLSYNC_SDK_ADAPTER is not set
 # CONFIG_PKG_USING_OTA_DOWNLOADER is not set
@@ -336,6 +357,7 @@ CONFIG_RT_USING_POSIX_FS=y
 #
 # CONFIG_PKG_USING_MBEDTLS is not set
 # CONFIG_PKG_USING_LIBSODIUM is not set
+# CONFIG_PKG_USING_LIBHYDROGEN is not set
 # CONFIG_PKG_USING_TINYCRYPT is not set
 # CONFIG_PKG_USING_TFM is not set
 # CONFIG_PKG_USING_YD_CRYPTO is not set
@@ -449,6 +471,7 @@ CONFIG_RT_USING_POSIX_FS=y
 # CONFIG_PKG_USING_FDT is not set
 # CONFIG_PKG_USING_CBOX is not set
 # CONFIG_PKG_USING_SNOWFLAKE is not set
+# CONFIG_PKG_USING_HASH_MATCH is not set
 
 #
 # system packages
@@ -480,6 +503,7 @@ CONFIG_RT_USING_POSIX_FS=y
 # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard
 #
 # CONFIG_PKG_USING_CMSIS_5 is not set
+# CONFIG_PKG_USING_CMSIS_RTOS1 is not set
 # CONFIG_PKG_USING_CMSIS_RTOS2 is not set
 
 #
@@ -677,6 +701,12 @@ CONFIG_RT_USING_POSIX_FS=y
 # CONFIG_PKG_USING_CONTROLLER is not set
 # CONFIG_PKG_USING_PHASE_LOCKED_LOOP is not set
 # CONFIG_PKG_USING_MFBD is not set
+# CONFIG_PKG_USING_SLCAN2RTT is not set
 CONFIG_SOC_SIMULATOR=y
+
+#
+# Onboard Peripheral Drivers
+#
 CONFIG_RT_USING_DFS_WINSHAREDIR=y
+CONFIG_BSP_USING_SOCKET=y
 # CONFIG_BSP_USING_LVGL is not set

+ 2 - 2
bsp/simulator/Kconfig

@@ -29,14 +29,14 @@ menu "Onboard Peripheral Drivers"
     config RT_USING_DFS_WINSHAREDIR
         bool "Enable shared file system between Windows"
         select RT_USING_POSIX_FS
-        default n
+        default y
 
     config BSP_USING_SOCKET
         bool "Enable BSD Socket"
         select RT_USING_POSIX_FS
         select RT_USING_POSIX_SOCKET
         select SAL_USING_WINSOCK
-        default n
+        default y
 
     config BSP_USING_LVGL
         bool "Enable LVGL for LCD"

+ 25 - 1
bsp/simulator/rtconfig.h

@@ -44,7 +44,7 @@
 #define RT_USING_CONSOLE
 #define RT_CONSOLEBUF_SIZE 128
 #define RT_CONSOLE_DEVICE_NAME "console"
-#define RT_VER_NUM 0x40100
+#define RT_VER_NUM 0x40101
 
 /* RT-Thread Components */
 
@@ -91,6 +91,9 @@
 /* Device Drivers */
 
 #define RT_USING_DEVICE_IPC
+#define RT_USING_SYSTEM_WORKQUEUE
+#define RT_SYSTEM_WORKQUEUE_STACKSIZE 2048
+#define RT_SYSTEM_WORKQUEUE_PRIORITY 23
 #define RT_USING_SERIAL
 #define RT_USING_SERIAL_V1
 #define RT_SERIAL_USING_DMA
@@ -106,6 +109,9 @@
 /* POSIX (Portable Operating System Interface) layer */
 
 #define RT_USING_POSIX_FS
+#define RT_USING_POSIX_POLL
+#define RT_USING_POSIX_SELECT
+#define RT_USING_POSIX_SOCKET
 
 /* Interprocess Communication (IPC) */
 
@@ -115,6 +121,20 @@
 
 /* Network */
 
+#define RT_USING_SAL
+#define SAL_INTERNET_CHECK
+
+/* Docking with protocol stacks */
+
+#define SAL_USING_WINSOCK
+#define SAL_USING_POSIX
+#define RT_USING_NETDEV
+#define NETDEV_USING_IFCONFIG
+#define NETDEV_USING_PING
+#define NETDEV_USING_NETSTAT
+#define NETDEV_USING_AUTO_DEFAULT
+#define NETDEV_IPV4 1
+#define NETDEV_IPV6 0
 
 /* Utilities */
 
@@ -196,7 +216,11 @@
 /* entertainment: terminal games and other interesting software packages */
 
 #define SOC_SIMULATOR
+
+/* Onboard Peripheral Drivers */
+
 #define RT_USING_DFS_WINSHAREDIR
+#define BSP_USING_SOCKET
 #include "rtconfig_project.h"
 
 #endif