Move RCC from drivers to platform (#14430)

* Move RCC from drivers to platform * Extra line removed * Suggestion from code rabbit * Remove else and require explicit
2025-07-12 19:10:32 +03:00 · 2025-06-07 09:41:37 +10:00 · 2025-06-07 09:41:37 +10:00 · 0bb1254ee8
commit 0bb1254ee8
parent 4853ec7b8a
86 changed files with 130 additions and 88 deletions
--- a/src/main/drivers/adc_impl.h
+++ b/src/main/drivers/adc_impl.h
@ -20,10 +20,14 @@

 #pragma once

+#include "platform.h"
 #include "drivers/adc.h"
 #include "drivers/dma.h"
 #include "drivers/io_types.h"
-#include "drivers/rcc_types.h"
+
+#if PLATFORM_TRAIT_RCC
+#include "platform/rcc_types.h"
+#endif

 #if defined(STM32F4) || defined(STM32F7)
 #define ADC_TAG_MAP_COUNT 16
@ -73,8 +77,8 @@ typedef struct adcTagMap_s {
 #define ADC_DEVICES_345 ((1 << ADCDEV_3)|(1 << ADCDEV_4)|(1 << ADCDEV_5))

 typedef struct adcDevice_s {
-#if !defined(SIMULATOR_BUILD)
    ADC_TypeDef* ADCx;
+#if PLATFORM_TRAIT_RCC
    rccPeriphTag_t rccADC;
 #endif
 #if !defined(USE_DMA_SPEC)
--- a/src/main/drivers/bus_i2c.h
+++ b/src/main/drivers/bus_i2c.h
@ -23,7 +23,6 @@
 #include "platform.h"

 #include "drivers/io_types.h"
-#include "drivers/rcc_types.h"

 #ifndef I2C_DEVICE
 #define I2C_DEVICE I2CINVALID
--- a/src/main/drivers/bus_i2c_impl.h
+++ b/src/main/drivers/bus_i2c_impl.h
@ -23,7 +23,10 @@
 #include "platform.h"

 #include "drivers/io_types.h"
-#include "drivers/rcc_types.h"
+
+#if PLATFORM_TRAIT_RCC
+#include "platform/rcc_types.h"
+#endif

 #define I2C_TIMEOUT_US          10000
 #define I2C_TIMEOUT_SYS_TICKS   (I2C_TIMEOUT_US / 1000)
--- a/src/main/drivers/bus_quadspi.c
+++ b/src/main/drivers/bus_quadspi.c
@ -32,7 +32,10 @@
 #include "drivers/bus_quadspi_impl.h"
 #include "drivers/exti.h"
 #include "drivers/io.h"
-#include "drivers/rcc.h"
+
+#if PLATFORM_TRAIT_RCC
+#include "platform/rcc.h"
+#endif

 #include "pg/bus_quadspi.h"

@ -264,7 +267,9 @@ void quadSpiPinConfigure(const quadSpiConfig_t *pConfig)

        if (haveResources) {
            pDev->dev = hw->reg;
+#if PLATFORM_TRAIT_RCC
            pDev->rcc = hw->rcc;
+#endif
        }
    }
 }
--- a/src/main/drivers/bus_quadspi.h
+++ b/src/main/drivers/bus_quadspi.h
@ -23,7 +23,6 @@
 #pragma once

 #include "drivers/io_types.h"
-#include "drivers/rcc_types.h"

 #include "pg/pg.h"
 #include "pg/pg_ids.h"
--- a/src/main/drivers/bus_quadspi_impl.h
+++ b/src/main/drivers/bus_quadspi_impl.h
@ -22,17 +22,19 @@

 #pragma once

+#include "platform.h"
+
+#if PLATFORM_TRAIT_RCC
+#include "platform/rcc_types.h"
+#endif
+
 typedef struct quadSpiPinDef_s {
    ioTag_t pin;
-#if defined(STM32H7)
+#if QUADSPI_TRAIT_AF_PIN
    uint8_t af;
 #endif
 } quadSpiPinDef_t;

-#if defined(STM32H7)
-#define MAX_QUADSPI_PIN_SEL 3
-#endif
-
 typedef struct quadSpiHardware_s {
    QUADSPIDevice device;
    QUADSPI_TypeDef *reg;
@ -48,7 +50,9 @@ typedef struct quadSpiHardware_s {
    quadSpiPinDef_t bk2IO3Pins[MAX_QUADSPI_PIN_SEL];
    quadSpiPinDef_t bk2CSPins[MAX_QUADSPI_PIN_SEL];

+#if PLATFORM_TRAIT_RCC
    rccPeriphTag_t rcc;
+#endif
 } quadSpiHardware_t;

 extern const quadSpiHardware_t quadSpiHardware[];
@ -78,9 +82,12 @@ typedef struct QUADSPIDevice_s {
    uint8_t bk2IO3AF;
    uint8_t bk2CSAF;
 #endif
+
+#if PLATFORM_TRAIT_RCC
    rccPeriphTag_t rcc;
+#endif
    volatile uint16_t errorCount;
-#if defined(USE_HAL_DRIVER)
+#if QUADSPI_TRAIT_HANDLE
    QSPI_HandleTypeDef hquadSpi;
 #endif
 } quadSpiDevice_t;
--- a/src/main/drivers/bus_spi_impl.h
+++ b/src/main/drivers/bus_spi_impl.h
@ -20,6 +20,12 @@

 #pragma once

+#include "platform.h"
+
+#if PLATFORM_TRAIT_RCC
+#include "platform/rcc_types.h"
+#endif
+
 #define SPI_TIMEOUT_US  10000

 #define BUS_SPI_FREE   0x0
@ -40,9 +46,11 @@ typedef struct spiHardware_s {
 #if SPI_TRAIT_AF_PORT
    uint8_t af;
 #endif
+
 #if PLATFORM_TRAIT_RCC
    rccPeriphTag_t rcc;
 #endif
+
 #ifdef USE_DMA
    uint8_t dmaIrqHandler;
 #endif
@ -59,7 +67,8 @@ typedef struct SPIDevice_s {
    uint8_t sckAF;
    uint8_t misoAF;
    uint8_t mosiAF;
-#else
+#endif
+#if SPI_TRAIT_AF_PORT
    uint8_t af;
 #endif
 #if SPI_TRAIT_HANDLE
--- a/src/main/drivers/io.c
+++ b/src/main/drivers/io.c
@ -22,7 +22,6 @@

 #include "drivers/io.h"
 #include "drivers/io_impl.h"
-#include "drivers/rcc.h"

 #include "common/utils.h"

--- a/src/main/drivers/rangefinder/rangefinder_hcsr04.c
+++ b/src/main/drivers/rangefinder/rangefinder_hcsr04.c
@ -30,7 +30,6 @@
 #include "drivers/exti.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
 #include "drivers/time.h"

 #include "drivers/rangefinder/rangefinder.h"
--- a/src/main/drivers/rx/rx_spi.c
+++ b/src/main/drivers/rx/rx_spi.c
@ -35,7 +35,6 @@
 #include "drivers/io.h"
 #include "drivers/io_impl.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
 #include "drivers/system.h"
 #include "drivers/time.h"

--- a/src/main/drivers/serial_uart.c
+++ b/src/main/drivers/serial_uart.c
@ -42,7 +42,6 @@

 #include "drivers/dma.h"
 #include "drivers/dma_reqmap.h"
-#include "drivers/rcc.h"
 #include "drivers/serial.h"
 #include "drivers/serial_impl.h"
 #include "drivers/serial_uart.h"
--- a/src/main/drivers/serial_uart_impl.h
+++ b/src/main/drivers/serial_uart_impl.h
@ -33,6 +33,10 @@

 #include "platform.h"

+#if PLATFORM_TRAIT_RCC
+#include "platform/rcc_types.h"
+#endif
+
 #ifndef UART_RX_BUFFER_SIZE
 #define UART_RX_BUFFER_SIZE     256
 #endif
--- a/src/main/drivers/serial_uart_pinconfig.c
+++ b/src/main/drivers/serial_uart_pinconfig.c
@ -36,7 +36,6 @@

 #include "build/build_config.h"

-#include "drivers/rcc.h"
 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
 #include "drivers/serial_uart_impl.h"
--- a/src/main/drivers/timer.h
+++ b/src/main/drivers/timer.h
@ -25,7 +25,11 @@

 #include "drivers/dma.h"
 #include "drivers/io_types.h"
-#include "drivers/rcc_types.h"
+
+#if PLATFORM_TRAIT_RCC
+#include "platform/rcc_types.h"
+#endif
+
 #include "drivers/resource.h"

 #ifdef USE_TIMER
@ -69,7 +73,9 @@ typedef struct timerOvrHandlerRec_s {

 typedef struct timerDef_s {
    TIM_TypeDef *TIMx;
+#if PLATFORM_TRAIT_RCC
    rccPeriphTag_t rcc;
+#endif
    uint8_t inputIrq;
 } timerDef_t;

@ -180,7 +186,9 @@ uint32_t timerClock(const TIM_TypeDef *tim);
 void configTimeBase(TIM_TypeDef *tim, uint16_t period, uint32_t hz);  // TODO - just for migration
 void timerReconfigureTimeBase(TIM_TypeDef *tim, uint16_t period, uint32_t hz);

+#if PLATFORM_TRAIT_RCC
 rccPeriphTag_t timerRCC(const TIM_TypeDef *tim);
+#endif
 uint8_t timerInputIrq(const TIM_TypeDef *tim);

 #if defined(USE_TIMER_MGMT)
--- a/src/main/pg/bus_i2c.h
+++ b/src/main/pg/bus_i2c.h
@ -22,7 +22,6 @@

 #include "drivers/bus_i2c.h"
 #include "drivers/io_types.h"
-#include "drivers/rcc_types.h"

 #include "pg/pg.h"

--- a/src/platform/APM32/adc_apm32f4xx.c
+++ b/src/platform/APM32/adc_apm32f4xx.c
@ -32,7 +32,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/io_impl.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/dma.h"
 #include "drivers/sensor.h"
 #include "drivers/adc.h"
--- a/src/platform/APM32/bus_i2c_apm32.c
+++ b/src/platform/APM32/bus_i2c_apm32.c
@ -31,7 +31,7 @@
 #include "drivers/io_impl.h"
 #include "drivers/nvic.h"
 #include "drivers/time.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 #include "drivers/bus_i2c.h"
 #include "drivers/bus_i2c_impl.h"
--- a/src/platform/APM32/bus_i2c_apm32_init.c
+++ b/src/platform/APM32/bus_i2c_apm32_init.c
@ -30,7 +30,7 @@
 #include "drivers/io.h"
 #include "drivers/nvic.h"
 #include "drivers/time.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 #include "drivers/bus_i2c.h"
 #include "drivers/bus_i2c_impl.h"
--- a/src/platform/APM32/bus_spi_apm32.c
+++ b/src/platform/APM32/bus_spi_apm32.c
@ -35,7 +35,7 @@
 #include "drivers/bus_spi_impl.h"
 #include "drivers/dma.h"
 #include "drivers/io.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 // Use DMA if possible if this many bytes are to be transferred
 #define SPI_DMA_THRESHOLD 8
--- a/src/platform/APM32/dma_apm32f4xx.c
+++ b/src/platform/APM32/dma_apm32f4xx.c
@ -29,7 +29,7 @@

 #include "drivers/nvic.h"
 #include "drivers/dma.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/resource.h"

 /*
--- a/src/platform/APM32/io_apm32.c
+++ b/src/platform/APM32/io_apm32.c
@ -23,7 +23,7 @@

 #include "drivers/io.h"
 #include "drivers/io_impl.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 #include "common/utils.h"

--- a/src/platform/APM32/light_ws2811strip_apm32.c
+++ b/src/platform/APM32/light_ws2811strip_apm32.c
@ -32,7 +32,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/system.h"
 #include "drivers/timer.h"

--- a/src/platform/APM32/pwm_output_dshot_apm32.c
+++ b/src/platform/APM32/pwm_output_dshot_apm32.c
@ -41,7 +41,7 @@
 #include "drivers/motor.h"
 #include "drivers/pwm_output.h"
 #include "pwm_output_dshot_shared.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/time.h"
 #include "drivers/timer.h"
 #include "drivers/system.h"
--- a/src/platform/APM32/rcm_apm32.c
+++ b/src/platform/APM32/rcm_apm32.c
@ -20,7 +20,7 @@
 */

 #include "platform.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 void RCC_ClockCmd(rccPeriphTag_t periphTag, FunctionalState NewState)
 {
--- a/src/platform/APM32/serial_uart_apm32.c
+++ b/src/platform/APM32/serial_uart_apm32.c
@ -39,7 +39,7 @@
 #include "common/utils.h"
 #include "drivers/inverter.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
--- a/src/platform/APM32/serial_uart_apm32f4xx.c
+++ b/src/platform/APM32/serial_uart_apm32f4xx.c
@ -36,7 +36,7 @@
 #include "drivers/io.h"
 #include "drivers/dma.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
--- a/src/platform/APM32/timer_apm32.c
+++ b/src/platform/APM32/timer_apm32.c
@ -37,7 +37,7 @@
 #include "drivers/io.h"
 #include "drivers/dma.h"

-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 #include "drivers/timer.h"
 #include "drivers/timer_impl.h"
--- a/src/platform/APM32/timer_apm32f4xx.c
+++ b/src/platform/APM32/timer_apm32f4xx.c
@ -30,7 +30,7 @@
 #include "timer_def.h"

 #include "apm32f4xx.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/timer.h"

 const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = {
--- a/src/platform/APM32/transponder_ir_io_apm32.c
+++ b/src/platform/APM32/transponder_ir_io_apm32.c
@ -31,7 +31,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/timer.h"
 #include "drivers/transponder_ir_arcitimer.h"
 #include "drivers/transponder_ir_erlt.h"
--- a/src/platform/AT32/adc_at32f43x.c
+++ b/src/platform/AT32/adc_at32f43x.c
@ -54,7 +54,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/io_impl.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/resource.h"
 #include "drivers/dma.h"

--- a/src/platform/AT32/bus_i2c_atbsp.c
+++ b/src/platform/AT32/bus_i2c_atbsp.c
@ -31,7 +31,7 @@
 #include "drivers/io_impl.h"
 #include "drivers/nvic.h"
 #include "drivers/time.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 #include "drivers/bus_i2c.h"
 #include "drivers/bus_i2c_impl.h"
--- a/src/platform/AT32/bus_i2c_atbsp_init.c
+++ b/src/platform/AT32/bus_i2c_atbsp_init.c
@ -30,7 +30,7 @@
 #include "drivers/io.h"
 #include "drivers/nvic.h"
 #include "drivers/time.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 #include "drivers/bus_i2c.h"
 #include "drivers/bus_i2c_impl.h"
--- a/src/platform/AT32/bus_spi_at32bsp.c
+++ b/src/platform/AT32/bus_spi_at32bsp.c
@ -35,7 +35,7 @@
 #include "drivers/bus_spi_impl.h"
 #include "drivers/exti.h"
 #include "drivers/io.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 // Use DMA if possible if this many bytes are to be transferred
 #define SPI_DMA_THRESHOLD 8
--- a/src/platform/AT32/camera_control_at32.c
+++ b/src/platform/AT32/camera_control_at32.c
@ -28,7 +28,7 @@
 #include "drivers/camera_control_impl.h"
 #include "drivers/nvic.h"
 #include "drivers/pwm_output.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 #ifdef CAMERA_CONTROL_SOFTWARE_PWM_AVAILABLE
 #include "build/atomic.h"
--- a/src/platform/AT32/dma_at32f43x.c
+++ b/src/platform/AT32/dma_at32f43x.c
@ -29,7 +29,7 @@

 #include "drivers/nvic.h"
 #include "drivers/dma.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/resource.h"

 /*
--- a/src/platform/AT32/io_at32.c
+++ b/src/platform/AT32/io_at32.c
@ -23,7 +23,7 @@

 #include "drivers/io.h"
 #include "drivers/io_impl.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 #include "common/utils.h"

--- a/src/platform/AT32/light_ws2811strip_at32f43x.c
+++ b/src/platform/AT32/light_ws2811strip_at32f43x.c
@ -35,7 +35,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/timer.h"

 #include "drivers/light_ws2811strip.h"
--- a/src/platform/AT32/pwm_output_dshot.c
+++ b/src/platform/AT32/pwm_output_dshot.c
@ -33,7 +33,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/time.h"
 #include "drivers/timer.h"
 #include "drivers/system.h"
--- a/src/platform/AT32/rcc_at32.c
+++ b/src/platform/AT32/rcc_at32.c
@ -23,7 +23,7 @@
 */

 #include "platform.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 void RCC_ClockCmd(rccPeriphTag_t periphTag, FunctionalState NewState)
 {
--- a/src/platform/AT32/serial_uart_at32bsp.c
+++ b/src/platform/AT32/serial_uart_at32bsp.c
@ -41,7 +41,7 @@
 #include "common/utils.h"
 #include "drivers/inverter.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 #include "drivers/dma.h"

--- a/src/platform/AT32/serial_uart_at32f43x.c
+++ b/src/platform/AT32/serial_uart_at32f43x.c
@ -31,7 +31,7 @@
 #include "drivers/dma.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
--- a/src/platform/AT32/timer_at32bsp.c
+++ b/src/platform/AT32/timer_at32bsp.c
@ -35,7 +35,7 @@
 #include "drivers/nvic.h"

 #include "drivers/io.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/system.h"
 #include "drivers/timer.h"
 #include "drivers/timer_impl.h"
--- a/src/platform/AT32/timer_at32f43x.c
+++ b/src/platform/AT32/timer_at32f43x.c
@ -28,7 +28,7 @@
 #include "timer_def.h"
 #include "drivers/dma.h"
 #include "drivers/io.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/timer.h"

 const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = {
--- a/src/platform/SIMULATOR/include/platform/platform.h
+++ b/src/platform/SIMULATOR/include/platform/platform.h
@ -35,3 +35,5 @@
 #define SERIAL_TRAIT_PIN_CONFIG 0

 #define I2CDEV_COUNT        0
+
+typedef void* ADC_TypeDef; // Dummy definition for ADC_TypeDef
--- a/src/platform/STM32/adc_stm32f4xx.c
+++ b/src/platform/STM32/adc_stm32f4xx.c
@ -31,7 +31,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/io_impl.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/dma.h"
 #include "drivers/sensor.h"
 #include "drivers/adc.h"
--- a/src/platform/STM32/adc_stm32f7xx.c
+++ b/src/platform/STM32/adc_stm32f7xx.c
@ -30,7 +30,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/io_impl.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/sensor.h"

 #include "drivers/adc.h"
--- a/src/platform/STM32/adc_stm32g4xx.c
+++ b/src/platform/STM32/adc_stm32g4xx.c
@ -31,7 +31,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/io_impl.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/resource.h"
 #include "drivers/dma.h"

--- a/src/platform/STM32/adc_stm32h7xx.c
+++ b/src/platform/STM32/adc_stm32h7xx.c
@ -31,7 +31,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/io_impl.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/resource.h"
 #include "drivers/dma.h"

--- a/src/platform/STM32/bus_i2c_hal.c
+++ b/src/platform/STM32/bus_i2c_hal.c
@ -30,7 +30,7 @@
 #include "drivers/io_impl.h"
 #include "drivers/nvic.h"
 #include "drivers/time.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 #include "drivers/bus_i2c.h"
 #include "drivers/bus_i2c_impl.h"
--- a/src/platform/STM32/bus_i2c_hal_init.c
+++ b/src/platform/STM32/bus_i2c_hal_init.c
@ -29,7 +29,7 @@
 #include "drivers/io.h"
 #include "drivers/nvic.h"
 #include "drivers/time.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 #include "drivers/bus_i2c.h"
 #include "drivers/bus_i2c_impl.h"
--- a/src/platform/STM32/bus_i2c_stm32f4xx.c
+++ b/src/platform/STM32/bus_i2c_stm32f4xx.c
@ -30,7 +30,7 @@
 #include "drivers/io.h"
 #include "drivers/time.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 #include "drivers/bus_i2c.h"
 #include "drivers/bus_i2c_impl.h"
--- a/src/platform/STM32/bus_quadspi_hal.c
+++ b/src/platform/STM32/bus_quadspi_hal.c
@ -33,7 +33,7 @@
 #include "drivers/io.h"
 #include "drivers/io_impl.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 #include "pg/bus_quadspi.h"

--- a/src/platform/STM32/bus_spi_ll.c
+++ b/src/platform/STM32/bus_spi_ll.c
@ -34,7 +34,7 @@
 #include "drivers/bus_spi_impl.h"
 #include "drivers/dma.h"
 #include "drivers/io.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 // Use DMA if possible if this many bytes are to be transferred
 #define SPI_DMA_THRESHOLD 8
--- a/src/platform/STM32/bus_spi_stdperiph.c
+++ b/src/platform/STM32/bus_spi_stdperiph.c
@ -35,7 +35,7 @@
 #include "drivers/bus_spi_impl.h"
 #include "drivers/exti.h"
 #include "drivers/io.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 // Use DMA if possible if this many bytes are to be transferred
 #define SPI_DMA_THRESHOLD 8
--- a/src/platform/STM32/dma_stm32f7xx.c
+++ b/src/platform/STM32/dma_stm32f7xx.c
@ -28,7 +28,7 @@

 #include "drivers/nvic.h"
 #include "drivers/dma.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/resource.h"

 /*
--- a/src/platform/STM32/dma_stm32g4xx.c
+++ b/src/platform/STM32/dma_stm32g4xx.c
@ -28,7 +28,7 @@

 #include "drivers/nvic.h"
 #include "drivers/dma.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/resource.h"

 /*
--- a/src/platform/STM32/dma_stm32h7xx.c
+++ b/src/platform/STM32/dma_stm32h7xx.c
@ -28,7 +28,7 @@

 #include "drivers/nvic.h"
 #include "drivers/dma.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/resource.h"

 /*
--- a/src/platform/STM32/include/platform/platform.h
+++ b/src/platform/STM32/include/platform/platform.h
@ -441,3 +441,10 @@ extern uint8_t _dmaram_end__;
 #else
 #define I2CDEV_COUNT 4
 #endif
+
+// QUAD SPI
+#if defined(STM32H7)
+#define QUADSPI_TRAIT_AF_PIN 1
+#define QUADSPI_TRAIT_HANDLE 1
+#define MAX_QUADSPI_PIN_SEL 3
+#endif
--- a/src/platform/STM32/io_stm32.c
+++ b/src/platform/STM32/io_stm32.c
@ -22,7 +22,7 @@

 #include "drivers/io.h"
 #include "drivers/io_impl.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 #include "common/utils.h"

--- a/src/platform/STM32/light_ws2811strip_hal.c
+++ b/src/platform/STM32/light_ws2811strip_hal.c
@ -31,7 +31,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/system.h"
 #include "drivers/timer.h"

--- a/src/platform/STM32/light_ws2811strip_stdperiph.c
+++ b/src/platform/STM32/light_ws2811strip_stdperiph.c
@ -34,7 +34,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/timer.h"

 #include "drivers/light_ws2811strip.h"
--- a/src/platform/STM32/pwm_output_dshot.c
+++ b/src/platform/STM32/pwm_output_dshot.c
@ -32,7 +32,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/time.h"
 #include "drivers/timer.h"
 #include "drivers/system.h"
--- a/src/platform/STM32/pwm_output_dshot_hal.c
+++ b/src/platform/STM32/pwm_output_dshot_hal.c
@ -40,7 +40,7 @@
 #include "drivers/motor.h"
 #include "drivers/pwm_output.h"
 #include "pwm_output_dshot_shared.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/time.h"
 #include "drivers/timer.h"
 #include "drivers/system.h"
--- a/src/platform/STM32/rcc_stm32.c
+++ b/src/platform/STM32/rcc_stm32.c
@ -19,7 +19,7 @@
 */

 #include "platform.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 void RCC_ClockCmd(rccPeriphTag_t periphTag, FunctionalState NewState)
 {
--- a/src/platform/STM32/sdio_f4xx.c
+++ b/src/platform/STM32/sdio_f4xx.c
@ -44,7 +44,7 @@
 #include "drivers/io_impl.h"
 #include "drivers/nvic.h"
 #include "drivers/time.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/dma.h"
 #include "drivers/light_led.h"

--- a/src/platform/STM32/sdio_f7xx.c
+++ b/src/platform/STM32/sdio_f7xx.c
@ -41,7 +41,7 @@
 #include "drivers/io_impl.h"
 #include "drivers/nvic.h"
 #include "drivers/time.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/dma.h"
 #include "drivers/light_led.h"

--- a/src/platform/STM32/serial_uart_hal.c
+++ b/src/platform/STM32/serial_uart_hal.c
@ -42,7 +42,7 @@
 #include "drivers/nvic.h"
 #include "drivers/inverter.h"
 #include "drivers/dma.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
--- a/src/platform/STM32/serial_uart_stdperiph.c
+++ b/src/platform/STM32/serial_uart_stdperiph.c
@ -42,7 +42,7 @@
 #include "common/utils.h"
 #include "drivers/inverter.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
--- a/src/platform/STM32/serial_uart_stm32f4xx.c
+++ b/src/platform/STM32/serial_uart_stm32f4xx.c
@ -35,7 +35,7 @@
 #include "drivers/io.h"
 #include "drivers/dma.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
--- a/src/platform/STM32/serial_uart_stm32f7xx.c
+++ b/src/platform/STM32/serial_uart_stm32f7xx.c
@ -33,7 +33,7 @@
 #include "drivers/dma.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
--- a/src/platform/STM32/serial_uart_stm32g4xx.c
+++ b/src/platform/STM32/serial_uart_stm32g4xx.c
@ -31,7 +31,7 @@
 #include "drivers/dma.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
--- a/src/platform/STM32/serial_uart_stm32h7xx.c
+++ b/src/platform/STM32/serial_uart_stm32h7xx.c
@ -33,7 +33,7 @@
 #include "drivers/dma.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
--- a/src/platform/STM32/timer_hal.c
+++ b/src/platform/STM32/timer_hal.c
@ -36,7 +36,7 @@
 #include "drivers/io.h"
 #include "drivers/dma.h"

-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 #include "drivers/timer.h"
 #include "drivers/timer_impl.h"
--- a/src/platform/STM32/timer_stdperiph.c
+++ b/src/platform/STM32/timer_stdperiph.c
@ -34,12 +34,13 @@
 #include "drivers/nvic.h"

 #include "drivers/io.h"
-#include "drivers/rcc.h"
 #include "drivers/system.h"

 #include "drivers/timer.h"
 #include "drivers/timer_impl.h"

+#include "platform/rcc.h"
+
 #define TIM_N(n) (1 << (n))

 /*
--- a/src/platform/STM32/timer_stm32f4xx.c
+++ b/src/platform/STM32/timer_stm32f4xx.c
@ -29,7 +29,7 @@
 #include "timer_def.h"

 #include "stm32f4xx.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/timer.h"

 const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = {
--- a/src/platform/STM32/timer_stm32f7xx.c
+++ b/src/platform/STM32/timer_stm32f7xx.c
@ -29,7 +29,7 @@
 #include "timer_def.h"

 #include "stm32f7xx.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/timer.h"

 const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = {
--- a/src/platform/STM32/timer_stm32g4xx.c
+++ b/src/platform/STM32/timer_stm32g4xx.c
@ -29,7 +29,7 @@
 #include "timer_def.h"

 #include "stm32g4xx.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/timer.h"

 const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = {
--- a/src/platform/STM32/timer_stm32h5xx.c
+++ b/src/platform/STM32/timer_stm32h5xx.c
@ -30,7 +30,7 @@
 #include "timer_def.h"

 #include "stm32h5xx.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/timer.h"

 const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = {
--- a/src/platform/STM32/timer_stm32h7xx.c
+++ b/src/platform/STM32/timer_stm32h7xx.c
@ -29,7 +29,7 @@
 #include "timer_def.h"

 #include "stm32h7xx.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/timer.h"

 const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = {
--- a/src/platform/STM32/transponder_ir_io_hal.c
+++ b/src/platform/STM32/transponder_ir_io_hal.c
@ -30,7 +30,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/timer.h"
 #include "drivers/transponder_ir_arcitimer.h"
 #include "drivers/transponder_ir_erlt.h"
--- a/src/platform/STM32/transponder_ir_io_stdperiph.c
+++ b/src/platform/STM32/transponder_ir_io_stdperiph.c
@ -30,7 +30,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/timer.h"
 #include "drivers/transponder_ir_arcitimer.h"
 #include "drivers/transponder_ir_erlt.h"
--- a/src/platform/common/stm32/bus_spi_pinconfig.c
+++ b/src/platform/common/stm32/bus_spi_pinconfig.c
@ -33,7 +33,7 @@
 #include "drivers/dma.h"
 #include "drivers/exti.h"
 #include "drivers/io.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"

 #include "pg/bus_spi.h"

--- a/src/platform/common/stm32/platform/rcc.h
+++ b/src/platform/common/stm32/platform/rcc.h
@ -20,7 +20,7 @@

 #pragma once

-#include "rcc_types.h"
+#include "platform/rcc_types.h"

 enum rcc_reg {
    RCC_EMPTY = 0,   // make sure that default value (0) does not enable anything
--- a/src/platform/common/stm32/platform/rcc_types.h
+++ b/src/platform/common/stm32/platform/rcc_types.h
--- a/src/platform/common/stm32/pwm_output_dshot_shared.c
+++ b/src/platform/common/stm32/pwm_output_dshot_shared.c
@ -33,7 +33,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/time.h"
 #include "drivers/timer.h"
 #if defined(STM32F4)
--- a/src/platform/common/stm32/serial_uart_hw.c
+++ b/src/platform/common/stm32/serial_uart_hw.c
@ -33,7 +33,7 @@
 #include "build/build_config.h"

 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/inverter.h"
 #include "drivers/serial.h"
 #include "drivers/serial_impl.h"