From aba432348ba11fa804ac38621e4024e1cc13fdc6 Mon Sep 17 00:00:00 2001 From: Guillaume Gautier Date: Mon, 10 Oct 2022 11:32:54 +0200 Subject: [PATCH] drivers: Cleans variable scopes for STM32 drivers Fix the scope of some variables in various STM32 drivers including: - SDMMC - DMA - OSPI/QSPI Flash - Interrupt controller The variables are set static instead of global and const if appropriate. Signed-off-by: Guillaume Gautier --- drivers/disk/sdmmc_stm32.c | 2 +- drivers/dma/dma_stm32.c | 4 ++-- drivers/dma/dma_stm32u5.c | 6 +++--- drivers/flash/flash_stm32_ospi.c | 6 +++--- drivers/flash/flash_stm32_qspi.c | 8 +++++--- drivers/interrupt_controller/intc_exti_stm32.c | 14 +++++++------- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/drivers/disk/sdmmc_stm32.c b/drivers/disk/sdmmc_stm32.c index 5e2b3e3b910..92c34ea882a 100644 --- a/drivers/disk/sdmmc_stm32.c +++ b/drivers/disk/sdmmc_stm32.c @@ -46,7 +46,7 @@ typedef void (*irq_config_func_t)(const struct device *dev); #if STM32_SDMMC_USE_DMA -uint32_t table_priority[] = { +static const uint32_t table_priority[] = { DMA_PRIORITY_LOW, DMA_PRIORITY_MEDIUM, DMA_PRIORITY_HIGH, diff --git a/drivers/dma/dma_stm32.c b/drivers/dma/dma_stm32.c index 6f716c8c142..622985c96e6 100644 --- a/drivers/dma/dma_stm32.c +++ b/drivers/dma/dma_stm32.c @@ -52,13 +52,13 @@ LOG_MODULE_REGISTER(dma_stm32, CONFIG_DMA_LOG_LEVEL); #endif #endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(1), okay) */ -static uint32_t table_m_size[] = { +static const uint32_t table_m_size[] = { LL_DMA_MDATAALIGN_BYTE, LL_DMA_MDATAALIGN_HALFWORD, LL_DMA_MDATAALIGN_WORD, }; -static uint32_t table_p_size[] = { +static const uint32_t table_p_size[] = { LL_DMA_PDATAALIGN_BYTE, LL_DMA_PDATAALIGN_HALFWORD, LL_DMA_PDATAALIGN_WORD, diff --git a/drivers/dma/dma_stm32u5.c b/drivers/dma/dma_stm32u5.c index 48d3cb58be9..1e5ae305711 100644 --- a/drivers/dma/dma_stm32u5.c +++ b/drivers/dma/dma_stm32u5.c @@ -28,19 +28,19 @@ LOG_MODULE_REGISTER(dma_stm32, CONFIG_DMA_LOG_LEVEL); #define DMA_STM32_0_STREAM_COUNT 16 #endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay) */ -static uint32_t table_m_size[] = { +static const uint32_t table_m_size[] = { LL_DMA_SRC_DATAWIDTH_BYTE, LL_DMA_SRC_DATAWIDTH_HALFWORD, LL_DMA_SRC_DATAWIDTH_WORD, }; -static uint32_t table_p_size[] = { +static const uint32_t table_p_size[] = { LL_DMA_DEST_DATAWIDTH_BYTE, LL_DMA_DEST_DATAWIDTH_HALFWORD, LL_DMA_DEST_DATAWIDTH_WORD, }; -static uint32_t table_priority[4] = { +static const uint32_t table_priority[4] = { LL_DMA_LOW_PRIORITY_LOW_WEIGHT, LL_DMA_LOW_PRIORITY_MID_WEIGHT, LL_DMA_LOW_PRIORITY_HIGH_WEIGHT, diff --git a/drivers/flash/flash_stm32_ospi.c b/drivers/flash/flash_stm32_ospi.c index 451f2ec501f..c716feab394 100644 --- a/drivers/flash/flash_stm32_ospi.c +++ b/drivers/flash/flash_stm32_ospi.c @@ -49,20 +49,20 @@ LOG_MODULE_REGISTER(flash_stm32_ospi, CONFIG_FLASH_LOG_LEVEL); #define SPI_NOR_WRITEOC_NONE 0xFF #if STM32_OSPI_USE_DMA -uint32_t table_m_size[] = { +static const uint32_t table_m_size[] = { LL_DMA_MDATAALIGN_BYTE, LL_DMA_MDATAALIGN_HALFWORD, LL_DMA_MDATAALIGN_WORD, }; -uint32_t table_p_size[] = { +static const uint32_t table_p_size[] = { LL_DMA_PDATAALIGN_BYTE, LL_DMA_PDATAALIGN_HALFWORD, LL_DMA_PDATAALIGN_WORD, }; /* Lookup table to set dma priority from the DTS */ -uint32_t table_priority[] = { +static const uint32_t table_priority[] = { DMA_PRIORITY_LOW, DMA_PRIORITY_MEDIUM, DMA_PRIORITY_HIGH, diff --git a/drivers/flash/flash_stm32_qspi.c b/drivers/flash/flash_stm32_qspi.c index 30874ce5227..394000fe0e0 100644 --- a/drivers/flash/flash_stm32_qspi.c +++ b/drivers/flash/flash_stm32_qspi.c @@ -49,25 +49,27 @@ LOG_MODULE_REGISTER(flash_stm32_qspi, CONFIG_FLASH_LOG_LEVEL); #if DT_HAS_COMPAT_STATUS_OKAY(st_stm32_qspi_nor) -uint32_t table_m_size[] = { +#if STM32_QSPI_USE_DMA +static const uint32_t table_m_size[] = { LL_DMA_MDATAALIGN_BYTE, LL_DMA_MDATAALIGN_HALFWORD, LL_DMA_MDATAALIGN_WORD, }; -uint32_t table_p_size[] = { +static const uint32_t table_p_size[] = { LL_DMA_PDATAALIGN_BYTE, LL_DMA_PDATAALIGN_HALFWORD, LL_DMA_PDATAALIGN_WORD, }; /* Lookup table to set dma priority from the DTS */ -uint32_t table_priority[] = { +static const uint32_t table_priority[] = { DMA_PRIORITY_LOW, DMA_PRIORITY_MEDIUM, DMA_PRIORITY_HIGH, DMA_PRIORITY_VERY_HIGH, }; +#endif /* STM32_QSPI_USE_DMA */ typedef void (*irq_config_func_t)(const struct device *dev); diff --git a/drivers/interrupt_controller/intc_exti_stm32.c b/drivers/interrupt_controller/intc_exti_stm32.c index e71fbd1a0ed..b1db8fbdd66 100644 --- a/drivers/interrupt_controller/intc_exti_stm32.c +++ b/drivers/interrupt_controller/intc_exti_stm32.c @@ -31,7 +31,7 @@ #if defined(CONFIG_SOC_SERIES_STM32F0X) || \ defined(CONFIG_SOC_SERIES_STM32L0X) || \ defined(CONFIG_SOC_SERIES_STM32G0X) -const IRQn_Type exti_irq_table[] = { +static const IRQn_Type exti_irq_table[] = { EXTI0_1_IRQn, EXTI0_1_IRQn, EXTI2_3_IRQn, EXTI2_3_IRQn, EXTI4_15_IRQn, EXTI4_15_IRQn, EXTI4_15_IRQn, EXTI4_15_IRQn, EXTI4_15_IRQn, EXTI4_15_IRQn, EXTI4_15_IRQn, EXTI4_15_IRQn, @@ -44,21 +44,21 @@ const IRQn_Type exti_irq_table[] = { defined(CONFIG_SOC_SERIES_STM32WBX) || \ defined(CONFIG_SOC_SERIES_STM32G4X) || \ defined(CONFIG_SOC_SERIES_STM32WLX) -const IRQn_Type exti_irq_table[] = { +static const IRQn_Type exti_irq_table[] = { EXTI0_IRQn, EXTI1_IRQn, EXTI2_IRQn, EXTI3_IRQn, EXTI4_IRQn, EXTI9_5_IRQn, EXTI9_5_IRQn, EXTI9_5_IRQn, EXTI9_5_IRQn, EXTI9_5_IRQn, EXTI15_10_IRQn, EXTI15_10_IRQn, EXTI15_10_IRQn, EXTI15_10_IRQn, EXTI15_10_IRQn, EXTI15_10_IRQn }; #elif defined(CONFIG_SOC_SERIES_STM32F3X) -const IRQn_Type exti_irq_table[] = { +static const IRQn_Type exti_irq_table[] = { EXTI0_IRQn, EXTI1_IRQn, EXTI2_TSC_IRQn, EXTI3_IRQn, EXTI4_IRQn, EXTI9_5_IRQn, EXTI9_5_IRQn, EXTI9_5_IRQn, EXTI9_5_IRQn, EXTI9_5_IRQn, EXTI15_10_IRQn, EXTI15_10_IRQn, EXTI15_10_IRQn, EXTI15_10_IRQn, EXTI15_10_IRQn, EXTI15_10_IRQn }; #elif defined(CONFIG_SOC_STM32F410RX) /* STM32F410RX has no OTG_FS_WKUP_IRQn */ -const IRQn_Type exti_irq_table[] = { +static const IRQn_Type exti_irq_table[] = { EXTI0_IRQn, EXTI1_IRQn, EXTI2_IRQn, EXTI3_IRQn, EXTI4_IRQn, EXTI9_5_IRQn, EXTI9_5_IRQn, EXTI9_5_IRQn, EXTI9_5_IRQn, EXTI9_5_IRQn, EXTI15_10_IRQn, EXTI15_10_IRQn, @@ -68,7 +68,7 @@ const IRQn_Type exti_irq_table[] = { }; #elif defined(CONFIG_SOC_SERIES_STM32F2X) || \ defined(CONFIG_SOC_SERIES_STM32F4X) -const IRQn_Type exti_irq_table[] = { +static const IRQn_Type exti_irq_table[] = { EXTI0_IRQn, EXTI1_IRQn, EXTI2_IRQn, EXTI3_IRQn, EXTI4_IRQn, EXTI9_5_IRQn, EXTI9_5_IRQn, EXTI9_5_IRQn, EXTI9_5_IRQn, EXTI9_5_IRQn, EXTI15_10_IRQn, EXTI15_10_IRQn, @@ -77,7 +77,7 @@ const IRQn_Type exti_irq_table[] = { 0xFF, TAMP_STAMP_IRQn, RTC_WKUP_IRQn }; #elif defined(CONFIG_SOC_SERIES_STM32F7X) -const IRQn_Type exti_irq_table[] = { +static const IRQn_Type exti_irq_table[] = { EXTI0_IRQn, EXTI1_IRQn, EXTI2_IRQn, EXTI3_IRQn, EXTI4_IRQn, EXTI9_5_IRQn, EXTI9_5_IRQn, EXTI9_5_IRQn, EXTI9_5_IRQn, EXTI9_5_IRQn, EXTI15_10_IRQn, EXTI15_10_IRQn, @@ -88,7 +88,7 @@ const IRQn_Type exti_irq_table[] = { #elif defined(CONFIG_SOC_SERIES_STM32MP1X) || \ defined(CONFIG_SOC_SERIES_STM32L5X) || \ defined(CONFIG_SOC_SERIES_STM32U5X) -const IRQn_Type exti_irq_table[] = { +static const IRQn_Type exti_irq_table[] = { EXTI0_IRQn, EXTI1_IRQn, EXTI2_IRQn, EXTI3_IRQn, EXTI4_IRQn, EXTI5_IRQn, EXTI6_IRQn, EXTI7_IRQn, EXTI8_IRQn, EXTI9_IRQn, EXTI10_IRQn, EXTI11_IRQn,