[components][drivers][spi]重命名spi.h为spi_core.h

RT-Thread · Jul 2, 2024 · 1a6409c · 1a6409c
1 parent ec70a01
commit 1a6409c
Show file tree

Hide file tree

Showing 31 changed files with 41 additions and 40 deletions.
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/spi_core.h>
 
 #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
@@ -10,7 +10,7 @@
 
 #include <rtthread.h>
 #include <rtdevice.h>
-#include <drivers/spi.h>
+#include <drivers/spi_core.h>
 #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
@@ -13,7 +13,7 @@
 
 #include "board.h"
 #include <rtthread.h>
-#include <drivers/spi.h>
+#include <drivers/spi_core.h>
 
 struct apm32_spi_config
 {

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/spi_core.h>
 #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
@@ -12,7 +12,7 @@
 #define __DRV_SPI__
 
 #include <rtthread.h>
-#include <drivers/spi.h>
+#include <drivers/spi_core.h>
 #include <hk32f0xx.h>
 
 struct hk32_spi_config

diff --git a/bsp/loongson/ls1cdev/drivers/drv_spi.c b/bsp/loongson/ls1cdev/drivers/drv_spi.c
@@ -10,7 +10,7 @@
  */
 
 #include <rtthread.h>
-#include <drivers/spi.h>
+#include <drivers/spi_core.h>
 #include <rthw.h>
 #include "drv_spi.h"
 #include "ls1c_public.h"

diff --git 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/spi_core.h>
 #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
@@ -18,7 +18,7 @@
 #include <ctype.h>
 #include <stdint.h>
 #include <rtthread.h>
-#include <drivers/spi.h>
+#include <drivers/spi_core.h>
 #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
@@ -14,7 +14,7 @@
 #include <rtthread.h>
 #include <rtdevice.h>
 
-//#include <drivers/spi.h>
+//#include <drivers/spi_core.h>
 #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
@@ -14,7 +14,7 @@
 #include <rtthread.h>
 #include <rtdevice.h>
 
-//#include <drivers/spi.h>
+//#include <drivers/spi_core.h>
 #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
@@ -13,7 +13,7 @@
 #define SST25VFXX_MTD_H
 
 #include <rtthread.h>
-#include <drivers/spi.h>
+#include <drivers/spi_core.h>
 
 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
@@ -14,7 +14,7 @@
 #include <stdint.h>
 #include <rtdevice.h>
 #include <rthw.h>
-#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
@@ -10,7 +10,7 @@
 
 #include <rtthread.h>
 #include <rtdevice.h>
-#include <drivers/spi.h>
+#include <drivers/spi_core.h>
 #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
@@ -10,7 +10,7 @@
 
 #include <rtthread.h>
 #include <rtdevice.h>
-#include <drivers/spi.h>
+#include <drivers/spi_core.h>
 #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
@@ -8,7 +8,7 @@
  * 2022-07-30     Emuzit            first version
  */
 #include <rthw.h>
-#include <drivers/spi.h>
+#include <drivers/spi_core.h>
 #include <drivers/pin.h>
 #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
@@ -15,7 +15,7 @@
 #include <drivers/pin.h>
 #include <drivers/watchdog.h>
 #include <drivers/hwtimer.h>
-#include <drivers/spi.h>
+#include <drivers/spi_core.h>
 #include <drivers/rt_drv_pwm.h>
 #include "board.h"
 

diff --git a/components/drivers/include/drivers/spi.h → ...onents/drivers/include/drivers/spi_core.h b/components/drivers/include/drivers/spi.h → ...onents/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 <stdlib.h>
 #include <rtthread.h>
@@ -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
@@ -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
@@ -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
@@ -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 <stdint.h>
 
 #include <rtthread.h>
-#include <drivers/spi.h>
+#include <drivers/spi_core.h>
 #include <netif/ethernetif.h>
 
 // ENC28J60 Control Registers

diff --git 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 <drivers/spi.h>
+#include <drivers/spi_core.h>
 
 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
@@ -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
@@ -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 <drivers/spi.h>
+#include <drivers/spi_core.h>
 
 #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
@@ -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 <rtthread.h>
-#include <drivers/spi.h>
+#include <drivers/spi_core.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_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
@@ -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
@@ -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
@@ -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
@@ -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 <stdint.h>
 #include <rtdevice.h>
-#include <drivers/spi.h>
+#include <drivers/spi_core.h>
 
 /* 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
@@ -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 <rtthread.h>
-#include <drivers/spi.h>
+#include <drivers/spi_core.h>
 
 #include <netif/ethernetif.h>
 #include <netif/etharp.h>

diff --git 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
  *