RT-Thread · mysterywolf · Sep 13, 2024 · Sep 11, 2024
diff --git a/bsp/Infineon/libraries/HAL_Drivers/drv_sdcard.c b/bsp/Infineon/libraries/HAL_Drivers/drv_sdcard.c
@@ -79,8 +79,8 @@ static const struct _cy_sdio_pin_and_name_config _sdcard_config =
 };
 
 #include <dfs_fs.h>
-#include <drivers/mmcsd_core.h>
-#include <drivers/gpt.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_gpt.h>
 struct rthw_sdio
 {
     struct rt_device parent;

diff --git a/bsp/Infineon/libraries/HAL_Drivers/drv_spi.h b/bsp/Infineon/libraries/HAL_Drivers/drv_spi.h
@@ -12,7 +12,7 @@
 #define __DRV_SPI__
 
 #include <rtthread.h>
-#include <drivers/spi.h>
+#include "drivers/dev_spi.h"
 
 #include "drv_gpio.h"
 

diff --git a/bsp/airm2m/air105/board/ports/spi_flash_init.c b/bsp/airm2m/air105/board/ports/spi_flash_init.c
@@ -9,8 +9,8 @@
  */
 
 #include <rtthread.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 
 #if defined(BSP_USING_SPI_FLASH)

diff --git a/bsp/airm2m/air105/libraries/rt_drivers/drv_wdt.c b/bsp/airm2m/air105/libraries/rt_drivers/drv_wdt.c
@@ -9,7 +9,7 @@
  */
 
 #include "board.h"
-#include <drivers/watchdog.h>
+#include "drivers/dev_watchdog.h"
 
 #ifdef RT_USING_WDT
 

diff --git a/bsp/airm2m/air32f103/board/ports/spi_flash_init.c b/bsp/airm2m/air32f103/board/ports/spi_flash_init.c
@@ -10,8 +10,8 @@
 
 #include <rtthread.h>
 #include <board.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 
 #if defined(BSP_USING_SPI_FLASH)

diff --git a/bsp/airm2m/air32f103/libraries/rt_drivers/drv_spi.c b/bsp/airm2m/air32f103/libraries/rt_drivers/drv_spi.c
@@ -10,7 +10,7 @@
 
 #include <rtthread.h>
 #include <rtdevice.h>
-#include <drivers/spi.h>
+#include "drivers/dev_spi.h"
 #include "board.h"
 #include "drv_spi.h"
 

diff --git a/bsp/allwinner_tina/drivers/spi/drv_spi_flash.c b/bsp/allwinner_tina/drivers/spi/drv_spi_flash.c
@@ -28,8 +28,8 @@
 #endif
 
 #if defined(TINA_USING_SPI_FLASH) && defined(RT_USING_SFUD)
-#include "spi_flash.h"
-#include <spi_flash_sfud.h>
+#include "dev_spi_flash.h"
+#include <dev_spi_flash_sfud.h>
 rt_spi_flash_device_t spi_device;
 int rt_hw_spi_flash_with_sfud_init(void)
 {

diff --git a/bsp/apm32/apm32e103ze-evalboard/board/ports/spi_flash_init.c b/bsp/apm32/apm32e103ze-evalboard/board/ports/spi_flash_init.c
@@ -9,8 +9,8 @@
  */
 
 #include <rtthread.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 
 #if defined(BSP_USING_SPI_FLASH)

diff --git a/bsp/apm32/apm32f051r8-evalboard/board/ports/spi_flash_init.c b/bsp/apm32/apm32f051r8-evalboard/board/ports/spi_flash_init.c
@@ -9,8 +9,8 @@
  */
 
 #include <rtthread.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 
 #if defined(BSP_USING_SPI_FLASH)

diff --git a/bsp/apm32/apm32f107vc-evalboard/board/ports/spi_flash_init.c b/bsp/apm32/apm32f107vc-evalboard/board/ports/spi_flash_init.c
@@ -9,8 +9,8 @@
  */
 
 #include <rtthread.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 
 #if defined(BSP_USING_SPI_FLASH)

diff --git a/bsp/apm32/apm32f407zg-evalboard/board/ports/spi_flash_init.c b/bsp/apm32/apm32f407zg-evalboard/board/ports/spi_flash_init.c
@@ -9,8 +9,8 @@
  */
 
 #include <rtthread.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 
 #if defined(BSP_USING_SPI_FLASH)

diff --git a/bsp/apm32/apm32s103vb-miniboard/board/ports/spi_flash_init.c b/bsp/apm32/apm32s103vb-miniboard/board/ports/spi_flash_init.c
@@ -9,8 +9,8 @@
  */
 
 #include <rtthread.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 
 #if defined(BSP_USING_SPI_FLASH)

diff --git a/bsp/apm32/libraries/Drivers/drv_sdio.h b/bsp/apm32/libraries/Drivers/drv_sdio.h
@@ -15,8 +15,8 @@
 #include "rtdevice.h"
 #include <rthw.h>
 #include <string.h>
-#include <drivers/mmcsd_core.h>
-#include <drivers/sdio.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_sdio.h>
 #include "drv_common.h"
 #include "board.h"
 

diff --git a/bsp/apm32/libraries/Drivers/drv_spi.h b/bsp/apm32/libraries/Drivers/drv_spi.h
@@ -13,7 +13,7 @@
 
 #include "board.h"
 #include <rtthread.h>
-#include <drivers/spi.h>
+#include "drivers/dev_spi.h"
 
 struct apm32_spi_config
 {

diff --git a/bsp/at32/libraries/rt_drivers/drv_sdio.h b/bsp/at32/libraries/rt_drivers/drv_sdio.h
@@ -14,8 +14,8 @@
 #include "rtdevice.h"
 #include <rthw.h>
 #include <string.h>
-#include <drivers/mmcsd_core.h>
-#include <drivers/sdio.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_sdio.h>
 #include "drv_common.h"
 
 #define SDCARD_INSTANCE_TYPE                   sdio_type

diff --git a/bsp/at32/libraries/rt_drivers/drv_spi.h b/bsp/at32/libraries/rt_drivers/drv_spi.h
@@ -12,7 +12,7 @@
 #define __DRV_SPI__
 
 #include <rtthread.h>
-#include <drivers/spi.h>
+#include "drivers/dev_spi.h"
 #include "drv_common.h"
 #include "drv_dma.h"
 

diff --git a/bsp/at32/libraries/rt_drivers/drv_wdt.c b/bsp/at32/libraries/rt_drivers/drv_wdt.c
@@ -8,7 +8,7 @@
  * 2022-05-16     shelton           first version
  */
 
-#include <drivers/watchdog.h>
+#include "drivers/dev_watchdog.h"
 #include "drv_common.h"
 
 #ifdef RT_USING_WDT

diff --git a/bsp/at91/at91sam9260/applications/application.c b/bsp/at91/at91sam9260/applications/application.c
@@ -22,7 +22,7 @@
 #endif
 
 #ifdef RT_USING_SDIO
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>
 #include "at91_mci.h"
 #endif
 

diff --git a/bsp/at91/at91sam9260/drivers/at91_mci.c b/bsp/at91/at91sam9260/drivers/at91_mci.c
@@ -10,7 +10,7 @@
 
 #include <rtthread.h>
 #include <rthw.h>
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>
 #include <at91sam926x.h>
 #include "at91_mci.h"
 

diff --git a/bsp/at91/at91sam9g45/applications/application.c b/bsp/at91/at91sam9g45/applications/application.c
@@ -22,7 +22,7 @@
 #endif
 
 #ifdef RT_USING_SDIO
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>
 #include "at91_mci.h"
 #endif
 

diff --git a/bsp/at91/at91sam9g45/drivers/at91_mci.c b/bsp/at91/at91sam9g45/drivers/at91_mci.c
@@ -10,7 +10,7 @@
 
 #include <rtthread.h>
 #include <rthw.h>
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>
 #include <at91sam9g45.h>
 #include "at91_mci.h"
 

diff --git a/bsp/bf533/board.c b/bsp/bf533/board.c
@@ -12,7 +12,7 @@
 #include "rtconfig.h"
 #include "rtdef.h"
 #include "rthw.h"
-#include "serial.h"
+#include "drivers/dev_serial.h"
 
 #include <signal.h>
 #include <sys/platform.h>

diff --git a/bsp/bf533/startup.c b/bsp/bf533/startup.c
@@ -12,7 +12,7 @@
 #include <rtthread.h>
 #include "application.h"
 #include "board.h"
-#include "serial.h"
+#include "drivers/dev_serial.h"
 #include "finsh.h"
 
 extern "asm" int rtt_heap_start;

diff --git a/bsp/bluetrum/libraries/hal_drivers/drv_sdio.h b/bsp/bluetrum/libraries/hal_drivers/drv_sdio.h
@@ -13,8 +13,8 @@
 
 #include "drv_common.h"
 #include "board.h"
-#include "drivers/mmcsd_core.h"
-#include "drivers/sdio.h"
+#include "drivers/dev_mmcsd_core.h"
+#include "drivers/dev_sdio.h"
 
 #define SDIO_BUFF_SIZE       1024
 #define SDIO_ALIGN_LEN       32

diff --git a/bsp/bouffalo_lab/bl808/m0/board/wlan_port/drv_wifi.c b/bsp/bouffalo_lab/bl808/m0/board/wlan_port/drv_wifi.c
@@ -9,7 +9,7 @@
  */
 
 #include <rtthread.h>
-#include <wlan_dev.h>
+#include "dev_wlan.h"
 
 #define DBG_TAG     "drv.wifi"
 #define DBG_LVL     DBG_LOG
@@ -303,7 +303,7 @@ static rt_err_t drv_wlan_softap(struct rt_wlan_device *wlan, struct rt_ap_info *
     }
 
     if (ret < 0)
-        return RT_ERROR;
+        return -RT_ERROR;
 
     return RT_EOK;
 }

diff --git a/bsp/bouffalo_lab/libraries/rt_drivers/drv_sdh.c b/bsp/bouffalo_lab/libraries/rt_drivers/drv_sdh.c
@@ -20,8 +20,8 @@
 #endif
 #include <rtdbg.h>
 
-#include <drivers/mmcsd_core.h>
-#include <drivers/sdio.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_sdio.h>
 #include "drv_sdh.h"
 
 #if defined(BL808)

diff --git a/bsp/cvitek/drivers/drv_sdhci.c b/bsp/cvitek/drivers/drv_sdhci.c
@@ -21,8 +21,8 @@
 #define DBG_LEVEL   DBG_INFO
 #include <rtdbg.h>
 
-#include <drivers/mmcsd_core.h>
-#include <drivers/sdio.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_sdio.h>
 
 #include "drv_sdhci.h"
 

diff --git a/bsp/dm365/applications/application.c b/bsp/dm365/applications/application.c
@@ -22,7 +22,7 @@
 #endif
 
 #ifdef RT_USING_SDIO
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>
 #endif
 
 int main(void)

diff --git a/bsp/dm365/drivers/mmcsd.c b/bsp/dm365/drivers/mmcsd.c
@@ -11,7 +11,7 @@
 #include <rtthread.h>
 #include <rthw.h>
 #include <string.h>
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>
 #include <dm36x.h>
 #include "mmcsd.h"
 #include "edma.h"

diff --git a/bsp/essemi/es32f0654/drivers/drv_spiflash.c b/bsp/essemi/es32f0654/drivers/drv_spiflash.c
@@ -14,9 +14,9 @@
 
 #if defined(BSP_USING_SPI_FLASH)
 
-#include "spi_flash.h"
+#include "dev_spi_flash.h"
 #include "drv_spiflash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 
 int rt_hw_spi_flash_init(void)

diff --git a/bsp/essemi/es32f369x/drivers/drv_spiflash.c b/bsp/essemi/es32f369x/drivers/drv_spiflash.c
@@ -14,9 +14,9 @@
 
 #if defined(BSP_USING_SPI_FLASH)
 
-#include "spi_flash.h"
+#include "dev_spi_flash.h"
 #include "drv_spiflash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 
 int rt_hw_spi_flash_init(void)

diff --git a/bsp/essemi/es32vf2264/drivers/drv_spiflash.c b/bsp/essemi/es32vf2264/drivers/drv_spiflash.c
@@ -14,9 +14,9 @@
 
 #if defined(BSP_USING_SPI_FLASH)
 
-#include "spi_flash.h"
+#include "dev_spi_flash.h"
 #include "drv_spiflash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 
 int rt_hw_spi_flash_init(void)

diff --git a/bsp/frdm-k64f/board/drv_uart.h b/bsp/frdm-k64f/board/drv_uart.h
@@ -17,7 +17,7 @@
 
 #include <MK64F12.h>
 
-#include <drivers/serial.h>
+#include <drivers/dev_serial.h>
 
 void rt_hw_uart_init(void);
 

diff --git a/bsp/ft2004/drivers/drv_qspi_flash.c b/bsp/ft2004/drivers/drv_qspi_flash.c
@@ -16,8 +16,8 @@
 
 #ifdef BSP_USE_QSPI
 
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #define _QSPI_DEVICE_NAME "qspiflash"
 
 static int

diff --git a/bsp/ft2004/drivers/drv_sdctrl.c b/bsp/ft2004/drivers/drv_sdctrl.c
@@ -14,7 +14,7 @@
 #include "ft_debug.h"
 #include "ft_types.h"
 #include "ft_generic_timer.h"
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>
 #include "interrupt.h"
 #include "rtconfig.h"
 #include "ft_cache.h"

diff --git a/bsp/ft2004/drivers/drv_spi_flash.c b/bsp/ft2004/drivers/drv_spi_flash.c
@@ -21,8 +21,8 @@
 
 #ifdef BSP_USE_SPI
 
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 
 static int rt_hw_spi_flash_init(void)
 {

diff --git a/bsp/gd32/arm/libraries/gd32_drivers/drv_spi_flash.c b/bsp/gd32/arm/libraries/gd32_drivers/drv_spi_flash.c
@@ -10,10 +10,10 @@
  */
 #include <board.h>
 #include "drv_spi.h"
-#include "spi_flash.h"
+#include "dev_spi_flash.h"
 
 #ifdef RT_USING_SFUD
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash_sfud.h"
 #endif
 
 #include <rthw.h>

diff --git a/bsp/hc32/ev_hc32f448_lqfp80/board/ports/drv_spi_flash.c b/bsp/hc32/ev_hc32f448_lqfp80/board/ports/drv_spi_flash.c
@@ -19,9 +19,9 @@
 
 #ifdef BSP_USING_SPI_FLASH
 
-#include "spi_flash.h"
+#include "dev_spi_flash.h"
 #ifdef RT_USING_SFUD
-    #include "spi_flash_sfud.h"
+    #include "dev_spi_flash_sfud.h"
 #endif
 
 #define SPI_BUS_NAME                    "spi1"