This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 3490eec26dfc24e034410687468d05df9ab7670e Author: raiden00pl <[email protected]> AuthorDate: Fri May 29 16:21:36 2026 +0200 !arm/stm32f7: standardize public API prefix to stm32_ BREAKING CHANGE: Public STM32F7 APIs were renamed from stm32f7_* and stm32f7x9_* forms to canonical stm32_* names. Signed-off-by: raiden00pl <[email protected]> --- arch/arm/src/stm32f7/stm32_qspi.c | 16 ++++++++-------- arch/arm/src/stm32f7/stm32_qspi.h | 10 +++++----- arch/arm/src/stm32f7/stm32_rcc.h | 8 ++++---- arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c | 8 ++++---- boards/arm/stm32f7/stm32f746g-disco/src/stm32_n25q.c | 2 +- boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32_boot.c | 6 +++--- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/arch/arm/src/stm32f7/stm32_qspi.c b/arch/arm/src/stm32f7/stm32_qspi.c index c9f30d3155a..65e52304863 100644 --- a/arch/arm/src/stm32f7/stm32_qspi.c +++ b/arch/arm/src/stm32f7/stm32_qspi.c @@ -2489,7 +2489,7 @@ static int qspi_hw_initialize(struct stm32f7_qspidev_s *priv) ****************************************************************************/ /**************************************************************************** - * Name: stm32f7_qspi_initialize + * Name: stm32_qspi_initialize * * Description: * Initialize the selected QSPI port in master mode @@ -2502,7 +2502,7 @@ static int qspi_hw_initialize(struct stm32f7_qspidev_s *priv) * ****************************************************************************/ -struct qspi_dev_s *stm32f7_qspi_initialize(int intf) +struct qspi_dev_s *stm32_qspi_initialize(int intf) { struct stm32f7_qspidev_s *priv; uint32_t regval; @@ -2625,7 +2625,7 @@ errout_with_dmach: } /**************************************************************************** - * Name: stm32f7_qspi_enter_memorymapped + * Name: stm32_qspi_enter_memorymapped * * Description: * Put the QSPI device into memory mapped mode @@ -2639,9 +2639,9 @@ errout_with_dmach: * ****************************************************************************/ -void stm32f7_qspi_enter_memorymapped(struct qspi_dev_s *dev, - const struct qspi_meminfo_s *meminfo, - uint32_t lpto) +void stm32_qspi_enter_memorymapped(struct qspi_dev_s *dev, + const struct qspi_meminfo_s *meminfo, + uint32_t lpto) { struct stm32f7_qspidev_s *priv = (struct stm32f7_qspidev_s *)dev; uint32_t regval; @@ -2717,7 +2717,7 @@ void stm32f7_qspi_enter_memorymapped(struct qspi_dev_s *dev, } /**************************************************************************** - * Name: stm32f7_qspi_exit_memorymapped + * Name: stm32_qspi_exit_memorymapped * * Description: * Take the QSPI device out of memory mapped mode @@ -2730,7 +2730,7 @@ void stm32f7_qspi_enter_memorymapped(struct qspi_dev_s *dev, * ****************************************************************************/ -void stm32f7_qspi_exit_memorymapped(struct qspi_dev_s *dev) +void stm32_qspi_exit_memorymapped(struct qspi_dev_s *dev) { struct stm32f7_qspidev_s *priv = (struct stm32f7_qspidev_s *)dev; diff --git a/arch/arm/src/stm32f7/stm32_qspi.h b/arch/arm/src/stm32f7/stm32_qspi.h index ae919405ef5..a82c3296e06 100644 --- a/arch/arm/src/stm32f7/stm32_qspi.h +++ b/arch/arm/src/stm32f7/stm32_qspi.h @@ -83,7 +83,7 @@ extern "C" ****************************************************************************/ struct qspi_dev_s; -struct qspi_dev_s *stm32f7_qspi_initialize(int intf); +struct qspi_dev_s *stm32_qspi_initialize(int intf); /**************************************************************************** * Name: stm32l4_qspi_enter_memorymapped @@ -101,9 +101,9 @@ struct qspi_dev_s *stm32f7_qspi_initialize(int intf); * ****************************************************************************/ -void stm32f7_qspi_enter_memorymapped(struct qspi_dev_s *dev, - const struct qspi_meminfo_s *meminfo, - uint32_t lpto); +void stm32_qspi_enter_memorymapped(struct qspi_dev_s *dev, + const struct qspi_meminfo_s *meminfo, + uint32_t lpto); /**************************************************************************** * Name: stm32l4_qspi_exit_memorymapped @@ -119,7 +119,7 @@ void stm32f7_qspi_enter_memorymapped(struct qspi_dev_s *dev, * ****************************************************************************/ -void stm32f7_qspi_exit_memorymapped(struct qspi_dev_s *dev); +void stm32_qspi_exit_memorymapped(struct qspi_dev_s *dev); #undef EXTERN #if defined(__cplusplus) diff --git a/arch/arm/src/stm32f7/stm32_rcc.h b/arch/arm/src/stm32f7/stm32_rcc.h index b1c7aaefe37..9a1d166e96d 100644 --- a/arch/arm/src/stm32f7/stm32_rcc.h +++ b/arch/arm/src/stm32f7/stm32_rcc.h @@ -218,24 +218,24 @@ void stm32_rcc_disablelsi(void); #if defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX) /**************************************************************************** - * Name: stm32f7x9_rcc_dsisrcphy + * Name: stm32_rcc_dsisrcphy * * Description: * Set DSI clock source to DSI PHY * ****************************************************************************/ -void stm32f7x9_rcc_dsisrcphy(void); +void stm32_rcc_dsisrcphy(void); /**************************************************************************** - * Name: stm32f7x9_rcc_dsisrcpllr + * Name: stm32_rcc_dsisrcpllr * * Description: * Set DSI clock source to PLLR * ****************************************************************************/ -void stm32f7x9_rcc_dsisrcpllr(void); +void stm32_rcc_dsisrcpllr(void); #endif #undef EXTERN diff --git a/arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c b/arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c index d59a5729de6..070060097d5 100644 --- a/arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c +++ b/arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c @@ -1040,14 +1040,14 @@ static inline void rcc_enableperipherals(void) ****************************************************************************/ /**************************************************************************** - * Name: stm32f7x9_rcc_dsisrcphy + * Name: stm32_rcc_dsisrcphy * * Description: * Set DSI clock source to DSI PHY * ****************************************************************************/ -void stm32f7x9_rcc_dsisrcphy(void) +void stm32_rcc_dsisrcphy(void) { uint32_t regval; regval = getreg32(STM32_RCC_DCKCFGR2); @@ -1058,14 +1058,14 @@ void stm32f7x9_rcc_dsisrcphy(void) } /**************************************************************************** - * Name: stm32f7x9_rcc_dsisrcpllr + * Name: stm32_rcc_dsisrcpllr * * Description: * Set DSI clock source to PLLR * ****************************************************************************/ -void stm32f7x9_rcc_dsisrcpllr(void) +void stm32_rcc_dsisrcpllr(void) { uint32_t regval; regval = getreg32(STM32_RCC_DCKCFGR2); diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_n25q.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_n25q.c index 6524920c680..3249fb4ac01 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_n25q.c +++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_n25q.c @@ -81,7 +81,7 @@ int stm32_n25qxxx_setup(void) struct mtd_dev_s *mtd_dev; int ret = -1; - qspi_dev = stm32f7_qspi_initialize(0); + qspi_dev = stm32_qspi_initialize(0); if (!qspi_dev) { _err("ERROR: Failed to initialize W25 minor %d: %d\n", diff --git a/boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32_boot.c b/boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32_boot.c index 5966f0315b8..adae2fb2067 100644 --- a/boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32_boot.c +++ b/boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32_boot.c @@ -46,7 +46,7 @@ /* MEADOW FIXME: header clash? */ -extern struct qspi_dev_s *stm32f7_qspi_initialize(int intf); +extern struct qspi_dev_s *stm32_qspi_initialize(int intf); #endif /**************************************************************************** @@ -132,7 +132,7 @@ void board_late_initialize(void) int ret; - qspi = stm32f7_qspi_initialize(0); + qspi = stm32_qspi_initialize(0); if (!qspi) { syslog(LOG_ERR, "ERROR: sam_qspi_initialize failed\n"); @@ -159,7 +159,7 @@ void board_late_initialize(void) meminfo.buflen = 0; meminfo.buffer = NULL; - stm32f7_qspi_enter_memorymapped(qspi, &meminfo, 80000000); + stm32_qspi_enter_memorymapped(qspi, &meminfo, 80000000); /* FIXME: stm32_mpu_uheap depends on PROTECTED && MPU *
