[drivers] Specifies the name of the drivers driver file

https://github.com/RT-Thread/rt-thread/pull/9420
2024-09-14 05:40:40 +08:00 · 2024-09-14 05:40:40 +08:00 · bb91502465
parent 57d002b25e
commit bb91502465
219 changed files with 400 additions and 398 deletions
--- 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;
--- 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"

--- 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)
--- 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

--- 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)
--- 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"

--- 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)
 {
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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"

--- 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
 {
--- 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
--- 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"

--- 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
--- 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

--- 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"

--- 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

--- 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"

--- 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>
--- 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;
--- 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
--- 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;
 }
--- 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)
--- 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"

--- 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)
--- 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"
--- 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)
--- 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)
--- 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)
--- 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);

--- 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
--- 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"
--- 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)
 {
--- 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>
--- 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"
--- a/bsp/hc32/ev_hc32f448_lqfp80/board/ports/fal/fal_flash_sfud_port.c
+++ b/bsp/hc32/ev_hc32f448_lqfp80/board/ports/fal/fal_flash_sfud_port.c
@ -13,7 +13,7 @@

 #include <sfud.h>
 #ifdef RT_USING_SFUD
-    #include <spi_flash_sfud.h>
+    #include <dev_spi_flash_sfud.h>
 #endif

 #ifndef FAL_USING_NOR_FLASH_DEV_NAME
--- a/bsp/hc32/ev_hc32f460_lqfp100_v2/board/ports/drv_spi_flash.c
+++ b/bsp/hc32/ev_hc32f460_lqfp100_v2/board/ports/drv_spi_flash.c
@ -18,9 +18,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                    "spi3"
--- a/bsp/hc32/ev_hc32f460_lqfp100_v2/board/ports/fal/fal_flash_sfud_port.c
+++ b/bsp/hc32/ev_hc32f460_lqfp100_v2/board/ports/fal/fal_flash_sfud_port.c
@ -12,7 +12,7 @@

 #include <sfud.h>
 #ifdef RT_USING_SFUD
-    #include <spi_flash_sfud.h>
+    #include <dev_spi_flash_sfud.h>
 #endif

 #ifndef FAL_USING_NOR_FLASH_DEV_NAME
--- a/bsp/hc32/ev_hc32f4a0_lqfp176/board/ports/drv_spi_flash.c
+++ b/bsp/hc32/ev_hc32f4a0_lqfp176/board/ports/drv_spi_flash.c
@ -18,9 +18,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"
--- a/bsp/hc32/ev_hc32f4a0_lqfp176/board/ports/fal/fal_flash_sfud_port.c
+++ b/bsp/hc32/ev_hc32f4a0_lqfp176/board/ports/fal/fal_flash_sfud_port.c
@ -12,7 +12,7 @@

 #include <sfud.h>
 #ifdef RT_USING_SFUD
-    #include <spi_flash_sfud.h>
+    #include <dev_spi_flash_sfud.h>
 #endif

 #ifndef FAL_USING_NOR_FLASH_DEV_NAME
--- a/bsp/hc32/lckfb-hc32f4a0-lqfp100/board/ports/drv_spi_flash.c
+++ b/bsp/hc32/lckfb-hc32f4a0-lqfp100/board/ports/drv_spi_flash.c
@ -18,9 +18,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"
--- a/bsp/hc32/lckfb-hc32f4a0-lqfp100/board/ports/fal/fal_flash_sfud_port.c
+++ b/bsp/hc32/lckfb-hc32f4a0-lqfp100/board/ports/fal/fal_flash_sfud_port.c
@ -12,7 +12,7 @@

 #include <sfud.h>
 #ifdef RT_USING_SFUD
-    #include <spi_flash_sfud.h>
+    #include <dev_spi_flash_sfud.h>
 #endif

 #ifndef FAL_USING_NOR_FLASH_DEV_NAME
--- a/bsp/hc32/platform/fal/fal_flash_sfud_nor.c
+++ b/bsp/hc32/platform/fal/fal_flash_sfud_nor.c
@ -11,7 +11,7 @@
 #include <fal.h>
 #include <sfud.h>
 #ifdef RT_USING_SFUD
-    #include <spi_flash_sfud.h>
+    #include <dev_spi_flash_sfud.h>
 #endif

 #ifndef FAL_USING_NOR_FLASH_DEV_NAME
--- a/bsp/hc32/platform/sfud/drv_spi_flash.c
+++ b/bsp/hc32/platform/sfud/drv_spi_flash.c
@ -18,9 +18,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

 #if defined(HC32F4A0) || defined(HC32F448)
--- a/bsp/hk32/libraries/rt_drivers/drv_spi.h
+++ b/bsp/hk32/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 <hk32f0xx.h>

 struct hk32_spi_config
--- a/bsp/k210/applications/mnt.c
+++ b/bsp/k210/applications/mnt.c
@ -9,7 +9,7 @@

 #include <rtthread.h>
 #if defined(RT_USING_SPI_MSD) && defined(RT_USING_DFS_ELMFAT)
-#include <spi_msd.h>
+#include <dev_spi_msd.h>
 #include <dfs_fs.h>
 int mnt_init(void)
 {
--- a/bsp/k210/drivers/drv_lcd.c
+++ b/bsp/k210/drivers/drv_lcd.c
@ -17,6 +17,7 @@
 #include "drv_lcd.h"
 #include <board.h>
 #include <gpiohs.h>
+#include <drivers/dev_spi.h>
 #include <spi.h>
 #include <drv_io_config.h>
 #include <rthw.h>
--- a/bsp/k210/drivers/drv_spi.c
+++ b/bsp/k210/drivers/drv_spi.c
@ -10,11 +10,12 @@

 #include <rtthread.h>
 #include <rtdevice.h>
+#include <spi.h>

 #ifdef RT_USING_SPI
 #include "drv_spi.h"
 #include <drv_io_config.h>
-#include <spi.h>
+#include <drivers/dev_spi.h>
 #include "dmalock.h"
 #include <sysctl.h>
 #include <gpiohs.h>
--- a/bsp/loongson/ls1cdev/drivers/drv_spi.c
+++ b/bsp/loongson/ls1cdev/drivers/drv_spi.c
@ -10,11 +10,11 @@
 */

 #include <rtthread.h>
-#include <drivers/spi.h>
+#include "drivers/dev_spi.h"
 #include <rthw.h>
 #include "drv_spi.h"
 #include "ls1c_public.h"
-#include "spi_msd.h"
+#include "dev_spi_msd.h"
 #include "dfs_fs.h"
 #include "../libraries/ls1c_pin.h"

--- a/bsp/loongson/ls1cdev/drivers/drv_wdt.c
+++ b/bsp/loongson/ls1cdev/drivers/drv_wdt.c
@ -13,7 +13,7 @@

 #ifdef  RT_USING_WDT

-#include <drivers/watchdog.h>
+#include "drivers/dev_watchdog.h"
 #include "drv_wdt.h"

 #include "ls1c_wdog.h"
--- a/bsp/loongson/ls1cdev/drivers/touch.c
+++ b/bsp/loongson/ls1cdev/drivers/touch.c
@ -11,7 +11,7 @@
 #include <rtthread.h>
 #include <rtdevice.h>
 #include <stdbool.h>
-#include <drivers/spi.h>
+#include "drivers/dev_spi.h"
 #include "ls1c.h"
 #include "ls1c_gpio.h"
 #include "ls1c_spi.h"
--- a/bsp/loongson/ls2kdev/drivers/drv_spi.c
+++ b/bsp/loongson/ls2kdev/drivers/drv_spi.c
@ -18,7 +18,7 @@
 #include <ctype.h>
 #include <stdint.h>
 #include <rtthread.h>
-#include <drivers/spi.h>
+#include "drivers/dev_spi.h"
 #include "drv_spi.h"

 #ifdef RT_USING_SPI
--- a/bsp/microblaze/board.c
+++ b/bsp/microblaze/board.c
@ -30,7 +30,7 @@
 #include "xintc_l.h"

 #ifdef RT_USING_UART1
-#include "serial.h"
+#include "drivers/dev_serial.h"
 #endif

 #define  TIMER_CNTR_0		0
@ -143,8 +143,8 @@ static void rt_hw_console_init()
 	rt_uint32_t status;

 	/*
-	 * Initialize the UartLite driver so that it is ready to use.
-	 */
+	* Initialize the UartLite driver so that it is ready to use.
+	*/
 	status = XUartLite_Initialize(&uart_lite, RS232_DEVICE_ID);
 	if (status != XST_SUCCESS)
 	{
--- a/bsp/mini2440/drivers/s3cmci.c
+++ b/bsp/mini2440/drivers/s3cmci.c
@ -10,7 +10,7 @@
 #include <rthw.h>
 #include <rtthread.h>
 #include <rtdevice.h>
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>
 #include <s3c24x0.h>

 #define S3C_PCLK	50000000
--- a/bsp/mini4020/applications/startup.c
+++ b/bsp/mini4020/applications/startup.c
@ -12,7 +12,7 @@

 #include <sep4020.h>
 #include <board.h>
-#include <serial.h>
+#include <drivers/dev_serial.h>
 #ifdef RT_USING_FINSH
 #include <finsh.h>
 #endif
--- a/bsp/mini4020/drivers/board.c
+++ b/bsp/mini4020/drivers/board.c
@ -17,7 +17,7 @@
 #include <rtthread.h>

 #include <sep4020.h>
-#include <serial.h>
+#include <drivers/dev_serial.h>

 void rt_hw_serial_putc(const char c);

--- a/bsp/n32g452xx/Libraries/rt_drivers/drv_wdt.c
+++ b/bsp/n32g452xx/Libraries/rt_drivers/drv_wdt.c
@ -10,7 +10,7 @@
 */

 #include <board.h>
-#include <drivers/watchdog.h>
+#include "drivers/dev_watchdog.h"

 #ifdef RT_USING_WDT
 #ifdef BSP_USING_WDT
--- a/bsp/nuvoton/libraries/m2354/rtt_port/drv_sdio.c
+++ b/bsp/nuvoton/libraries/m2354/rtt_port/drv_sdio.c
@ -15,8 +15,8 @@
 #if defined(BSP_USING_SDH)

 #include <rtdevice.h>
-#include <drivers/mmcsd_core.h>
-#include <drivers/sdio.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_sdio.h>

 #include "NuMicro.h"

--- a/bsp/nuvoton/libraries/m460/rtt_port/drv_sdio.c
+++ b/bsp/nuvoton/libraries/m460/rtt_port/drv_sdio.c
@ -15,8 +15,8 @@
 #if defined(BSP_USING_SDH)

 #include <rtdevice.h>
-#include <drivers/mmcsd_core.h>
-#include <drivers/sdio.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_sdio.h>

 #include "NuMicro.h"

--- a/bsp/nuvoton/libraries/m480/rtt_port/drv_sdio.c
+++ b/bsp/nuvoton/libraries/m480/rtt_port/drv_sdio.c
@ -15,8 +15,8 @@
 #if defined(BSP_USING_SDH)

 #include <rtdevice.h>
-#include <drivers/mmcsd_core.h>
-#include <drivers/sdio.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_sdio.h>

 #include "NuMicro.h"

--- a/bsp/nuvoton/libraries/ma35/rtt_port/drv_sdio.c
+++ b/bsp/nuvoton/libraries/ma35/rtt_port/drv_sdio.c
@ -15,8 +15,8 @@
 #if defined(BSP_USING_SDH)

 #include <rtdevice.h>
-#include <drivers/mmcsd_core.h>
-#include <drivers/sdio.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_sdio.h>

 #include "NuMicro.h"
 #include "drv_common.h"
--- a/bsp/nuvoton/nk-980iot/board/board_dev.c
+++ b/bsp/nuvoton/nk-980iot/board/board_dev.c
@ -15,8 +15,8 @@

 #if defined(BOARD_USING_STORAGE_SPIFLASH)
 #if defined(RT_USING_SFUD)
-    #include "spi_flash.h"
-    #include "spi_flash_sfud.h"
+    #include "dev_spi_flash.h"
+    #include "dev_spi_flash_sfud.h"
 #endif

 #include "drv_qspi.h"
--- a/bsp/nuvoton/nk-n9h30/board/board_dev.c
+++ b/bsp/nuvoton/nk-n9h30/board/board_dev.c
@ -16,8 +16,8 @@

 #if defined(BOARD_USING_STORAGE_SPIFLASH)
 #if defined(RT_USING_SFUD)
-    #include "spi_flash.h"
-    #include "spi_flash_sfud.h"
+    #include "dev_spi_flash.h"
+    #include "dev_spi_flash_sfud.h"
 #endif

 #include "drv_qspi.h"
--- a/bsp/nuvoton/nk-rtu980/board/board_dev.c
+++ b/bsp/nuvoton/nk-rtu980/board/board_dev.c
@ -15,8 +15,8 @@

 #if defined(BOARD_USING_STORAGE_SPIFLASH)
 #if defined(RT_USING_SFUD)
-    #include "spi_flash.h"
-    #include "spi_flash_sfud.h"
+    #include "dev_spi_flash.h"
+    #include "dev_spi_flash_sfud.h"
 #endif

 #include "drv_qspi.h"
--- a/bsp/nuvoton/numaker-hmi-ma35d1/board/board_dev.c
+++ b/bsp/nuvoton/numaker-hmi-ma35d1/board/board_dev.c
@ -21,8 +21,8 @@

 #if defined(BOARD_USING_STORAGE_SPIFLASH)
 #if defined(RT_USING_SFUD)
-    #include "spi_flash.h"
-    #include "spi_flash_sfud.h"
+    #include "dev_spi_flash.h"
+    #include "dev_spi_flash_sfud.h"
 #endif

 #include "drv_qspi.h"
--- a/bsp/nuvoton/numaker-iot-m467/board/board_dev.c
+++ b/bsp/nuvoton/numaker-iot-m467/board/board_dev.c
@ -15,8 +15,8 @@

 #if defined(BOARD_USING_STORAGE_SPIFLASH)
 #if defined(RT_USING_SFUD)
-    #include "spi_flash.h"
-    #include "spi_flash_sfud.h"
+    #include "dev_spi_flash.h"
+    #include "dev_spi_flash_sfud.h"
 #endif

 #include "drv_qspi.h"
--- a/bsp/nuvoton/numaker-iot-m487/board/board_dev.c
+++ b/bsp/nuvoton/numaker-iot-m487/board/board_dev.c
@ -15,8 +15,8 @@

 #if defined(BOARD_USING_STORAGE_SPIFLASH)
 #if defined(RT_USING_SFUD)
-    #include "spi_flash.h"
-    #include "spi_flash_sfud.h"
+    #include "dev_spi_flash.h"
+    #include "dev_spi_flash_sfud.h"
 #endif

 #include "drv_qspi.h"
--- a/bsp/nuvoton/numaker-iot-ma35d1/board/board_dev.c
+++ b/bsp/nuvoton/numaker-iot-ma35d1/board/board_dev.c
@ -21,8 +21,8 @@

 #if defined(BOARD_USING_STORAGE_SPIFLASH)
 #if defined(RT_USING_SFUD)
-    #include "spi_flash.h"
-    #include "spi_flash_sfud.h"
+    #include "dev_spi_flash.h"
+    #include "dev_spi_flash_sfud.h"
 #endif

 #include "drv_qspi.h"
--- a/bsp/nuvoton/numaker-m032ki/board/board_dev.c
+++ b/bsp/nuvoton/numaker-m032ki/board/board_dev.c
@ -15,8 +15,8 @@

 #if defined(BOARD_USING_STORAGE_SPIFLASH)
 #if defined(RT_USING_SFUD)
-    #include "spi_flash.h"
-    #include "spi_flash_sfud.h"
+    #include "dev_spi_flash.h"
+    #include "dev_spi_flash_sfud.h"
 #endif

 #include "drv_qspi.h"
--- a/bsp/nuvoton/numaker-m467hj/board/board_dev.c
+++ b/bsp/nuvoton/numaker-m467hj/board/board_dev.c
@ -15,8 +15,8 @@

 #if defined(BOARD_USING_STORAGE_SPIFLASH)
 #if defined(RT_USING_SFUD)
-    #include "spi_flash.h"
-    #include "spi_flash_sfud.h"
+    #include "dev_spi_flash.h"
+    #include "dev_spi_flash_sfud.h"
 #endif

 #include "drv_qspi.h"
--- a/bsp/nuvoton/numaker-pfm-m487/board/board_dev.c
+++ b/bsp/nuvoton/numaker-pfm-m487/board/board_dev.c
@ -15,8 +15,8 @@

 #if defined(BOARD_USING_STORAGE_SPIFLASH)
 #if defined(RT_USING_SFUD)
-    #include "spi_flash.h"
-    #include "spi_flash_sfud.h"
+    #include "dev_spi_flash.h"
+    #include "dev_spi_flash_sfud.h"
 #endif

 #include "drv_qspi.h"
--- a/bsp/nxp/imx/imx6ull-smart/drivers/drv_sdio.c
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_sdio.c
@ -12,7 +12,7 @@

 #include <rtthread.h>
 #include <rthw.h>
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>
 #include <ioremap.h>

 #include <board.h>
--- a/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/ports/spi_flash_init.c
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/ports/spi_flash_init.c
@ -12,8 +12,8 @@

 #if defined(BSP_USING_SPI_FLASH)

-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 #include "drv_gpio.h"

--- a/bsp/nxp/imx/imxrt/libraries/drivers/drv_sdio.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_sdio.c
@ -10,7 +10,7 @@

 #include <rtthread.h>
 #include <rthw.h>
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>

 #include <board.h>
 #include <fsl_usdhc.h>
--- a/bsp/nxp/lpc/lpc54114-lite/drivers/drv_sdcard.c
+++ b/bsp/nxp/lpc/lpc54114-lite/drivers/drv_sdcard.c
@ -6,7 +6,7 @@

 #include "drv_sdcard.h"
 #include "drv_spi.h"
-#include "spi_msd.h"
+#include "dev_spi_msd.h"

 #define RT_SDCARD_CS_PIN (3)

--- a/bsp/nxp/lpc/lpc54114-lite/drivers/drv_spi_flash.c
+++ b/bsp/nxp/lpc/lpc54114-lite/drivers/drv_spi_flash.c
@ -9,8 +9,8 @@

 #include "rtthread.h"
 #include "rtdevice.h"
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"

 #define RT_SPI_FLASH_CS_PIN (2)

--- a/bsp/nxp/lpc/lpc55sxx/Libraries/drivers/drv_soft_spi.h
+++ b/bsp/nxp/lpc/lpc55sxx/Libraries/drivers/drv_soft_spi.h
@ -12,7 +12,7 @@
 #define DRV_SOFT_SPI_H_

 #include <rtdevice.h>
-#include <spi-bit-ops.h>
+#include <dev_spi_bit_ops.h>

 /* lpc soft spi config */
 struct lpc_soft_spi_config
--- a/bsp/nxp/lpc/lpc55sxx/lpc55s69_nxp_evk/board/ports/soft_spi_flash_init.c
+++ b/bsp/nxp/lpc/lpc55sxx/lpc55s69_nxp_evk/board/ports/soft_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_soft_spi.h"
 #include "drv_pin.h"

--- a/bsp/nxp/mcx/mcxn/frdm-mcxn236/board/ports/drv_filesystem_spi_flash.c
+++ b/bsp/nxp/mcx/mcxn/frdm-mcxn236/board/ports/drv_filesystem_spi_flash.c
@ -13,7 +13,7 @@

 #if defined(BSP_USING_SPI7) && defined(RT_USING_SFUD) && defined(RT_USING_DFS) && defined(RT_USING_DFS_ELMFAT)
 #include <dfs_elm.h>
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash_sfud.h"
 #include "dfs_fs.h"
 #include "dfs.h"
 #include "dfs_file.h"
--- a/bsp/nxp/mcx/mcxn/frdm-mcxn947/board/ports/drv_filesystem_spi_flash.c
+++ b/bsp/nxp/mcx/mcxn/frdm-mcxn947/board/ports/drv_filesystem_spi_flash.c
@ -13,7 +13,7 @@

 #if defined(BSP_USING_SPI7) && defined(RT_USING_SFUD) && defined(RT_USING_DFS) && defined(RT_USING_DFS_ELMFAT)
 #include <dfs_elm.h>
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash_sfud.h"
 #include "dfs_fs.h"
 #include "dfs.h"
 #include "dfs_file.h"
--- a/bsp/phytium/libraries/drivers/drv_sdif.c
+++ b/bsp/phytium/libraries/drivers/drv_sdif.c
@ -21,7 +21,7 @@
 #include <rtthread.h>
 #include <rtdevice.h>
 #include <rtdbg.h>
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>

 #ifdef RT_USING_SMART
 #include "ioremap.h"
--- a/bsp/qemu-vexpress-a9/drivers/drv_sdio.c
+++ b/bsp/qemu-vexpress-a9/drivers/drv_sdio.c
@ -10,7 +10,7 @@
 #include <rthw.h>
 #include <rtthread.h>
 #include <rtdevice.h>
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>

 #include <stdint.h>
 #include <stdio.h>
--- a/bsp/raspberry-pi/raspi3-32/driver/drv_sdio.h
+++ b/bsp/raspberry-pi/raspi3-32/driver/drv_sdio.h
@ -14,7 +14,7 @@

 #include <rtthread.h>
 #include <rtdevice.h>
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>

 #include "board.h"

--- a/bsp/raspberry-pi/raspi3-32/driver/drv_spi.h
+++ b/bsp/raspberry-pi/raspi3-32/driver/drv_spi.h
@ -14,7 +14,7 @@
 #include <rtthread.h>
 #include <rtdevice.h>

-//#include <drivers/spi.h>
+//#include "drivers/dev_spi.h"
 #include "board.h"

 #define SPI0_BASE_ADDR     (PER_BASE + BCM283X_SPI0_BASE)
--- a/bsp/raspberry-pi/raspi3-64/driver/drv_sdio.h
+++ b/bsp/raspberry-pi/raspi3-64/driver/drv_sdio.h
@ -14,7 +14,7 @@

 #include <rtthread.h>
 #include <rtdevice.h>
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>

 #include "board.h"

--- a/bsp/raspberry-pi/raspi3-64/driver/drv_spi.h
+++ b/bsp/raspberry-pi/raspi3-64/driver/drv_spi.h
@ -14,7 +14,7 @@
 #include <rtthread.h>
 #include <rtdevice.h>

-//#include <drivers/spi.h>
+//#include "drivers/dev_spi.h"
 #include "board.h"

 #define SPI0_BASE_ADDR     (PER_BASE + BCM283X_SPI0_BASE)
--- a/bsp/raspberry-pi/raspi4-32/driver/drv_sdio.h
+++ b/bsp/raspberry-pi/raspi4-32/driver/drv_sdio.h
@ -13,7 +13,7 @@

 #include <rtthread.h>
 #include <rtdevice.h>
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>

 #include "board.h"
 #include "raspi4.h"
--- a/bsp/raspberry-pi/raspi4-64/drivers/drv_dsi_touch.c
+++ b/bsp/raspberry-pi/raspi4-64/drivers/drv_dsi_touch.c
@ -9,7 +9,7 @@
 */
 #include <rtthread.h>
 #include <rtdevice.h>
-#include <drivers/touch.h>
+#include "drivers/dev_touch.h"
 #include <ioremap.h>
 #include <mmu.h>

--- a/bsp/raspberry-pi/raspi4-64/drivers/drv_sdio.h
+++ b/bsp/raspberry-pi/raspi4-64/drivers/drv_sdio.h
@ -13,7 +13,7 @@

 #include <rtthread.h>
 #include <rtdevice.h>
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>

 #include "board.h"
 #include "raspi4.h"
--- a/bsp/raspberry-pico/drivers/drv_soft_spi.h
+++ b/bsp/raspberry-pico/drivers/drv_soft_spi.h
@ -12,7 +12,7 @@

 #ifdef BSP_USING_SOFT_SPI
 #include <rtdevice.h>
-#include <spi-bit-ops.h>
+#include <dev_spi_bit_ops.h>

 /* pico soft spi config */
 struct pico_soft_spi_config
--- a/bsp/renesas/libraries/HAL_Drivers/drv_soft_spi.h
+++ b/bsp/renesas/libraries/HAL_Drivers/drv_soft_spi.h
@ -13,7 +13,7 @@

 #include <rthw.h>
 #include <rtdevice.h>
-#include <spi-bit-ops.h>
+#include <dev_spi_bit_ops.h>

 /* ra soft spi config */
 struct ra_soft_spi_config
--- a/bsp/renesas/ra4m2-eco/board/ports/mnt.c
+++ b/bsp/renesas/ra4m2-eco/board/ports/mnt.c
@ -5,7 +5,7 @@

 #include <dfs_fs.h>

-#include <spi_msd.h>
+#include <dev_spi_msd.h>
 #include "drv_sci.h"

 #define DBG_TAG "app.filesystem"
--- a/bsp/renesas/ra6m3-hmi-board/board/ports/mnt.c
+++ b/bsp/renesas/ra6m3-hmi-board/board/ports/mnt.c
@ -102,7 +102,7 @@ static void sd_mount(void)
 }

 #else
-#include <spi_msd.h>
+#include <dev_spi_msd.h>
 #include "drv_sci.h"
 int sd_mount(void)
 {
--- a/bsp/renesas/ra8d1-vision-board/board/ports/mnt.c
+++ b/bsp/renesas/ra8d1-vision-board/board/ports/mnt.c
@ -137,7 +137,7 @@ static void sd_mount(void)
 }

 #else
-#include <spi_msd.h>
+#include <dev_spi_msd.h>
 #include "drv_sci.h"
 int sd_mount(void)
 {
--- a/bsp/renesas/ra8m1-ek/board/ports/mnt.c
+++ b/bsp/renesas/ra8m1-ek/board/ports/mnt.c
@ -102,7 +102,7 @@ static void sd_mount(void)
 }

 #else
-#include <spi_msd.h>
+#include <dev_spi_msd.h>
 #include "drv_sci.h"
 int sd_mount(void)
 {
--- a/bsp/samd21/sam_d2x_asflib/common/utils/stdio/stdio_serial/stdio_serial.h
+++ b/bsp/samd21/sam_d2x_asflib/common/utils/stdio/stdio_serial/stdio_serial.h
@ -67,7 +67,7 @@
 #ifndef SAMD20
 # include "sysclk.h"
 #endif
-#include "serial.h"
+#include "drivers/dev_serial.h"

 #if (XMEGA || MEGA_RF) && defined(__GNUC__)
 	extern int _write (char c, int *f);
--- a/bsp/samd21/sam_d2x_asflib/common2/services/gfx_mono/gfx_mono_screen_dump.h
+++ b/bsp/samd21/sam_d2x_asflib/common2/services/gfx_mono/gfx_mono_screen_dump.h
@ -46,7 +46,7 @@
 #ifndef GFX_MONO_SCREEN_DUMP_H_INCLUDED
 #define GFX_MONO_SCREEN_DUMP_H_INCLUDED

-#include <serial.h>
+#include <drivers/dev_serial.h>
 #include <gfx_mono.h>

 #ifdef __cplusplus
--- a/Show More
+++ b/Show More