diff --git a/bsp/Infineon/libraries/HAL_Drivers/drv_spi.h b/bsp/Infineon/libraries/HAL_Drivers/drv_spi.h index ffcf87b3a5e..de422b0cc5b 100644 --- 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 -#include +#include #include "drv_gpio.h" diff --git a/bsp/airm2m/air32f103/libraries/rt_drivers/drv_spi.c b/bsp/airm2m/air32f103/libraries/rt_drivers/drv_spi.c index 4b39fa3d148..c2cfc5337d1 100644 --- 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 #include -#include +#include #include "board.h" #include "drv_spi.h" diff --git a/bsp/apm32/libraries/Drivers/drv_spi.h b/bsp/apm32/libraries/Drivers/drv_spi.h index 199958778ff..b30aeb43d75 100644 --- a/bsp/apm32/libraries/Drivers/drv_spi.h +++ b/bsp/apm32/libraries/Drivers/drv_spi.h @@ -13,7 +13,7 @@ #include "board.h" #include -#include +#include struct apm32_spi_config { diff --git a/bsp/at32/libraries/rt_drivers/drv_spi.h b/bsp/at32/libraries/rt_drivers/drv_spi.h index dd6cf48146e..43d5ac143d4 100644 --- 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 -#include +#include #include "drv_common.h" #include "drv_dma.h" diff --git a/bsp/hk32/libraries/rt_drivers/drv_spi.h b/bsp/hk32/libraries/rt_drivers/drv_spi.h index 2ac963b0a7e..40c666e6783 100644 --- 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 -#include +#include #include struct hk32_spi_config diff --git a/bsp/loongson/ls1cdev/drivers/drv_spi.c b/bsp/loongson/ls1cdev/drivers/drv_spi.c index 25b30e07ca1..ada6fc966c9 100644 --- a/bsp/loongson/ls1cdev/drivers/drv_spi.c +++ b/bsp/loongson/ls1cdev/drivers/drv_spi.c @@ -10,7 +10,7 @@ */ #include -#include +#include #include #include "drv_spi.h" #include "ls1c_public.h" diff --git a/bsp/loongson/ls1cdev/drivers/touch.c b/bsp/loongson/ls1cdev/drivers/touch.c index b5be15c9628..715f690d861 100644 --- a/bsp/loongson/ls1cdev/drivers/touch.c +++ b/bsp/loongson/ls1cdev/drivers/touch.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include "ls1c.h" #include "ls1c_gpio.h" #include "ls1c_spi.h" diff --git a/bsp/loongson/ls2kdev/drivers/drv_spi.c b/bsp/loongson/ls2kdev/drivers/drv_spi.c index daf069412b2..4eafbb9ae15 100644 --- a/bsp/loongson/ls2kdev/drivers/drv_spi.c +++ b/bsp/loongson/ls2kdev/drivers/drv_spi.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include "drv_spi.h" #ifdef RT_USING_SPI diff --git a/bsp/raspberry-pi/raspi3-32/driver/drv_spi.h b/bsp/raspberry-pi/raspi3-32/driver/drv_spi.h index 58ede93ef44..6edefb625e3 100644 --- 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 #include -//#include +//#include #include "board.h" #define SPI0_BASE_ADDR (PER_BASE + BCM283X_SPI0_BASE) diff --git a/bsp/raspberry-pi/raspi3-64/driver/drv_spi.h b/bsp/raspberry-pi/raspi3-64/driver/drv_spi.h index 58ede93ef44..6edefb625e3 100644 --- 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 #include -//#include +//#include #include "board.h" #define SPI0_BASE_ADDR (PER_BASE + BCM283X_SPI0_BASE) diff --git a/bsp/simulator/drivers/sst25vfxx_mtd.h b/bsp/simulator/drivers/sst25vfxx_mtd.h index 202c6884a35..697923c55e3 100644 --- a/bsp/simulator/drivers/sst25vfxx_mtd.h +++ b/bsp/simulator/drivers/sst25vfxx_mtd.h @@ -13,7 +13,7 @@ #define SST25VFXX_MTD_H #include -#include +#include rt_err_t sst25vfxx_mtd_init(const char *spi_device_name, rt_uint32_t block_start, rt_uint32_t block_end); diff --git a/bsp/tm4c123bsp/libraries/Drivers/drv_spi.h b/bsp/tm4c123bsp/libraries/Drivers/drv_spi.h index f657f304b69..6fc643c0594 100644 --- a/bsp/tm4c123bsp/libraries/Drivers/drv_spi.h +++ b/bsp/tm4c123bsp/libraries/Drivers/drv_spi.h @@ -14,7 +14,7 @@ #include #include #include -#include "drivers/spi.h" +#include "drivers/spi_core.h" rt_err_t rt_hw_spi_device_attach(const char *bus_name, const char *device_name, uint32_t portindex, uint32_t cs_gpiobase, uint32_t cs_gpio_pin); diff --git a/bsp/wch/arm/Libraries/ch32_drivers/drv_spi_ch32f10x.c b/bsp/wch/arm/Libraries/ch32_drivers/drv_spi_ch32f10x.c index 537676591a3..8c08731b8c5 100644 --- a/bsp/wch/arm/Libraries/ch32_drivers/drv_spi_ch32f10x.c +++ b/bsp/wch/arm/Libraries/ch32_drivers/drv_spi_ch32f10x.c @@ -10,7 +10,7 @@ #include #include -#include +#include #include "board.h" #include "drv_spi.h" #include "ch32f10x_spi.h" diff --git a/bsp/wch/arm/Libraries/ch32_drivers/drv_spi_ch32f20x.c b/bsp/wch/arm/Libraries/ch32_drivers/drv_spi_ch32f20x.c index 5db7b82a652..17ebaec0b12 100644 --- a/bsp/wch/arm/Libraries/ch32_drivers/drv_spi_ch32f20x.c +++ b/bsp/wch/arm/Libraries/ch32_drivers/drv_spi_ch32f20x.c @@ -10,7 +10,7 @@ #include #include -#include +#include #include "board.h" #include "drv_spi.h" #include "ch32f20x_spi.h" diff --git a/bsp/wch/risc-v/Libraries/ch56x_drivers/ch56x_spi.c b/bsp/wch/risc-v/Libraries/ch56x_drivers/ch56x_spi.c index 68b10f0eaed..97ece576589 100644 --- a/bsp/wch/risc-v/Libraries/ch56x_drivers/ch56x_spi.c +++ b/bsp/wch/risc-v/Libraries/ch56x_drivers/ch56x_spi.c @@ -8,7 +8,7 @@ * 2022-07-30 Emuzit first version */ #include -#include +#include #include #include "ch56x_spi.h" #include "ch56x_sys.h" diff --git a/bsp/wch/risc-v/ch569w-evt/applications/test.c b/bsp/wch/risc-v/ch569w-evt/applications/test.c index a1396af8793..9bba48efdce 100644 --- a/bsp/wch/risc-v/ch569w-evt/applications/test.c +++ b/bsp/wch/risc-v/ch569w-evt/applications/test.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include "board.h" diff --git a/components/drivers/include/drivers/spi.h b/components/drivers/include/drivers/spi_core.h similarity index 98% rename from components/drivers/include/drivers/spi.h rename to components/drivers/include/drivers/spi_core.h index b35c7b30b31..347f9426bc3 100644 --- a/components/drivers/include/drivers/spi.h +++ b/components/drivers/include/drivers/spi_core.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2023, RT-Thread Development Team + * Copyright (c) 2006-2024, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * @@ -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 __SPI_CORE_H__ +#define __SPI_CORE_H__ #include #include @@ -81,6 +81,7 @@ struct rt_spi_configuration rt_uint16_t reserved; rt_uint32_t max_hz; + rt_uint32_t usage_freq; }; struct rt_spi_ops; diff --git a/components/drivers/include/rtdevice.h b/components/drivers/include/rtdevice.h index 5b080fced70..79ace598925 100644 --- a/components/drivers/include/rtdevice.h +++ b/components/drivers/include/rtdevice.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2023, RT-Thread Development Team + * Copyright (c) 2006-2024, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * @@ -66,7 +66,7 @@ extern "C" { #endif /* RT_USING_RTC */ #ifdef RT_USING_SPI -#include "drivers/spi.h" +#include "drivers/spi_core.h" #endif /* RT_USING_SPI */ #ifdef RT_USING_MTD_NOR diff --git a/components/drivers/spi/enc28j60.c b/components/drivers/spi/enc28j60.c index fe0bf46fd69..ddc7b151d47 100644 --- a/components/drivers/spi/enc28j60.c +++ b/components/drivers/spi/enc28j60.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2023, RT-Thread Development Team + * Copyright (c) 2006-2024, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/components/drivers/spi/enc28j60.h b/components/drivers/spi/enc28j60.h index 017877adcd6..9f61810f80c 100644 --- a/components/drivers/spi/enc28j60.h +++ b/components/drivers/spi/enc28j60.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2023, RT-Thread Development Team + * Copyright (c) 2006-2024, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * @@ -12,7 +12,7 @@ #include #include -#include +#include #include // ENC28J60 Control Registers diff --git a/components/drivers/spi/qspi_core.c b/components/drivers/spi/qspi_core.c index cd40c516461..ca0eaa352d8 100644 --- a/components/drivers/spi/qspi_core.c +++ b/components/drivers/spi/qspi_core.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2023, RT-Thread Development Team + * Copyright (c) 2006-2024, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * @@ -8,7 +8,7 @@ * 2018-11-16 zylx first version. */ -#include +#include rt_err_t rt_qspi_configure(struct rt_qspi_device *device, struct rt_qspi_configuration *cfg) { diff --git a/components/drivers/spi/spi-bit-ops.h b/components/drivers/spi/spi-bit-ops.h index d1e83cdeddf..50d96d3e8f4 100644 --- a/components/drivers/spi/spi-bit-ops.h +++ b/components/drivers/spi/spi-bit-ops.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2023, RT-Thread Development Team + * Copyright (c) 2006-2024, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/components/drivers/spi/spi_core.c b/components/drivers/spi/spi_core.c index d9d4221d49f..dc674c1720c 100644 --- a/components/drivers/spi/spi_core.c +++ b/components/drivers/spi/spi_core.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2023, RT-Thread Development Team + * Copyright (c) 2006-2024, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * @@ -13,7 +13,7 @@ * 2012-09-28 aozima fixed rt_spi_release_bus assert error. */ -#include +#include #define DBG_TAG "spi.core" #define DBG_LVL DBG_INFO diff --git a/components/drivers/spi/spi_dev.c b/components/drivers/spi/spi_dev.c index 963b70c23bf..adc90f6699d 100644 --- a/components/drivers/spi/spi_dev.c +++ b/components/drivers/spi/spi_dev.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2023, RT-Thread Development Team + * Copyright (c) 2006-2024, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * @@ -8,7 +8,7 @@ */ #include -#include +#include /* 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_flash.h b/components/drivers/spi/spi_flash.h index 2651c76fa47..130279951d2 100644 --- a/components/drivers/spi/spi_flash.h +++ b/components/drivers/spi/spi_flash.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2023, RT-Thread Development Team + * Copyright (c) 2006-2024, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/components/drivers/spi/spi_flash_sfud.c b/components/drivers/spi/spi_flash_sfud.c index 761c9ccc0de..59e1439747f 100644 --- a/components/drivers/spi/spi_flash_sfud.c +++ b/components/drivers/spi/spi_flash_sfud.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2023, RT-Thread Development Team + * Copyright (c) 2006-2024, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/components/drivers/spi/spi_flash_sfud.h b/components/drivers/spi/spi_flash_sfud.h index 6099c9823b7..8f5605bf5b0 100644 --- a/components/drivers/spi/spi_flash_sfud.h +++ b/components/drivers/spi/spi_flash_sfud.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2023, RT-Thread Development Team + * Copyright (c) 2006-2024, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/components/drivers/spi/spi_msd.c b/components/drivers/spi/spi_msd.c index 0ca1bdfbb59..1c829c0d2ae 100644 --- a/components/drivers/spi/spi_msd.c +++ b/components/drivers/spi/spi_msd.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2023, RT-Thread Development Team + * Copyright (c) 2006-2024, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/components/drivers/spi/spi_msd.h b/components/drivers/spi/spi_msd.h index 2b66be7d67c..e0672f55e4e 100644 --- a/components/drivers/spi/spi_msd.h +++ b/components/drivers/spi/spi_msd.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2023, RT-Thread Development Team + * Copyright (c) 2006-2024, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * @@ -13,7 +13,7 @@ #include #include -#include +#include /* SD command (SPI mode) */ #define GO_IDLE_STATE 0 /* CMD0 R1 */ diff --git a/components/drivers/spi/spi_wifi_rw009.c b/components/drivers/spi/spi_wifi_rw009.c index 44f70e2b77a..71130852d60 100644 --- a/components/drivers/spi/spi_wifi_rw009.c +++ b/components/drivers/spi/spi_wifi_rw009.c @@ -1,5 +1,5 @@ /* - * COPYRIGHT (C) 2011-2023, Real-Thread Information Technology Ltd + * COPYRIGHT (C) 2011-2024, Real-Thread Information Technology Ltd * * SPDX-License-Identifier: Apache-2.0 * @@ -11,7 +11,7 @@ */ #include -#include +#include #include #include diff --git a/components/drivers/spi/spi_wifi_rw009.h b/components/drivers/spi/spi_wifi_rw009.h index 9bba2694afe..339f5045350 100644 --- a/components/drivers/spi/spi_wifi_rw009.h +++ b/components/drivers/spi/spi_wifi_rw009.h @@ -1,5 +1,5 @@ /* - * COPYRIGHT (C) 2011-2023, Real-Thread Information Technology Ltd + * COPYRIGHT (C) 2011-2024, Real-Thread Information Technology Ltd * * SPDX-License-Identifier: Apache-2.0 *