Explorar el Código

[simulator] fix some warnings (#6209)

* [simulator] fix some warnings

comes from https://github.com/RT-Thread/rt-thread/pull/5791

* [simulator] update kconfig

Co-authored-by: guozhanxin <guozhanxin@rt-thread.com>
Man, Jianting (Meco) hace 3 años
padre
commit
760432b6a3

+ 19 - 9
bsp/simulator/.config

@@ -231,7 +231,6 @@ CONFIG_SAL_INTERNET_CHECK=y
 #
 # 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
@@ -353,6 +352,7 @@ CONFIG_NETDEV_IPV6=0
 # CONFIG_PKG_USING_HM is not set
 # CONFIG_PKG_USING_SMALL_MODBUS is not set
 # CONFIG_PKG_USING_NET_SERVER is not set
+# CONFIG_PKG_USING_ZFTP is not set
 
 #
 # security packages
@@ -377,6 +377,7 @@ CONFIG_NETDEV_IPV6=0
 # CONFIG_PKG_USING_RAPIDJSON is not set
 # CONFIG_PKG_USING_JSMN is not set
 # CONFIG_PKG_USING_AGILE_JSMN is not set
+# CONFIG_PKG_USING_PARSON is not set
 
 #
 # XML: Extensible Markup Language
@@ -388,6 +389,7 @@ CONFIG_NETDEV_IPV6=0
 # CONFIG_PKG_USING_JERRYSCRIPT is not set
 # CONFIG_PKG_USING_MICROPYTHON is not set
 # CONFIG_PKG_USING_PIKASCRIPT is not set
+# CONFIG_PKG_USING_RTT_RUST is not set
 
 #
 # multimedia packages
@@ -399,6 +401,7 @@ CONFIG_NETDEV_IPV6=0
 # CONFIG_PKG_USING_LVGL is not set
 # CONFIG_PKG_USING_LITTLEVGL2RTT is not set
 # CONFIG_PKG_USING_LV_MUSIC_DEMO is not set
+# CONFIG_PKG_USING_GUI_GUIDER_DEMO is not set
 
 #
 # u8g2: a monochrome graphic library
@@ -474,6 +477,8 @@ CONFIG_NETDEV_IPV6=0
 # CONFIG_PKG_USING_CBOX is not set
 # CONFIG_PKG_USING_SNOWFLAKE is not set
 # CONFIG_PKG_USING_HASH_MATCH is not set
+# CONFIG_PKG_USING_FIRE_PID_CURVE is not set
+# CONFIG_PKG_USING_ARMV7M_DWT_TOOL is not set
 
 #
 # system packages
@@ -486,14 +491,6 @@ CONFIG_NETDEV_IPV6=0
 # CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set
 # CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set
 
-#
-# POSIX extension functions
-#
-# CONFIG_PKG_USING_POSIX_GETLINE is not set
-# CONFIG_PKG_USING_POSIX_WCWIDTH is not set
-# CONFIG_PKG_USING_POSIX_ITOA is not set
-# CONFIG_PKG_USING_POSIX_STRINGS is not set
-
 #
 # acceleration: Assembly language or algorithmic acceleration packages
 #
@@ -518,9 +515,11 @@ CONFIG_NETDEV_IPV6=0
 # CONFIG_PKG_USING_UC_COMMON is not set
 # CONFIG_PKG_USING_UC_MODBUS is not set
 # CONFIG_PKG_USING_RTDUINO is not set
+# CONFIG_PKG_USING_FREERTOS_WRAPPER is not set
 # CONFIG_PKG_USING_CAIRO is not set
 # CONFIG_PKG_USING_PIXMAN is not set
 # CONFIG_PKG_USING_PARTITION is not set
+# CONFIG_PKG_USING_PERF_COUNTER is not set
 # CONFIG_PKG_USING_FLASHDB is not set
 # CONFIG_PKG_USING_SQLITE is not set
 # CONFIG_PKG_USING_RTI is not set
@@ -549,6 +548,7 @@ CONFIG_NETDEV_IPV6=0
 # CONFIG_PKG_USING_CHERRYUSB is not set
 # CONFIG_PKG_USING_KMULTI_RTIMER is not set
 # CONFIG_PKG_USING_TFDB is not set
+# CONFIG_PKG_USING_QPC is not set
 
 #
 # peripheral libraries and drivers
@@ -557,8 +557,10 @@ CONFIG_NETDEV_IPV6=0
 # CONFIG_PKG_USING_REALTEK_AMEBA is not set
 # CONFIG_PKG_USING_SHT2X is not set
 # CONFIG_PKG_USING_SHT3X is not set
+# CONFIG_PKG_USING_ADT74XX is not set
 # CONFIG_PKG_USING_AS7341 is not set
 # CONFIG_PKG_USING_STM32_SDIO is not set
+# CONFIG_PKG_USING_RTT_ESP_IDF is not set
 # CONFIG_PKG_USING_ICM20608 is not set
 # CONFIG_PKG_USING_BUTTON is not set
 # CONFIG_PKG_USING_PCF8574 is not set
@@ -570,6 +572,11 @@ CONFIG_NETDEV_IPV6=0
 # CONFIG_PKG_USING_NRF5X_SDK is not set
 # CONFIG_PKG_USING_NRFX is not set
 # CONFIG_PKG_USING_WM_LIBRARIES is not set
+
+#
+# Kendryte SDK
+#
+# CONFIG_PKG_USING_K210_SDK is not set
 # CONFIG_PKG_USING_KENDRYTE_SDK is not set
 # CONFIG_PKG_USING_INFRARED is not set
 # CONFIG_PKG_USING_MULTI_INFRARED is not set
@@ -630,6 +637,8 @@ CONFIG_NETDEV_IPV6=0
 # CONFIG_PKG_USING_MB85RS16 is not set
 # CONFIG_PKG_USING_CW2015 is not set
 # CONFIG_PKG_USING_RFM300 is not set
+# CONFIG_PKG_USING_IO_INPUT_FILTER is not set
+# CONFIG_PKG_USING_RASPBERRYPI_PICO_SDK is not set
 
 #
 # AI packages
@@ -704,6 +713,7 @@ CONFIG_NETDEV_IPV6=0
 # CONFIG_PKG_USING_PHASE_LOCKED_LOOP is not set
 # CONFIG_PKG_USING_MFBD is not set
 # CONFIG_PKG_USING_SLCAN2RTT is not set
+# CONFIG_PKG_USING_SOEM is not set
 CONFIG_SOC_SIMULATOR=y
 
 #

+ 1 - 0
bsp/simulator/drivers/board.c

@@ -11,6 +11,7 @@
 #include <rtthread.h>
 
 #include <stdlib.h>
+#include <unistd.h>
 
 #include "board.h"
 #include "uart_console.h"

+ 5 - 1
bsp/simulator/drivers/sdl_fb.c

@@ -11,11 +11,15 @@
 #ifdef _WIN32
 #include <sdl.h>
 #else
-#include <SDL/SDL.h>
+#include <SDL2/SDL.h>
 #endif
 #include <rtdevice.h>
 #include <rtgui/driver.h>
 
+#define DBG_TAG    "sdl.fb"
+#define DBG_LVL    DBG_WARNING
+#include <rtdbg.h>
+
 #define SDL_SCREEN_WIDTH    480
 #define SDL_SCREEN_HEIGHT   320
 

+ 1 - 3
bsp/simulator/drivers/uart_console.c

@@ -175,6 +175,7 @@ static void * ThreadforKeyGet(void * lpParam)
         /* Notfiy serial ISR */
         rt_hw_serial_isr(&_serial, RT_SERIAL_EVENT_RX_IND);
     }
+    return RT_NULL;
 } /*** ThreadforKeyGet ***/
 
 static rt_err_t console_configure(struct rt_serial_device *serial, struct serial_configure *cfg)
@@ -207,10 +208,7 @@ static rt_err_t console_control(struct rt_serial_device *serial, int cmd, void *
 static int console_putc(struct rt_serial_device *serial, char c)
 {
     int level;
-    struct console_uart* uart;
-
     RT_ASSERT(serial != RT_NULL);
-    uart = (struct console_uart *)serial->parent.user_data;
 
 #if 0 /* Enable it if you want to save the console log */
     {

+ 3 - 4
bsp/simulator/rtconfig.h

@@ -127,7 +127,6 @@
 
 /* Docking with protocol stacks */
 
-#define SAL_USING_WINSOCK
 #define SAL_USING_POSIX
 #define RT_USING_NETDEV
 #define NETDEV_USING_IFCONFIG
@@ -189,9 +188,6 @@
 /* enhanced kernel services */
 
 
-/* POSIX extension functions */
-
-
 /* acceleration: Assembly language or algorithmic acceleration packages */
 
 
@@ -204,6 +200,9 @@
 /* peripheral libraries and drivers */
 
 
+/* Kendryte SDK */
+
+
 /* AI packages */