diff options
| author | CXSforHPU <[email protected]> | 2024-09-14 05:40:40 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-09-13 17:40:40 -0400 |
| commit | bb91502465da8432b5b38a0eb12be3af8238c22d (patch) | |
| tree | 2e1d686e6d407768fc99f52216bc6e61fb25e9fe /components/drivers | |
| parent | 57d002b25e26a5df950b087f0ea2dc7b6feeb7e3 (diff) | |
[drivers] Specifies the name of the drivers driver file
https://github.com/RT-Thread/rt-thread/pull/9420
Diffstat (limited to 'components/drivers')
| -rw-r--r-- | components/drivers/include/drivers/dev_gpt.h (renamed from components/drivers/include/drivers/gpt.h) | 6 | ||||
| -rw-r--r-- | components/drivers/include/drivers/dev_mmc.h (renamed from components/drivers/include/drivers/mmc.h) | 4 | ||||
| -rw-r--r-- | components/drivers/include/drivers/dev_mmcsd_core.h (renamed from components/drivers/include/drivers/mmcsd_core.h) | 4 | ||||
| -rw-r--r-- | components/drivers/include/drivers/dev_sd.h (renamed from components/drivers/include/drivers/sd.h) | 4 | ||||
| -rw-r--r-- | components/drivers/include/drivers/dev_sdio.h (renamed from components/drivers/include/drivers/sdio.h) | 4 | ||||
| -rw-r--r-- | components/drivers/include/drivers/dev_serial.h (renamed from components/drivers/include/drivers/serial.h) | 4 | ||||
| -rw-r--r-- | components/drivers/include/drivers/dev_serial_v2.h (renamed from components/drivers/include/drivers/serial_v2.h) | 4 | ||||
| -rw-r--r-- | components/drivers/include/drivers/dev_spi.h (renamed from components/drivers/include/drivers/spi.h) | 4 | ||||
| -rw-r--r-- | components/drivers/include/drivers/dev_touch.h (renamed from components/drivers/include/drivers/touch.h) | 6 | ||||
| -rw-r--r-- | components/drivers/include/drivers/dev_watchdog.h (renamed from components/drivers/include/drivers/watchdog.h) | 6 | ||||
| -rw-r--r-- | components/drivers/include/drivers/wlan.h | 10 | ||||
| -rw-r--r-- | components/drivers/include/rtdevice.h | 16 | ||||
| -rw-r--r-- | components/drivers/sdio/SConscript | 12 | ||||
| -rw-r--r-- | components/drivers/sdio/dev_block.c (renamed from components/drivers/sdio/block_dev.c) | 4 | ||||
| -rw-r--r-- | components/drivers/sdio/dev_gpt.c (renamed from components/drivers/sdio/gpt.c) | 4 | ||||
| -rw-r--r-- | components/drivers/sdio/dev_mmc.c (renamed from components/drivers/sdio/mmc.c) | 4 | ||||
| -rw-r--r-- | components/drivers/sdio/dev_mmcsd_core.c (renamed from components/drivers/sdio/mmcsd_core.c) | 8 | ||||
| -rw-r--r-- | components/drivers/sdio/dev_sd.c (renamed from components/drivers/sdio/sd.c) | 4 | ||||
| -rw-r--r-- | components/drivers/sdio/dev_sdio.c (renamed from components/drivers/sdio/sdio.c) | 6 | ||||
| -rw-r--r-- | components/drivers/serial/SConscript | 4 | ||||
| -rw-r--r-- | components/drivers/serial/dev_serial.c (renamed from components/drivers/serial/serial.c) | 0 | ||||
| -rw-r--r-- | components/drivers/serial/dev_serial_v2.c (renamed from components/drivers/serial/serial_v2.c) | 0 | ||||
| -rw-r--r-- | components/drivers/spi/SConscript | 12 | ||||
| -rw-r--r-- | components/drivers/spi/dev_qspi_core.c (renamed from components/drivers/spi/qspi_core.c) | 2 | ||||
| -rw-r--r-- | components/drivers/spi/dev_spi.c (renamed from components/drivers/spi/spi_dev.c) | 2 | ||||
| -rw-r--r-- | components/drivers/spi/dev_spi_bit_ops.c (renamed from components/drivers/spi/spi-bit-ops.c) | 2 | ||||
| -rw-r--r-- | components/drivers/spi/dev_spi_bit_ops.h (renamed from components/drivers/spi/spi-bit-ops.h) | 4 | ||||
| -rw-r--r-- | components/drivers/spi/dev_spi_core.c (renamed from components/drivers/spi/spi_core.c) | 2 | ||||
| -rw-r--r-- | components/drivers/spi/dev_spi_flash.h (renamed from components/drivers/spi/spi_flash.h) | 4 | ||||
| -rw-r--r-- | components/drivers/spi/dev_spi_flash_sfud.c (renamed from components/drivers/spi/spi_flash_sfud.c) | 4 | ||||
| -rw-r--r-- | components/drivers/spi/dev_spi_flash_sfud.h (renamed from components/drivers/spi/spi_flash_sfud.h) | 8 | ||||
| -rw-r--r-- | components/drivers/spi/dev_spi_msd.c (renamed from components/drivers/spi/spi_msd.c) | 2 | ||||
| -rw-r--r-- | components/drivers/spi/dev_spi_msd.h (renamed from components/drivers/spi/spi_msd.h) | 8 | ||||
| -rw-r--r-- | components/drivers/spi/dev_spi_wifi_rw009.c (renamed from components/drivers/spi/spi_wifi_rw009.c) | 4 | ||||
| -rw-r--r-- | components/drivers/spi/dev_spi_wifi_rw009.h (renamed from components/drivers/spi/spi_wifi_rw009.h) | 6 | ||||
| -rw-r--r-- | components/drivers/spi/enc28j60.h | 8 | ||||
| -rw-r--r-- | components/drivers/touch/SConscript | 2 | ||||
| -rw-r--r-- | components/drivers/touch/dev_touch.c (renamed from components/drivers/touch/touch.c) | 0 | ||||
| -rw-r--r-- | components/drivers/watchdog/dev_watchdog.c (renamed from components/drivers/watchdog/watchdog.c) | 2 | ||||
| -rw-r--r-- | components/drivers/wlan/SConscript | 14 | ||||
| -rw-r--r-- | components/drivers/wlan/dev_wlan.c (renamed from components/drivers/wlan/wlan_dev.c) | 4 | ||||
| -rw-r--r-- | components/drivers/wlan/dev_wlan.h (renamed from components/drivers/wlan/wlan_dev.h) | 4 | ||||
| -rw-r--r-- | components/drivers/wlan/dev_wlan_cfg.c (renamed from components/drivers/wlan/wlan_cfg.c) | 2 | ||||
| -rw-r--r-- | components/drivers/wlan/dev_wlan_cfg.h (renamed from components/drivers/wlan/wlan_cfg.h) | 6 | ||||
| -rw-r--r-- | components/drivers/wlan/dev_wlan_cmd.c (renamed from components/drivers/wlan/wlan_cmd.c) | 6 | ||||
| -rw-r--r-- | components/drivers/wlan/dev_wlan_lwip.c (renamed from components/drivers/wlan/wlan_lwip.c) | 6 | ||||
| -rw-r--r-- | components/drivers/wlan/dev_wlan_mgnt.c (renamed from components/drivers/wlan/wlan_mgnt.c) | 10 | ||||
| -rw-r--r-- | components/drivers/wlan/dev_wlan_mgnt.h (renamed from components/drivers/wlan/wlan_mgnt.h) | 6 | ||||
| -rw-r--r-- | components/drivers/wlan/dev_wlan_prot.c (renamed from components/drivers/wlan/wlan_prot.c) | 4 | ||||
| -rw-r--r-- | components/drivers/wlan/dev_wlan_prot.h (renamed from components/drivers/wlan/wlan_prot.h) | 4 | ||||
| -rw-r--r-- | components/drivers/wlan/dev_wlan_workqueue.c (renamed from components/drivers/wlan/wlan_workqueue.c) | 2 | ||||
| -rw-r--r-- | components/drivers/wlan/dev_wlan_workqueue.h (renamed from components/drivers/wlan/wlan_workqueue.h) | 4 |
52 files changed, 131 insertions, 131 deletions
diff --git a/components/drivers/include/drivers/gpt.h b/components/drivers/include/drivers/dev_gpt.h index b88784764b..269208e82c 100644 --- a/components/drivers/include/drivers/gpt.h +++ b/components/drivers/include/drivers/dev_gpt.h @@ -7,8 +7,8 @@ * Date Author Notes * 2022-05-05 linzhenxing first version */ -#ifndef __GPT_H -#define __GPT_H +#ifndef __DEV_GPT_H__ +#define __DEV_GPT_H__ #include <rtthread.h> #include <stdint.h> @@ -129,4 +129,4 @@ typedef struct _legacy_mbr int check_gpt(struct rt_mmcsd_card *card); int gpt_get_partition_param(struct rt_mmcsd_card *card, struct dfs_partition *part, uint32_t pindex); void gpt_free(void); -#endif /*__GPT_H*/ +#endif /*__DEV_GPT_H__*/ diff --git a/components/drivers/include/drivers/mmc.h b/components/drivers/include/drivers/dev_mmc.h index 88ee740050..a5372878b8 100644 --- a/components/drivers/include/drivers/mmc.h +++ b/components/drivers/include/drivers/dev_mmc.h @@ -9,8 +9,8 @@ * 2024-05-25 HPMicro add strobe support */ -#ifndef __MMC_H__ -#define __MMC_H__ +#ifndef __DEV_MMC_H__ +#define __DEV_MMC_H__ #include <rtthread.h> #include <drivers/mmcsd_host.h> diff --git a/components/drivers/include/drivers/mmcsd_core.h b/components/drivers/include/drivers/dev_mmcsd_core.h index 3a6ac13aa9..b6bb1edcc5 100644 --- a/components/drivers/include/drivers/mmcsd_core.h +++ b/components/drivers/include/drivers/dev_mmcsd_core.h @@ -8,8 +8,8 @@ * 2011-07-25 weety first version */ -#ifndef __CORE_H__ -#define __CORE_H__ +#ifndef __DEV_MMCSD_CORE_H__ +#define __DEV_MMCSD_CORE_H__ #include <rtthread.h> #include <drivers/mmcsd_host.h> diff --git a/components/drivers/include/drivers/sd.h b/components/drivers/include/drivers/dev_sd.h index 4b7b093600..ca8bb0cb47 100644 --- a/components/drivers/include/drivers/sd.h +++ b/components/drivers/include/drivers/dev_sd.h @@ -9,8 +9,8 @@ * 2024-05-26 HPMicro Add UHS-I support */ -#ifndef __SD_H__ -#define __SD_H__ +#ifndef __DEV_SD_H__ +#define __DEV_SD_H__ #include <rtthread.h> #include <drivers/mmcsd_host.h> diff --git a/components/drivers/include/drivers/sdio.h b/components/drivers/include/drivers/dev_sdio.h index b145ffd280..a8d30fd76b 100644 --- a/components/drivers/include/drivers/sdio.h +++ b/components/drivers/include/drivers/dev_sdio.h @@ -8,8 +8,8 @@ * 2012-01-15 weety first version */ -#ifndef __SDIO_H__ -#define __SDIO_H__ +#ifndef __DEV_SDIO_H__ +#define __DEV_SDIO_H__ #include <rtthread.h> #include <drivers/mmcsd_host.h> diff --git a/components/drivers/include/drivers/serial.h b/components/drivers/include/drivers/dev_serial.h index d90b90607c..418c25fa1d 100644 --- a/components/drivers/include/drivers/serial.h +++ b/components/drivers/include/drivers/dev_serial.h @@ -11,8 +11,8 @@ * the size of ring buffer. */ -#ifndef __SERIAL_H__ -#define __SERIAL_H__ +#ifndef __DEV_SERIAL_H__ +#define __DEV_SERIAL_H__ #include <rtthread.h> diff --git a/components/drivers/include/drivers/serial_v2.h b/components/drivers/include/drivers/dev_serial_v2.h index d0dcf37813..0c3d095ab3 100644 --- a/components/drivers/include/drivers/serial_v2.h +++ b/components/drivers/include/drivers/dev_serial_v2.h @@ -8,8 +8,8 @@ * 2021-06-01 KyleChan first version */ -#ifndef __SERIAL_V2_H__ -#define __SERIAL_V2_H__ +#ifndef __DEV_SERIAL_V2_H__ +#define __DEV_SERIAL_V2_H__ #include <rtthread.h> diff --git a/components/drivers/include/drivers/spi.h b/components/drivers/include/drivers/dev_spi.h index 8c0bf0bbe9..d7eda39599 100644 --- a/components/drivers/include/drivers/spi.h +++ b/components/drivers/include/drivers/dev_spi.h @@ -10,8 +10,8 @@ * 2022-09-01 liYony fix api rt_spi_sendrecv16 about MSB and LSB bug */ -#ifndef __SPI_H__ -#define __SPI_H__ +#ifndef __DEV_SPI_H__ +#define __DEV_SPI_H__ #include <stdlib.h> #include <rtthread.h> diff --git a/components/drivers/include/drivers/touch.h b/components/drivers/include/drivers/dev_touch.h index edaf0ad230..d5cd08fc1c 100644 --- a/components/drivers/include/drivers/touch.h +++ b/components/drivers/include/drivers/dev_touch.h @@ -8,8 +8,8 @@ * 2019-05-20 tyustli the first version */ -#ifndef __TOUCH_H__ -#define __TOUCH_H__ +#ifndef __DEV_TOUCH_H__ +#define __DEV_TOUCH_H__ #include <rtthread.h> #include "dev_pin.h" @@ -110,4 +110,4 @@ void rt_hw_touch_isr(rt_touch_t touch); } #endif -#endif /* __TOUCH_H__ */ +#endif /* __DEV_TOUCH_H__ */ diff --git a/components/drivers/include/drivers/watchdog.h b/components/drivers/include/drivers/dev_watchdog.h index e08d35d87e..4b5614fc87 100644 --- a/components/drivers/include/drivers/watchdog.h +++ b/components/drivers/include/drivers/dev_watchdog.h @@ -8,8 +8,8 @@ * 2012-09-12 heyuanjie87 first version. */ -#ifndef __WATCHDOG_H__ -#define __WATCHDOG_H__ +#ifndef __DEV_WATCHDOG_H__ +#define __DEV_WATCHDOG_H__ #include <rtthread.h> @@ -39,4 +39,4 @@ rt_err_t rt_hw_watchdog_register(rt_watchdog_t *wdt, rt_uint32_t flag, void *data); -#endif /* __WATCHDOG_H__ */ +#endif /* __DEV_WATCHDOG_H__ */ diff --git a/components/drivers/include/drivers/wlan.h b/components/drivers/include/drivers/wlan.h index 946851808a..4a1ab5b26c 100644 --- a/components/drivers/include/drivers/wlan.h +++ b/components/drivers/include/drivers/wlan.h @@ -12,10 +12,10 @@ #define __WLAN_H__ #include <rtthread.h> -#include <wlan_dev.h> -#include <wlan_cfg.h> -#include <wlan_mgnt.h> -#include <wlan_prot.h> -#include <wlan_workqueue.h> +#include <dev_wlan.h> +#include <dev_wlan_cfg.h> +#include <dev_wlan_mgnt.h> +#include <dev_wlan_prot.h> +#include <dev_wlan_workqueue.h> #endif diff --git a/components/drivers/include/rtdevice.h b/components/drivers/include/rtdevice.h index caff5284e5..c8ed3c0489 100644 --- a/components/drivers/include/rtdevice.h +++ b/components/drivers/include/rtdevice.h @@ -66,7 +66,7 @@ extern "C" { #endif /* RT_USING_RTC */ #ifdef RT_USING_SPI -#include "drivers/spi.h" +#include "drivers/dev_spi.h" #endif /* RT_USING_SPI */ #ifdef RT_USING_MTD_NOR @@ -87,9 +87,9 @@ extern "C" { #ifdef RT_USING_SERIAL #ifdef RT_USING_SERIAL_V2 -#include "drivers/serial_v2.h" +#include "drivers/dev_serial_v2.h" #else -#include "drivers/serial.h" +#include "drivers/dev_serial.h" #endif #endif /* RT_USING_SERIAL */ @@ -111,14 +111,14 @@ extern "C" { #endif /* RT_USING_PHY */ #ifdef RT_USING_SDIO -#include "drivers/mmcsd_core.h" -#include "drivers/sd.h" -#include "drivers/sdio.h" +#include "drivers/dev_mmcsd_core.h" +#include "drivers/dev_sd.h" +#include "drivers/dev_sdio.h" #endif /* RT_USING_SDIO */ #ifdef RT_USING_WDT -#include "drivers/watchdog.h" +#include "drivers/dev_watchdog.h" #endif /* RT_USING_WDT */ #ifdef RT_USING_PIN @@ -190,7 +190,7 @@ extern "C" { #endif /* RT_USING_INPUT_CAPTURE */ #ifdef RT_USING_TOUCH -#include "drivers/touch.h" +#include "drivers/dev_touch.h" #endif #ifdef RT_USING_DEV_BUS diff --git a/components/drivers/sdio/SConscript b/components/drivers/sdio/SConscript index d5b6eb1cb9..57f0587533 100644 --- a/components/drivers/sdio/SConscript +++ b/components/drivers/sdio/SConscript @@ -3,12 +3,12 @@ from building import * cwd = GetCurrentDir() src = Split(""" -block_dev.c -mmcsd_core.c -sd.c -sdio.c -gpt.c -mmc.c +dev_block.c +dev_mmcsd_core.c +dev_sd.c +dev_sdio.c +dev_gpt.c +dev_mmc.c """) # The set of source files associated with this SConscript file. diff --git a/components/drivers/sdio/block_dev.c b/components/drivers/sdio/dev_block.c index fcef99f170..e4097bc329 100644 --- a/components/drivers/sdio/block_dev.c +++ b/components/drivers/sdio/dev_block.c @@ -12,8 +12,8 @@ #include <dfs_fs.h> #include <dfs_file.h> -#include <drivers/mmcsd_core.h> -#include <drivers/gpt.h> +#include <drivers/dev_mmcsd_core.h> +#include <drivers/dev_gpt.h> #define DBG_TAG "SDIO" #ifdef RT_SDIO_DEBUG diff --git a/components/drivers/sdio/gpt.c b/components/drivers/sdio/dev_gpt.c index 53b686e9f6..047c6544fe 100644 --- a/components/drivers/sdio/gpt.c +++ b/components/drivers/sdio/dev_gpt.c @@ -9,8 +9,8 @@ */ #include <rtthread.h> #include <dfs_fs.h> -#include <drivers/gpt.h> -#include <drivers/mmcsd_core.h> +#include <drivers/dev_gpt.h> +#include <drivers/dev_mmcsd_core.h> #define DBG_TAG "GPT" #ifdef RT_SDIO_DEBUG diff --git a/components/drivers/sdio/mmc.c b/components/drivers/sdio/dev_mmc.c index 3723d9db76..6e1cdced0a 100644 --- a/components/drivers/sdio/mmc.c +++ b/components/drivers/sdio/dev_mmc.c @@ -9,8 +9,8 @@ * 2024-05-25 HPMicro add HS400 support */ -#include <drivers/mmcsd_core.h> -#include <drivers/mmc.h> +#include <drivers/dev_mmcsd_core.h> +#include <drivers/dev_mmc.h> #define DBG_TAG "SDIO" #ifdef RT_SDIO_DEBUG diff --git a/components/drivers/sdio/mmcsd_core.c b/components/drivers/sdio/dev_mmcsd_core.c index 77570268c1..33072c10dd 100644 --- a/components/drivers/sdio/mmcsd_core.c +++ b/components/drivers/sdio/dev_mmcsd_core.c @@ -9,10 +9,10 @@ */ #include <rtthread.h> -#include <drivers/mmcsd_core.h> -#include <drivers/sd.h> -#include <drivers/mmc.h> -#include <drivers/sdio.h> +#include <drivers/dev_mmcsd_core.h> +#include <drivers/dev_sd.h> +#include <drivers/dev_mmc.h> +#include <drivers/dev_sdio.h> #include <string.h> #define DBG_TAG "SDIO" diff --git a/components/drivers/sdio/sd.c b/components/drivers/sdio/dev_sd.c index a6f4dda93a..22725dbe1d 100644 --- a/components/drivers/sdio/sd.c +++ b/components/drivers/sdio/dev_sd.c @@ -9,8 +9,8 @@ * 2024-05-26 HPMicro add UHS-I support */ -#include <drivers/mmcsd_core.h> -#include <drivers/sd.h> +#include <drivers/dev_mmcsd_core.h> +#include <drivers/dev_sd.h> #define DBG_TAG "SDIO" #ifdef RT_SDIO_DEBUG diff --git a/components/drivers/sdio/sdio.c b/components/drivers/sdio/dev_sdio.c index 9fa3f539cd..013753a957 100644 --- a/components/drivers/sdio/sdio.c +++ b/components/drivers/sdio/dev_sdio.c @@ -10,9 +10,9 @@ * 2024-07-05 Evlers fix a bug that read members in non-existent functions */ -#include <drivers/mmcsd_core.h> -#include <drivers/sdio.h> -#include <drivers/sd.h> +#include <drivers/dev_mmcsd_core.h> +#include <drivers/dev_sdio.h> +#include <drivers/dev_sd.h> #define DBG_TAG "SDIO" #ifdef RT_SDIO_DEBUG diff --git a/components/drivers/serial/SConscript b/components/drivers/serial/SConscript index 7ee41a4331..ce9d221643 100644 --- a/components/drivers/serial/SConscript +++ b/components/drivers/serial/SConscript @@ -12,9 +12,9 @@ if GetDepend(['RT_USING_SMART']): src += Glob('serial_tty.c') if GetDepend(['RT_USING_SERIAL_V2']): - src += ['serial_v2.c'] + src += ['dev_serial_v2.c'] else: - src += ['serial.c'] + src += ['dev_serial.c'] if GetDepend(['RT_USING_DM']): src += ['serial_dm.c'] diff --git a/components/drivers/serial/serial.c b/components/drivers/serial/dev_serial.c index 19043e2ad2..19043e2ad2 100644 --- a/components/drivers/serial/serial.c +++ b/components/drivers/serial/dev_serial.c diff --git a/components/drivers/serial/serial_v2.c b/components/drivers/serial/dev_serial_v2.c index 111bfbca01..111bfbca01 100644 --- a/components/drivers/serial/serial_v2.c +++ b/components/drivers/serial/dev_serial_v2.c diff --git a/components/drivers/spi/SConscript b/components/drivers/spi/SConscript index cea447fab4..874db5b7e9 100644 --- a/components/drivers/spi/SConscript +++ b/components/drivers/spi/SConscript @@ -3,29 +3,29 @@ from gcc import * import rtconfig cwd = GetCurrentDir() -src = ['spi_core.c', 'spi_dev.c'] +src = ['dev_spi_core.c', 'dev_spi.c'] CPPPATH = [cwd, cwd + '/../include'] LOCAL_CFLAGS = '' if GetDepend('RT_USING_SPI_BITOPS'): - src += ['spi-bit-ops.c'] + src += ['dev_spi_bit_ops.c'] if GetDepend('RT_USING_QSPI'): - src += ['qspi_core.c'] + src += ['dev_qspi_core.c'] src_device = [] if GetDepend('RT_USING_SPI_WIFI'): - src_device += ['spi_wifi_rw009.c'] + src_device += ['dev_spi_wifi_rw009.c'] if GetDepend('RT_USING_ENC28J60'): src_device += ['enc28j60.c'] if GetDepend('RT_USING_SPI_MSD'): - src_device += ['spi_msd.c'] + src_device += ['dev_spi_msd.c'] if GetDepend('RT_USING_SFUD'): - src_device += ['spi_flash_sfud.c', 'sfud/src/sfud.c'] + src_device += ['dev_spi_flash_sfud.c', 'sfud/src/sfud.c'] CPPPATH += [cwd + '/sfud/inc'] if GetDepend('RT_SFUD_USING_SFDP'): src_device += ['sfud/src/sfud_sfdp.c'] diff --git a/components/drivers/spi/qspi_core.c b/components/drivers/spi/dev_qspi_core.c index cd40c51646..e56fd947d0 100644 --- a/components/drivers/spi/qspi_core.c +++ b/components/drivers/spi/dev_qspi_core.c @@ -8,7 +8,7 @@ * 2018-11-16 zylx first version. */ -#include <drivers/spi.h> +#include "drivers/dev_spi.h" rt_err_t rt_qspi_configure(struct rt_qspi_device *device, struct rt_qspi_configuration *cfg) { diff --git a/components/drivers/spi/spi_dev.c b/components/drivers/spi/dev_spi.c index 963b70c23b..b40ffd90db 100644 --- a/components/drivers/spi/spi_dev.c +++ b/components/drivers/spi/dev_spi.c @@ -8,7 +8,7 @@ */ #include <rtthread.h> -#include <drivers/spi.h> +#include "drivers/dev_spi.h" /* SPI bus device interface, compatible with RT-Thread 0.3.x/1.0.x */ static rt_ssize_t _spi_bus_device_read(rt_device_t dev, diff --git a/components/drivers/spi/spi-bit-ops.c b/components/drivers/spi/dev_spi_bit_ops.c index 679ee44f0c..d2a26a766d 100644 --- a/components/drivers/spi/spi-bit-ops.c +++ b/components/drivers/spi/dev_spi_bit_ops.c @@ -8,7 +8,7 @@ * 2021-10-11 kyle first version */ -#include <spi-bit-ops.h> +#include <dev_spi_bit_ops.h> #include <rtdevice.h> #define DBG_TAG "SPI" diff --git a/components/drivers/spi/spi-bit-ops.h b/components/drivers/spi/dev_spi_bit_ops.h index d1e83cdedd..cf2335efe6 100644 --- a/components/drivers/spi/spi-bit-ops.h +++ b/components/drivers/spi/dev_spi_bit_ops.h @@ -9,8 +9,8 @@ * 2022-6-14 solar Remove the const attribute of private data in ops */ -#ifndef __SPI_BIT_OPS_H__ -#define __SPI_BIT_OPS_H__ +#ifndef __DEV_SPI_BIT_OPS_H__ +#define __DEV_SPI_BIT_OPS_H__ #include <rtdevice.h> diff --git a/components/drivers/spi/spi_core.c b/components/drivers/spi/dev_spi_core.c index d9d4221d49..9733a01a5e 100644 --- a/components/drivers/spi/spi_core.c +++ b/components/drivers/spi/dev_spi_core.c @@ -13,7 +13,7 @@ * 2012-09-28 aozima fixed rt_spi_release_bus assert error. */ -#include <drivers/spi.h> +#include "drivers/dev_spi.h" #define DBG_TAG "spi.core" #define DBG_LVL DBG_INFO diff --git a/components/drivers/spi/spi_flash.h b/components/drivers/spi/dev_spi_flash.h index 2651c76fa4..5ae54c4e2a 100644 --- a/components/drivers/spi/spi_flash.h +++ b/components/drivers/spi/dev_spi_flash.h @@ -9,8 +9,8 @@ * 2020/1/7 redoc add include */ -#ifndef SPI_FLASH_H__ -#define SPI_FLASH_H__ +#ifndef __DEV_SPI_FLASH_H__ +#define __DEV_SPI_FLASH_H__ #include <rtdevice.h> diff --git a/components/drivers/spi/spi_flash_sfud.c b/components/drivers/spi/dev_spi_flash_sfud.c index 761c9ccc0d..e1c90db9e6 100644 --- a/components/drivers/spi/spi_flash_sfud.c +++ b/components/drivers/spi/dev_spi_flash_sfud.c @@ -11,8 +11,8 @@ #include <stdint.h> #include <string.h> #include <rtdevice.h> -#include "spi_flash.h" -#include "spi_flash_sfud.h" +#include "dev_spi_flash.h" +#include "dev_spi_flash_sfud.h" #ifdef RT_USING_SFUD diff --git a/components/drivers/spi/spi_flash_sfud.h b/components/drivers/spi/dev_spi_flash_sfud.h index 6099c9823b..7769ddc808 100644 --- a/components/drivers/spi/spi_flash_sfud.h +++ b/components/drivers/spi/dev_spi_flash_sfud.h @@ -8,13 +8,13 @@ * 2016-09-28 armink first version. */ -#ifndef _SPI_FLASH_SFUD_H_ -#define _SPI_FLASH_SFUD_H_ +#ifndef __DEV_SPI_FLASH_SFUD_H__ +#define __DEV_SPI_FLASH_SFUD_H__ #include <rtthread.h> #include <rtdevice.h> #include "./sfud/inc/sfud.h" -#include "spi_flash.h" +#include "dev_spi_flash.h" /** * Probe SPI flash by SFUD(Serial Flash Universal Driver) driver library and though SPI device. @@ -66,4 +66,4 @@ sfud_flash_t rt_sfud_flash_find(const char *spi_dev_name); */ sfud_flash_t rt_sfud_flash_find_by_dev_name(const char *flash_dev_name); -#endif /* _SPI_FLASH_SFUD_H_ */ +#endif /* __DEV_SPI_FLASH_SFUD_H__ */ diff --git a/components/drivers/spi/spi_msd.c b/components/drivers/spi/dev_spi_msd.c index 0ca1bdfbb5..8d81e348af 100644 --- a/components/drivers/spi/spi_msd.c +++ b/components/drivers/spi/dev_spi_msd.c @@ -14,7 +14,7 @@ */ #include <string.h> -#include "spi_msd.h" +#include "dev_spi_msd.h" //#define MSD_TRACE diff --git a/components/drivers/spi/spi_msd.h b/components/drivers/spi/dev_spi_msd.h index 2b66be7d67..7304b13853 100644 --- a/components/drivers/spi/spi_msd.h +++ b/components/drivers/spi/dev_spi_msd.h @@ -8,12 +8,12 @@ * 2009-04-17 Bernard first version. */ -#ifndef SPI_MSD_H_INCLUDED -#define SPI_MSD_H_INCLUDED +#ifndef __DEV_SPI_MSD_H_INCLUDED__ +#define __DEV_SPI_MSD_H_INCLUDED__ #include <stdint.h> #include <rtdevice.h> -#include <drivers/spi.h> +#include "drivers/dev_spi.h" /* SD command (SPI mode) */ #define GO_IDLE_STATE 0 /* CMD0 R1 */ @@ -125,4 +125,4 @@ struct msd_device extern rt_err_t msd_init(const char * sd_device_name, const char * spi_device_name); -#endif // SPI_MSD_H_INCLUDED +#endif // __DEV_SPI_MSD_H_INCLUDED diff --git a/components/drivers/spi/spi_wifi_rw009.c b/components/drivers/spi/dev_spi_wifi_rw009.c index 44f70e2b77..b3bd807ebd 100644 --- a/components/drivers/spi/spi_wifi_rw009.c +++ b/components/drivers/spi/dev_spi_wifi_rw009.c @@ -11,7 +11,7 @@ */ #include <rtthread.h> -#include <drivers/spi.h> +#include "drivers/dev_spi.h" #include <netif/ethernetif.h> #include <netif/etharp.h> @@ -32,7 +32,7 @@ #endif /* #ifdef WIFI_DEBUG_ON */ /********************************* RW009 **************************************/ -#include "spi_wifi_rw009.h" +#include "dev_spi_wifi_rw009.h" /* tools */ #define node_entry(node, type, member) \ diff --git a/components/drivers/spi/spi_wifi_rw009.h b/components/drivers/spi/dev_spi_wifi_rw009.h index 9bba2694af..5aecbce935 100644 --- a/components/drivers/spi/spi_wifi_rw009.h +++ b/components/drivers/spi/dev_spi_wifi_rw009.h @@ -9,8 +9,8 @@ * 2014-09-18 aozima update command & response. */ -#ifndef SPI_WIFI_H_INCLUDED -#define SPI_WIFI_H_INCLUDED +#ifndef __DEV_SPI_WIFI_H_INCLUDED__ +#define __DEV_SPI_WIFI_H_INCLUDED__ #include <stdint.h> @@ -209,4 +209,4 @@ extern int32_t rw009_rssi(void); extern rt_err_t rw009_join(const char * SSID, const char * passwd); extern rt_err_t rw009_softap(const char * SSID, const char * passwd,uint32_t security,uint32_t channel); -#endif // SPI_WIFI_H_INCLUDED +#endif // __DEV_SPI_WIFI_H_INCLUDED__ diff --git a/components/drivers/spi/enc28j60.h b/components/drivers/spi/enc28j60.h index 017877adcd..013222c7c8 100644 --- a/components/drivers/spi/enc28j60.h +++ b/components/drivers/spi/enc28j60.h @@ -6,13 +6,13 @@ * Change Logs: * Date Author Notes */ -#ifndef EN28J60_H_INCLUDED -#define EN28J60_H_INCLUDED +#ifndef __EN28J60_H_INCLUDED__ +#define __EN28J60_H_INCLUDED__ #include <stdint.h> #include <rtthread.h> -#include <drivers/spi.h> +#include "drivers/dev_spi.h" #include <netif/ethernetif.h> // ENC28J60 Control Registers @@ -340,4 +340,4 @@ struct net_device extern rt_err_t enc28j60_attach(const char *spi_device_name); extern void enc28j60_isr(void); -#endif // EN28J60_H_INCLUDED +#endif // __EN28J60_H_INCLUDED__ diff --git a/components/drivers/touch/SConscript b/components/drivers/touch/SConscript index df698c7840..ba646b0a80 100644 --- a/components/drivers/touch/SConscript +++ b/components/drivers/touch/SConscript @@ -3,7 +3,7 @@ from building import * cwd = GetCurrentDir() -src = ['touch.c'] +src = ['dev_touch.c'] CPPPATH = [cwd, cwd + '/../include'] group = DefineGroup('DeviceDrivers', src, depend = ['RT_USING_TOUCH', 'RT_USING_DEVICE'], CPPPATH = CPPPATH) diff --git a/components/drivers/touch/touch.c b/components/drivers/touch/dev_touch.c index 713a6bb7b2..713a6bb7b2 100644 --- a/components/drivers/touch/touch.c +++ b/components/drivers/touch/dev_touch.c diff --git a/components/drivers/watchdog/watchdog.c b/components/drivers/watchdog/dev_watchdog.c index 6d8238b129..9293ebd818 100644 --- a/components/drivers/watchdog/watchdog.c +++ b/components/drivers/watchdog/dev_watchdog.c @@ -9,7 +9,7 @@ * 2014-03-04 Bernard code cleanup */ -#include <drivers/watchdog.h> +#include "drivers/dev_watchdog.h" /* RT-Thread Device Interface */ diff --git a/components/drivers/wlan/SConscript b/components/drivers/wlan/SConscript index f2a6bbdc82..fed9478201 100644 --- a/components/drivers/wlan/SConscript +++ b/components/drivers/wlan/SConscript @@ -4,26 +4,26 @@ cwd = GetCurrentDir() CPPPATH = [cwd] src = Split(''' - wlan_dev.c + dev_wlan.c ''') if GetDepend(['RT_WLAN_MANAGE_ENABLE']): - src += ['wlan_mgnt.c'] + src += ['dev_wlan_mgnt.c'] if GetDepend(['RT_WLAN_MSH_CMD_ENABLE']): - src += ['wlan_cmd.c'] + src += ['dev_wlan_cmd.c'] if GetDepend(['RT_WLAN_PROT_ENABLE']): - src += ['wlan_prot.c'] + src += ['dev_wlan_prot.c'] if GetDepend(['RT_WLAN_PROT_LWIP_ENABLE']): - src += ['wlan_lwip.c'] + src += ['dev_wlan_lwip.c'] if GetDepend(['RT_WLAN_CFG_ENABLE']): - src += ['wlan_cfg.c'] + src += ['dev_wlan_cfg.c'] if GetDepend(['RT_WLAN_WORK_THREAD_ENABLE']): - src += ['wlan_workqueue.c'] + src += ['dev_wlan_workqueue.c'] group = DefineGroup('DeviceDrivers', src, depend = ['RT_USING_WIFI'], CPPPATH = CPPPATH) diff --git a/components/drivers/wlan/wlan_dev.c b/components/drivers/wlan/dev_wlan.c index da4aa57497..a7029e6233 100644 --- a/components/drivers/wlan/wlan_dev.c +++ b/components/drivers/wlan/dev_wlan.c @@ -10,8 +10,8 @@ #include <rthw.h> #include <rtthread.h> -#include <wlan_dev.h> -#include <wlan_prot.h> +#include <dev_wlan.h> +#include <dev_wlan_prot.h> #define DBG_TAG "WLAN.dev" #ifdef RT_WLAN_DEV_DEBUG diff --git a/components/drivers/wlan/wlan_dev.h b/components/drivers/wlan/dev_wlan.h index 0a6c9b3d0d..d20487394e 100644 --- a/components/drivers/wlan/wlan_dev.h +++ b/components/drivers/wlan/dev_wlan.h @@ -8,8 +8,8 @@ * 2018-08-03 tyx the first version */ -#ifndef __WLAN_DEVICE_H__ -#define __WLAN_DEVICE_H__ +#ifndef __DEV_WLAN_DEVICE_H__ +#define __DEV_WLAN_DEVICE_H__ #ifdef __cplusplus extern "C" { diff --git a/components/drivers/wlan/wlan_cfg.c b/components/drivers/wlan/dev_wlan_cfg.c index ac49877c8d..e62ed9d93a 100644 --- a/components/drivers/wlan/wlan_cfg.c +++ b/components/drivers/wlan/dev_wlan_cfg.c @@ -9,7 +9,7 @@ */ #include <rtthread.h> -#include <wlan_cfg.h> +#include <dev_wlan_cfg.h> #define DBG_TAG "WLAN.cfg" #ifdef RT_WLAN_CFG_DEBUG diff --git a/components/drivers/wlan/wlan_cfg.h b/components/drivers/wlan/dev_wlan_cfg.h index 308850f74b..25e44ded72 100644 --- a/components/drivers/wlan/wlan_cfg.h +++ b/components/drivers/wlan/dev_wlan_cfg.h @@ -8,10 +8,10 @@ * 2018-08-06 tyx the first version */ -#ifndef __WLAN_CFG_H__ -#define __WLAN_CFG_H__ +#ifndef __DEV_WLAN_CFG_H__ +#define __DEV_WLAN_CFG_H__ -#include <wlan_dev.h> +#include <dev_wlan.h> #ifdef __cplusplus extern "C" { diff --git a/components/drivers/wlan/wlan_cmd.c b/components/drivers/wlan/dev_wlan_cmd.c index b50261d42a..6592281dac 100644 --- a/components/drivers/wlan/wlan_cmd.c +++ b/components/drivers/wlan/dev_wlan_cmd.c @@ -11,9 +11,9 @@ #include <rtthread.h> #include <rthw.h> -#include <wlan_mgnt.h> -#include <wlan_cfg.h> -#include <wlan_prot.h> +#include <dev_wlan_mgnt.h> +#include <dev_wlan_cfg.h> +#include <dev_wlan_prot.h> #define DBG_TAG "WLAN.cmd" #ifdef RT_WLAN_MGNT_DEBUG diff --git a/components/drivers/wlan/wlan_lwip.c b/components/drivers/wlan/dev_wlan_lwip.c index 08cf150d5f..21f43c115b 100644 --- a/components/drivers/wlan/wlan_lwip.c +++ b/components/drivers/wlan/dev_wlan_lwip.c @@ -10,9 +10,9 @@ #include <rthw.h> #include <rtthread.h> -#include <wlan_dev.h> -#include <wlan_prot.h> -#include <wlan_workqueue.h> +#include <dev_wlan.h> +#include <dev_wlan_prot.h> +#include <dev_wlan_workqueue.h> #if defined(RT_WLAN_PROT_ENABLE) && defined(RT_WLAN_PROT_LWIP_ENABLE) diff --git a/components/drivers/wlan/wlan_mgnt.c b/components/drivers/wlan/dev_wlan_mgnt.c index 5eccdfd101..124496aae2 100644 --- a/components/drivers/wlan/wlan_mgnt.c +++ b/components/drivers/wlan/dev_wlan_mgnt.c @@ -11,11 +11,11 @@ #include <rthw.h> #include <rtthread.h> -#include <wlan_dev.h> -#include <wlan_cfg.h> -#include <wlan_mgnt.h> -#include <wlan_prot.h> -#include <wlan_workqueue.h> +#include <dev_wlan.h> +#include <dev_wlan_cfg.h> +#include <dev_wlan_mgnt.h> +#include <dev_wlan_prot.h> +#include <dev_wlan_workqueue.h> // #define RT_WLAN_MGNT_DEBUG #define DBG_TAG "WLAN.mgnt" diff --git a/components/drivers/wlan/wlan_mgnt.h b/components/drivers/wlan/dev_wlan_mgnt.h index 4e98463a3c..dc5b17e994 100644 --- a/components/drivers/wlan/wlan_mgnt.h +++ b/components/drivers/wlan/dev_wlan_mgnt.h @@ -8,10 +8,10 @@ * 2018-08-06 tyx the first version */ -#ifndef __WLAN_MGNT_H__ -#define __WLAN_MGNT_H__ +#ifndef __DEV_WLAN_MGNT_H__ +#define __DEV_WLAN_MGNT_H__ -#include <wlan_dev.h> +#include <dev_wlan.h> #ifdef __cplusplus extern "C" { diff --git a/components/drivers/wlan/wlan_prot.c b/components/drivers/wlan/dev_wlan_prot.c index dd9b320655..53730338de 100644 --- a/components/drivers/wlan/wlan_prot.c +++ b/components/drivers/wlan/dev_wlan_prot.c @@ -10,8 +10,8 @@ #include <rthw.h> #include <rtthread.h> -#include <wlan_dev.h> -#include <wlan_prot.h> +#include <dev_wlan.h> +#include <dev_wlan_prot.h> #define DBG_TAG "WLAN.prot" #ifdef RT_WLAN_PROT_DEBUG diff --git a/components/drivers/wlan/wlan_prot.h b/components/drivers/wlan/dev_wlan_prot.h index 16515d68be..3ba1daa9fd 100644 --- a/components/drivers/wlan/wlan_prot.h +++ b/components/drivers/wlan/dev_wlan_prot.h @@ -8,8 +8,8 @@ * 2018-08-14 tyx the first version */ -#ifndef __WLAN_PROT_H__ -#define __WLAN_PROT_H__ +#ifndef __DEV_WLAN_PROT_H__ +#define __DEV_WLAN_PROT_H__ #ifdef __cplusplus extern "C" { diff --git a/components/drivers/wlan/wlan_workqueue.c b/components/drivers/wlan/dev_wlan_workqueue.c index 4c966b1175..c663a4ed7c 100644 --- a/components/drivers/wlan/wlan_workqueue.c +++ b/components/drivers/wlan/dev_wlan_workqueue.c @@ -10,7 +10,7 @@ #include <rthw.h> #include <rtthread.h> -#include <wlan_workqueue.h> +#include <dev_wlan_workqueue.h> #include <ipc/workqueue.h> #define DBG_TAG "WLAN.work" diff --git a/components/drivers/wlan/wlan_workqueue.h b/components/drivers/wlan/dev_wlan_workqueue.h index af12b1d196..f85f8493ce 100644 --- a/components/drivers/wlan/wlan_workqueue.h +++ b/components/drivers/wlan/dev_wlan_workqueue.h @@ -8,8 +8,8 @@ * 2018-08-19 tyx the first version */ -#ifndef __WLAN_WORKQUEUE_H__ -#define __WLAN_WORKQUEUE_H__ +#ifndef __DEV_WLAN_WORKQUEUE_H__ +#define __DEV_WLAN_WORKQUEUE_H__ #include <ipc/workqueue.h> |
