andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More consistent naming. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@14270 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2021-04-23 15:15:48 +00:00
parent 65247ad693
commit bce09ed2de
12 changed files with 119 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/hal/ports/STM32/LLD/RCCv1/stm32_hse.inc
View File

@ -31,8 +31,8 @@
/*===========================================================================*/ /*===========================================================================*/
/* Registry checks for robustness.*/ /* Registry checks for robustness.*/
#if !defined(STM32_HAS_HSE) #if !defined(STM32_RCC_HAS_HSE)
#error "STM32_HAS_HSE not defined in stm32_registry.h" #error "STM32_RCC_HAS_HSE not defined in stm32_registry.h"
#endif #endif
/* Checks on configurations.*/ /* Checks on configurations.*/

4
os/hal/ports/STM32/LLD/RCCv1/stm32_hsi16.inc
View File

@ -36,8 +36,8 @@
/*===========================================================================*/ /*===========================================================================*/
/* Registry checks for robustness.*/ /* Registry checks for robustness.*/
#if !defined(STM32_HAS_HSI16) #if !defined(STM32_RCC_HAS_HSI16)
#error "STM32_HAS_HSI16 not defined in stm32_registry.h" #error "STM32_RCC_HAS_HSI16 not defined in stm32_registry.h"
#endif #endif
/* Checks on configurations.*/ /* Checks on configurations.*/

8
os/hal/ports/STM32/LLD/RCCv1/stm32_hsi48.inc
View File

@ -36,8 +36,8 @@
/*===========================================================================*/ /*===========================================================================*/
/* Registry checks for robustness.*/ /* Registry checks for robustness.*/
#if !defined(STM32_HAS_HSI48) #if !defined(STM32_RCC_HAS_HSI48)
#error "STM32_HAS_HSI48 not defined in stm32_registry.h" #error "STM32_RCC_HAS_HSI48 not defined in stm32_registry.h"
#endif #endif
/* Checks on configurations.*/ /* Checks on configurations.*/
@ -45,6 +45,10 @@
#error "STM32_HSI48_ENABLED not defined in mcuconf.h" #error "STM32_HSI48_ENABLED not defined in mcuconf.h"
#endif #endif
#if (STM32_RCC_HAS_HSI48 == FALSE) && (STM32_HSI48_ENABLED == TRUE)
#error "HSI48 not present on this device"
#endif
/*===========================================================================*/ /*===========================================================================*/
/* Driver exported variables. */ /* Driver exported variables. */
/*===========================================================================*/ /*===========================================================================*/

4
os/hal/ports/STM32/LLD/RCCv1/stm32_lse.inc
View File

@ -31,8 +31,8 @@
/*===========================================================================*/ /*===========================================================================*/
/* Registry checks for robustness.*/ /* Registry checks for robustness.*/
#if !defined(STM32_HAS_LSE) #if !defined(STM32_RCC_HAS_LSE)
#error "STM32_HAS_LSE not defined in stm32_registry.h" #error "STM32_RCC_HAS_LSE not defined in stm32_registry.h"
#endif #endif
/* Checks on configurations.*/ /* Checks on configurations.*/

4
os/hal/ports/STM32/LLD/RCCv1/stm32_lsi.inc
View File

@ -36,8 +36,8 @@
/*===========================================================================*/ /*===========================================================================*/
/* Registry checks for robustness.*/ /* Registry checks for robustness.*/
#if !defined(STM32_HAS_LSI) #if !defined(STM32_RCC_HAS_LSI)
#error "STM32_HAS_LSI not defined in stm32_registry.h" #error "STM32_RCC_HAS_LSI not defined in stm32_registry.h"
#endif #endif
/* Checks on configurations.*/ /* Checks on configurations.*/

4
os/hal/ports/STM32/LLD/RCCv1/stm32_msi.inc
View File

@ -61,8 +61,8 @@
/*===========================================================================*/ /*===========================================================================*/
/* Registry checks for robustness.*/ /* Registry checks for robustness.*/
#if !defined(STM32_HAS_MSI) #if !defined(STM32_RCC_HAS_MSI)
#error "STM32_HAS_MSI not defined in stm32_registry.h" #error "STM32_RCC_HAS_MSI not defined in stm32_registry.h"
#endif #endif
/* Checks on configurations.*/ /* Checks on configurations.*/

38
os/hal/ports/STM32/LLD/RCCv1/stm32_pll.inc
View File

@ -31,11 +31,11 @@
/*===========================================================================*/ /*===========================================================================*/
/* Registry checks for robustness.*/ /* Registry checks for robustness.*/
#if !defined(STM32_HAS_PLL) #if !defined(STM32_RCC_HAS_PLL)
#define STM32_HAS_PLL FALSE #define STM32_RCC_HAS_PLL FALSE
#endif #endif
#if STM32_HAS_PLL #if STM32_RCC_HAS_PLL
/* Checks on configurations.*/ /* Checks on configurations.*/
#if !defined(STM32_PLLSRC) #if !defined(STM32_PLLSRC)
@ -54,15 +54,15 @@
#error "STM32_PLLPDIV_VALUE not defined in mcuconf.h" #error "STM32_PLLPDIV_VALUE not defined in mcuconf.h"
#endif #endif
#if STM32_PLL_HAS_P && !defined(STM32_PLLP_VALUE) #if STM32_RCC_PLL_HAS_P && !defined(STM32_PLLP_VALUE)
#error "STM32_PLLP_VALUE not defined in mcuconf.h" #error "STM32_PLLP_VALUE not defined in mcuconf.h"
#endif #endif
#if STM32_PLL_HAS_Q && !defined(STM32_PLLQ_VALUE) #if STM32_RCC_PLL_HAS_Q && !defined(STM32_PLLQ_VALUE)
#error "STM32_PLLQ_VALUE not defined in mcuconf.h" #error "STM32_PLLQ_VALUE not defined in mcuconf.h"
#endif #endif
#if STM32_PLL_HAS_R && !defined(STM32_PLLR_VALUE) #if STM32_RCC_PLL_HAS_R && !defined(STM32_PLLR_VALUE)
#error "STM32_PLLR_VALUE not defined in mcuconf.h" #error "STM32_PLLR_VALUE not defined in mcuconf.h"
#endif #endif
@ -112,15 +112,15 @@
#error "STM32_ACTIVATE_PLL not defined in hal_lld.h" #error "STM32_ACTIVATE_PLL not defined in hal_lld.h"
#endif #endif
#if STM32_PLL_HAS_P && !defined(STM32_PLLPEN) #if STM32_RCC_PLL_HAS_P && !defined(STM32_PLLPEN)
#error "STM32_PLLPEN not defined in hal_lld.h" #error "STM32_PLLPEN not defined in hal_lld.h"
#endif #endif
#if STM32_PLL_HAS_Q && !defined(STM32_PLLQEN) #if STM32_RCC_PLL_HAS_Q && !defined(STM32_PLLQEN)
#error "STM32_PLLQEN not defined in hal_lld.h" #error "STM32_PLLQEN not defined in hal_lld.h"
#endif #endif
#if STM32_PLL_HAS_R && !defined(STM32_PLLREN) #if STM32_RCC_PLL_HAS_R && !defined(STM32_PLLREN)
#error "STM32_PLLREN not defined in hal_lld.h" #error "STM32_PLLREN not defined in hal_lld.h"
#endif #endif
@ -167,7 +167,7 @@
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* P output, if present. */ /* P output, if present. */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#if STM32_PLL_HAS_P || defined(__DOXYGEN__) #if STM32_RCC_PLL_HAS_P || defined(__DOXYGEN__)
/** /**
* @brief STM32_PLLP field. * @brief STM32_PLLP field.
*/ */
@ -210,15 +210,15 @@
#error "STM32_PLL_P_CLKOUT outside acceptable range (STM32_PLLP_MIN...STM32_PLLP_MAX)" #error "STM32_PLL_P_CLKOUT outside acceptable range (STM32_PLLP_MIN...STM32_PLLP_MAX)"
#endif #endif
#else /* !STM32_PLL_HAS_P */ #else /* !STM32_RCC_PLL_HAS_P */
#define STM32_PLLP 0 #define STM32_PLLP 0
#define STM32_PLLPEN 0 #define STM32_PLLPEN 0
#endif /* !STM32_PLL_HAS_P */ #endif /* !STM32_RCC_PLL_HAS_P */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Q output, if present. */ /* Q output, if present. */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#if STM32_PLL_HAS_Q || defined(__DOXYGEN__) #if STM32_RCC_PLL_HAS_Q || defined(__DOXYGEN__)
/** /**
* @brief STM32_PLLQ field. * @brief STM32_PLLQ field.
*/ */
@ -251,15 +251,15 @@
#error "STM32_PLL_Q_CLKOUT outside acceptable range (STM32_PLLQ_MIN...STM32_PLLQ_MAX)" #error "STM32_PLL_Q_CLKOUT outside acceptable range (STM32_PLLQ_MIN...STM32_PLLQ_MAX)"
#endif #endif
#else /* !STM32_PLL_HAS_Q */ #else /* !STM32_RCC_PLL_HAS_Q */
#define STM32_PLLQ 0 #define STM32_PLLQ 0
#define STM32_PLLQEN 0 #define STM32_PLLQEN 0
#endif /* !STM32_PLL_HAS_Q */ #endif /* !STM32_RCC_PLL_HAS_Q */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* R output, if present. */ /* R output, if present. */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#if STM32_PLL_HAS_R || defined(__DOXYGEN__) #if STM32_RCC_PLL_HAS_R || defined(__DOXYGEN__)
/** /**
* @brief STM32_PLLR field. * @brief STM32_PLLR field.
*/ */
@ -292,10 +292,10 @@
#error "STM32_PLL_R_CLKOUT outside acceptable range (STM32_PLLR_MIN...STM32_PLLR_MAX)" #error "STM32_PLL_R_CLKOUT outside acceptable range (STM32_PLLR_MIN...STM32_PLLR_MAX)"
#endif #endif
#else /* !STM32_PLL_HAS_R */ #else /* !STM32_RCC_PLL_HAS_R */
#define STM32_PLLR 0 #define STM32_PLLR 0
#define STM32_PLLREN 0 #define STM32_PLLREN 0
#endif /* !STM32_PLL_HAS_R */ #endif /* !STM32_RCC_PLL_HAS_R */
/*===========================================================================*/ /*===========================================================================*/
/* Driver exported variables. */ /* Driver exported variables. */
@ -340,6 +340,6 @@ static inline void pll_deinit(void) {
/* Driver exported functions. */ /* Driver exported functions. */
/*===========================================================================*/ /*===========================================================================*/
#endif /* STM32_HAS_PLL */ #endif /* STM32_RCC_HAS_PLL */
/** @} */ /** @} */

38
os/hal/ports/STM32/LLD/RCCv1/stm32_pllsai1.inc
View File

@ -31,11 +31,11 @@
/*===========================================================================*/ /*===========================================================================*/
/* Registry checks for robustness.*/ /* Registry checks for robustness.*/
#if !defined(STM32_HAS_PLLSAI1) #if !defined(STM32_RCC_HAS_PLLSAI1)
#define STM32_HAS_PLLSAI1 FALSE #define STM32_RCC_HAS_PLLSAI1 FALSE
#endif #endif
#if STM32_HAS_PLLSAI1 #if STM32_RCC_HAS_PLLSAI1
/* Checks on configurations.*/ /* Checks on configurations.*/
#if !defined(STM32_PLLSRC) #if !defined(STM32_PLLSRC)
@ -54,15 +54,15 @@
#error "STM32_PLLSAI1PDIV_VALUE not defined in mcuconf.h" #error "STM32_PLLSAI1PDIV_VALUE not defined in mcuconf.h"
#endif #endif
#if STM32_PLLSAI1_HAS_P && !defined(STM32_PLLSAI1P_VALUE) #if STM32_RCC_PLLSAI1_HAS_P && !defined(STM32_PLLSAI1P_VALUE)
#error "STM32_PLLSAI1P_VALUE not defined in mcuconf.h" #error "STM32_PLLSAI1P_VALUE not defined in mcuconf.h"
#endif #endif
#if STM32_PLLSAI1_HAS_Q && !defined(STM32_PLLSAI1Q_VALUE) #if STM32_RCC_PLLSAI1_HAS_Q && !defined(STM32_PLLSAI1Q_VALUE)
#error "STM32_PLLSAI1Q_VALUE not defined in mcuconf.h" #error "STM32_PLLSAI1Q_VALUE not defined in mcuconf.h"
#endif #endif
#if STM32_PLLSAI1_HAS_R && !defined(STM32_PLLSAI1R_VALUE) #if STM32_RCC_PLLSAI1_HAS_R && !defined(STM32_PLLSAI1R_VALUE)
#error "STM32_PLLSAI1R_VALUE not defined in mcuconf.h" #error "STM32_PLLSAI1R_VALUE not defined in mcuconf.h"
#endif #endif
@ -113,15 +113,15 @@
#endif #endif
#if STM32_PLLSAI1_HAS_P && !defined(STM32_PLLSAI1PEN) #if STM32_RCC_PLLSAI1_HAS_P && !defined(STM32_PLLSAI1PEN)
#error "STM32_PLLSAI1PEN not defined in hal_lld.h" #error "STM32_PLLSAI1PEN not defined in hal_lld.h"
#endif #endif
#if STM32_PLLSAI1_HAS_Q && !defined(STM32_PLLSAI1QEN) #if STM32_RCC_PLLSAI1_HAS_Q && !defined(STM32_PLLSAI1QEN)
#error "STM32_PLLSAI1QEN not defined in hal_lld.h" #error "STM32_PLLSAI1QEN not defined in hal_lld.h"
#endif #endif
#if STM32_PLLSAI1_HAS_R && !defined(STM32_PLLSAI1REN) #if STM32_RCC_PLLSAI1_HAS_R && !defined(STM32_PLLSAI1REN)
#error "STM32_PLLSAI1REN not defined in hal_lld.h" #error "STM32_PLLSAI1REN not defined in hal_lld.h"
#endif #endif
@ -168,7 +168,7 @@
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* P output, if present. */ /* P output, if present. */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#if STM32_PLLSAI1_HAS_P || defined(__DOXYGEN__) #if STM32_RCC_PLLSAI1_HAS_P || defined(__DOXYGEN__)
/** /**
* @brief STM32_PLLSAI1P field. * @brief STM32_PLLSAI1P field.
*/ */
@ -209,15 +209,15 @@
#error "STM32_PLLSAI1_P_CLKOUT outside acceptable range (STM32_PLLP_MIN...STM32_PLLP_MAX)" #error "STM32_PLLSAI1_P_CLKOUT outside acceptable range (STM32_PLLP_MIN...STM32_PLLP_MAX)"
#endif #endif
#else /* !STM32_PLLSAI1_HAS_P */ #else /* !STM32_RCC_PLLSAI1_HAS_P */
#define STM32_PLLSAI1P 0 #define STM32_PLLSAI1P 0
#define STM32_PLLSAI1PEN 0 #define STM32_PLLSAI1PEN 0
#endif /* !STM32_PLLSAI1_HAS_P */ #endif /* !STM32_RCC_PLLSAI1_HAS_P */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Q output, if present. */ /* Q output, if present. */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#if STM32_PLLSAI1_HAS_Q || defined(__DOXYGEN__) #if STM32_RCC_PLLSAI1_HAS_Q || defined(__DOXYGEN__)
/** /**
* @brief STM32_PLLSAI1Q field. * @brief STM32_PLLSAI1Q field.
*/ */
@ -250,15 +250,15 @@
#error "STM32_PLLSAI1_Q_CLKOUT outside acceptable range (STM32_PLLQ_MIN...STM32_PLLQ_MAX)" #error "STM32_PLLSAI1_Q_CLKOUT outside acceptable range (STM32_PLLQ_MIN...STM32_PLLQ_MAX)"
#endif #endif
#else /* !STM32_PLLSAI1_HAS_Q */ #else /* !STM32_RCC_PLLSAI1_HAS_Q */
#define STM32_PLLSAI1Q 0 #define STM32_PLLSAI1Q 0
#define STM32_PLLSAI1QEN 0 #define STM32_PLLSAI1QEN 0
#endif /* !STM32_PLLSAI1_HAS_Q */ #endif /* !STM32_RCC_PLLSAI1_HAS_Q */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* R output, if present. */ /* R output, if present. */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#if STM32_PLLSAI1_HAS_R || defined(__DOXYGEN__) #if STM32_RCC_PLLSAI1_HAS_R || defined(__DOXYGEN__)
/** /**
* @brief STM32_PLLSAI1R field. * @brief STM32_PLLSAI1R field.
*/ */
@ -291,10 +291,10 @@
#error "STM32_PLLSAI1_R_CLKOUT outside acceptable range (STM32_PLLR_MIN...STM32_PLLR_MAX)" #error "STM32_PLLSAI1_R_CLKOUT outside acceptable range (STM32_PLLR_MIN...STM32_PLLR_MAX)"
#endif #endif
#else /* !STM32_PLLSAI1_HAS_R */ #else /* !STM32_RCC_PLLSAI1_HAS_R */
#define STM32_PLLSAI1R 0 #define STM32_PLLSAI1R 0
#define STM32_PLLSAI1REN 0 #define STM32_PLLSAI1REN 0
#endif /* !STM32_PLLSAI1_HAS_R */ #endif /* !STM32_RCC_PLLSAI1_HAS_R */
/*===========================================================================*/ /*===========================================================================*/
/* Driver exported variables. */ /* Driver exported variables. */
@ -339,6 +339,6 @@ static inline void pllsai1_deinit(void) {
/* Driver exported functions. */ /* Driver exported functions. */
/*===========================================================================*/ /*===========================================================================*/
#endif /* STM32_HAS_PLLSAI1 */ #endif /* STM32_RCC_HAS_PLLSAI1 */
/** @} */ /** @} */

38
os/hal/ports/STM32/LLD/RCCv1/stm32_pllsai2.inc
View File

@ -31,11 +31,11 @@
/*===========================================================================*/ /*===========================================================================*/
/* Registry checks for robustness.*/ /* Registry checks for robustness.*/
#if !defined(STM32_HAS_PLLSAI2) #if !defined(STM32_RCC_HAS_PLLSAI2)
#define STM32_HAS_PLLSAI2 FALSE #define STM32_RCC_HAS_PLLSAI2 FALSE
#endif #endif
#if STM32_HAS_PLLSAI2 #if STM32_RCC_HAS_PLLSAI2
/* Checks on configurations.*/ /* Checks on configurations.*/
#if !defined(STM32_PLLSRC) #if !defined(STM32_PLLSRC)
@ -54,15 +54,15 @@
#error "STM32_PLLSAI2PDIV_VALUE not defined in mcuconf.h" #error "STM32_PLLSAI2PDIV_VALUE not defined in mcuconf.h"
#endif #endif
#if STM32_PLLSAI2_HAS_P && !defined(STM32_PLLSAI2P_VALUE) #if STM32_RCC_PLLSAI2_HAS_P && !defined(STM32_PLLSAI2P_VALUE)
#error "STM32_PLLSAI2P_VALUE not defined in mcuconf.h" #error "STM32_PLLSAI2P_VALUE not defined in mcuconf.h"
#endif #endif
#if STM32_PLLSAI2_HAS_Q && !defined(STM32_PLLSAI2Q_VALUE) #if STM32_RCC_PLLSAI2_HAS_Q && !defined(STM32_PLLSAI2Q_VALUE)
#error "STM32_PLLSAI2Q_VALUE not defined in mcuconf.h" #error "STM32_PLLSAI2Q_VALUE not defined in mcuconf.h"
#endif #endif
#if STM32_PLLSAI2_HAS_R && !defined(STM32_PLLSAI2R_VALUE) #if STM32_RCC_PLLSAI2_HAS_R && !defined(STM32_PLLSAI2R_VALUE)
#error "STM32_PLLSAI2R_VALUE not defined in mcuconf.h" #error "STM32_PLLSAI2R_VALUE not defined in mcuconf.h"
#endif #endif
@ -113,15 +113,15 @@
#endif #endif
#if STM32_PLLSAI2_HAS_P && !defined(STM32_PLLSAI2PEN) #if STM32_RCC_PLLSAI2_HAS_P && !defined(STM32_PLLSAI2PEN)
#error "STM32_PLLSAI2PEN not defined in hal_lld.h" #error "STM32_PLLSAI2PEN not defined in hal_lld.h"
#endif #endif
#if STM32_PLLSAI2_HAS_Q && !defined(STM32_PLLSAI2QEN) #if STM32_RCC_PLLSAI2_HAS_Q && !defined(STM32_PLLSAI2QEN)
#error "STM32_PLLSAI2QEN not defined in hal_lld.h" #error "STM32_PLLSAI2QEN not defined in hal_lld.h"
#endif #endif
#if STM32_PLLSAI2_HAS_R && !defined(STM32_PLLSAI2REN) #if STM32_RCC_PLLSAI2_HAS_R && !defined(STM32_PLLSAI2REN)
#error "STM32_PLLSAI2REN not defined in hal_lld.h" #error "STM32_PLLSAI2REN not defined in hal_lld.h"
#endif #endif
@ -168,7 +168,7 @@
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* P output, if present. */ /* P output, if present. */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#if STM32_PLLSAI2_HAS_P || defined(__DOXYGEN__) #if STM32_RCC_PLLSAI2_HAS_P || defined(__DOXYGEN__)
/** /**
* @brief STM32_PLLSAI2P field. * @brief STM32_PLLSAI2P field.
*/ */
@ -209,15 +209,15 @@
#error "STM32_PLLSAI2_P_CLKOUT outside acceptable range (STM32_PLLP_MIN...STM32_PLLP_MAX)" #error "STM32_PLLSAI2_P_CLKOUT outside acceptable range (STM32_PLLP_MIN...STM32_PLLP_MAX)"
#endif #endif
#else /* !STM32_PLLSAI2_HAS_P */ #else /* !STM32_RCC_PLLSAI2_HAS_P */
#define STM32_PLLSAI2P 0 #define STM32_PLLSAI2P 0
#define STM32_PLLSAI2PEN 0 #define STM32_PLLSAI2PEN 0
#endif /* !STM32_PLLSAI2_HAS_P */ #endif /* !STM32_RCC_PLLSAI2_HAS_P */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Q output, if present. */ /* Q output, if present. */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#if STM32_PLLSAI2_HAS_Q || defined(__DOXYGEN__) #if STM32_RCC_PLLSAI2_HAS_Q || defined(__DOXYGEN__)
/** /**
* @brief STM32_PLLSAI2Q field. * @brief STM32_PLLSAI2Q field.
*/ */
@ -250,15 +250,15 @@
#error "STM32_PLLSAI2_Q_CLKOUT outside acceptable range (STM32_PLLQ_MIN...STM32_PLLQ_MAX)" #error "STM32_PLLSAI2_Q_CLKOUT outside acceptable range (STM32_PLLQ_MIN...STM32_PLLQ_MAX)"
#endif #endif
#else /* !STM32_PLLSAI2_HAS_Q */ #else /* !STM32_RCC_PLLSAI2_HAS_Q */
#define STM32_PLLSAI2Q 0 #define STM32_PLLSAI2Q 0
#define STM32_PLLSAI2QEN 0 #define STM32_PLLSAI2QEN 0
#endif /* !STM32_PLLSAI2_HAS_Q */ #endif /* !STM32_RCC_PLLSAI2_HAS_Q */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* R output, if present. */ /* R output, if present. */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#if STM32_PLLSAI2_HAS_R || defined(__DOXYGEN__) #if STM32_RCC_PLLSAI2_HAS_R || defined(__DOXYGEN__)
/** /**
* @brief STM32_PLLSAI2R field. * @brief STM32_PLLSAI2R field.
*/ */
@ -291,10 +291,10 @@
#error "STM32_PLLSAI2_R_CLKOUT outside acceptable range (STM32_PLLR_MIN...STM32_PLLR_MAX)" #error "STM32_PLLSAI2_R_CLKOUT outside acceptable range (STM32_PLLR_MIN...STM32_PLLR_MAX)"
#endif #endif
#else /* !STM32_PLLSAI2_HAS_R */ #else /* !STM32_RCC_PLLSAI2_HAS_R */
#define STM32_PLLSAI2R 0 #define STM32_PLLSAI2R 0
#define STM32_PLLSAI2REN 0 #define STM32_PLLSAI2REN 0
#endif /* !STM32_PLLSAI2_HAS_R */ #endif /* !STM32_RCC_PLLSAI2_HAS_R */
/*===========================================================================*/ /*===========================================================================*/
/* Driver exported variables. */ /* Driver exported variables. */
@ -339,6 +339,6 @@ static inline void pllsai2_deinit(void) {
/* Driver exported functions. */ /* Driver exported functions. */
/*===========================================================================*/ /*===========================================================================*/
#endif /* STM32_HAS_PLLSAI2 */ #endif /* STM32_RCC_HAS_PLLSAI2 */
/** @} */ /** @} */

24
os/hal/ports/STM32/STM32G4xx/stm32_registry.h
View File

@ -95,20 +95,20 @@
#endif #endif
/* RCC attributes.*/ /* RCC attributes.*/
#define STM32_HAS_HSI16 TRUE #define STM32_RCC_HAS_HSI16 TRUE
#define STM32_HAS_HSI48 TRUE #define STM32_RCC_HAS_HSI48 TRUE
#define STM32_HAS_MSI FALSE #define STM32_RCC_HAS_MSI FALSE
#define STM32_HAS_LSI TRUE #define STM32_RCC_HAS_LSI TRUE
#define STM32_HAS_LSE TRUE #define STM32_RCC_HAS_LSE TRUE
#define STM32_HAS_HSE TRUE #define STM32_RCC_HAS_HSE TRUE
#define STM32_HAS_PLL TRUE #define STM32_RCC_HAS_PLL TRUE
#define STM32_PLL_HAS_P TRUE #define STM32_RCC_PLL_HAS_P TRUE
#define STM32_PLL_HAS_Q TRUE #define STM32_RCC_PLL_HAS_Q TRUE
#define STM32_PLL_HAS_R TRUE #define STM32_RCC_PLL_HAS_R TRUE
#define STM32_HAS_PLLSAI1 FALSE #define STM32_RCC_HAS_PLLSAI1 FALSE
#define STM32_HAS_PLLSAI2 FALSE #define STM32_RCC_HAS_PLLSAI2 FALSE
/* SPI attributes. */ /* SPI attributes. */
#define STM32_HAS_SPIR FALSE #define STM32_HAS_SPIR FALSE

12
os/hal/ports/STM32/STM32L4xx/hal_lld.h
View File

@ -246,7 +246,7 @@
#define STM32_SAI2SEL_OFF 0xFFFFFFFFU /**< SAI2 clock is not required.*/ #define STM32_SAI2SEL_OFF 0xFFFFFFFFU /**< SAI2 clock is not required.*/
#define STM32_CLK48SEL_MASK (3 << 26) /**< CLK48SEL mask. */ #define STM32_CLK48SEL_MASK (3 << 26) /**< CLK48SEL mask. */
#if !STM32_CLOCK_HAS_HSI48 #if !STM32_RCC_HAS_HSI48
#define STM32_CLK48SEL_NOCLK (0 << 26) /**< CLK48 disabled. */ #define STM32_CLK48SEL_NOCLK (0 << 26) /**< CLK48 disabled. */
#else #else
#define STM32_CLK48SEL_HSI48 (0 << 26) /**< CLK48 source is HSI48. */ #define STM32_CLK48SEL_HSI48 (0 << 26) /**< CLK48 source is HSI48. */
@ -1043,7 +1043,7 @@
#endif /* !STM32_HSI16_ENABLED */ #endif /* !STM32_HSI16_ENABLED */
#if STM32_CLOCK_HAS_HSI48 #if STM32_RCC_HAS_HSI48
#if STM32_HSI48_ENABLED #if STM32_HSI48_ENABLED
#else /* !STM32_HSI48_ENABLED */ #else /* !STM32_HSI48_ENABLED */
@ -1055,7 +1055,7 @@
#error "HSI48 not enabled, required by STM32_CLK48SEL" #error "HSI48 not enabled, required by STM32_CLK48SEL"
#endif #endif
#endif /* !STM32_HSI48_ENABLED */ #endif /* !STM32_HSI48_ENABLED */
#endif /* STM32_CLOCK_HAS_HSI48 */ #endif /* STM32_RCC_HAS_HSI48 */
/* /*
* HSE related checks. * HSE related checks.
@ -1620,7 +1620,7 @@
/** /**
* @brief 48MHz clock frequency. * @brief 48MHz clock frequency.
*/ */
#if !STM32_CLOCK_HAS_HSI48 || defined(__DOXYGEN__) #if !STM32_RCC_HAS_HSI48 || defined(__DOXYGEN__)
#if (STM32_CLK48SEL == STM32_CLK48SEL_NOCLK) || defined(__DOXYGEN__) #if (STM32_CLK48SEL == STM32_CLK48SEL_NOCLK) || defined(__DOXYGEN__)
#define STM32_48CLK 0 #define STM32_48CLK 0
@ -1634,7 +1634,7 @@
#error "invalid source selected for 48CLK clock" #error "invalid source selected for 48CLK clock"
#endif #endif
#else /* STM32_CLOCK_HAS_HSI48 */ #else /* STM32_RCC_HAS_HSI48 */
#if (STM32_CLK48SEL == STM32_CLK48SEL_HSI48) || defined(__DOXYGEN__) #if (STM32_CLK48SEL == STM32_CLK48SEL_HSI48) || defined(__DOXYGEN__)
#define STM32_48CLK STM32_HSI48CLK #define STM32_48CLK STM32_HSI48CLK
@ -1648,7 +1648,7 @@
#error "invalid source selected for 48CLK clock" #error "invalid source selected for 48CLK clock"
#endif #endif
#endif /* STM32_CLOCK_HAS_HSI48 */ #endif /* STM32_RCC_HAS_HSI48 */
/** /**
* @brief SAI1 clock frequency. * @brief SAI1 clock frequency.

56
os/hal/ports/STM32/STM32L4xx/stm32_registry.h
View File

@ -35,27 +35,27 @@
*/ */
/* RCC attributes.*/ /* RCC attributes.*/
#define STM32_HAS_HSI16 TRUE #define STM32_RCC_HAS_HSI16 TRUE
#define STM32_HAS_HSI48 TRUE /*#define STM32_RCC_HAS_HSI48 TRUE*/ /* See below, it changes.*/
#define STM32_HAS_MSI TRUE #define STM32_RCC_HAS_MSI TRUE
#define STM32_HAS_LSI TRUE #define STM32_RCC_HAS_LSI TRUE
#define STM32_HAS_LSE TRUE #define STM32_RCC_HAS_LSE TRUE
#define STM32_HAS_HSE TRUE #define STM32_RCC_HAS_HSE TRUE
#define STM32_HAS_PLL TRUE #define STM32_RCC_HAS_PLL TRUE
#define STM32_PLL_HAS_P TRUE #define STM32_RCC_PLL_HAS_P TRUE
#define STM32_PLL_HAS_Q TRUE #define STM32_RCC_PLL_HAS_Q TRUE
#define STM32_PLL_HAS_R TRUE #define STM32_RCC_PLL_HAS_R TRUE
#define STM32_HAS_PLLSAI1 TRUE #define STM32_RCC_HAS_PLLSAI1 TRUE
#define STM32_PLLSAI1_HAS_P TRUE #define STM32_RCC_PLLSAI1_HAS_P TRUE
#define STM32_PLLSAI1_HAS_Q TRUE #define STM32_RCC_PLLSAI1_HAS_Q TRUE
#define STM32_PLLSAI1_HAS_R TRUE #define STM32_RCC_PLLSAI1_HAS_R TRUE
#define STM32_HAS_PLLSAI2 TRUE #define STM32_RCC_HAS_PLLSAI2 TRUE
#define STM32_PLLSAI2_HAS_P TRUE #define STM32_RCC_PLLSAI2_HAS_P TRUE
#define STM32_PLLSAI2_HAS_Q FALSE #define STM32_RCC_PLLSAI2_HAS_Q FALSE
#define STM32_PLLSAI2_HAS_R TRUE #define STM32_RCC_PLLSAI2_HAS_R TRUE
/*===========================================================================*/ /*===========================================================================*/
/* Common. */ /* Common. */
@ -103,8 +103,8 @@
#if defined(STM32L432xx) || defined(STM32L433xx) || defined(__DOXYGEN__) #if defined(STM32L432xx) || defined(STM32L433xx) || defined(__DOXYGEN__)
/* Clock attributes.*/ /* RCC attributes.*/
#define STM32_CLOCK_HAS_HSI48 TRUE #define STM32_RCC_HAS_HSI48 TRUE
/* ADC attributes.*/ /* ADC attributes.*/
#define STM32_HAS_ADC1 TRUE #define STM32_HAS_ADC1 TRUE
@ -325,8 +325,8 @@
#if defined(STM32L443xx) || defined(__DOXYGEN__) #if defined(STM32L443xx) || defined(__DOXYGEN__)
/* Clock attributes.*/ /* RCC attributes.*/
#define STM32_CLOCK_HAS_HSI48 TRUE #define STM32_RCC_HAS_HSI48 TRUE
/* ADC attributes.*/ /* ADC attributes.*/
#define STM32_HAS_ADC1 TRUE #define STM32_HAS_ADC1 TRUE
@ -568,8 +568,8 @@
#if defined(STM32L452xx) || defined(__DOXYGEN__) #if defined(STM32L452xx) || defined(__DOXYGEN__)
/* Clock attributes.*/ /* RCC attributes.*/
#define STM32_CLOCK_HAS_HSI48 TRUE #define STM32_RCC_HAS_HSI48 TRUE
/* ADC attributes.*/ /* ADC attributes.*/
#define STM32_HAS_ADC1 TRUE #define STM32_HAS_ADC1 TRUE
@ -812,8 +812,8 @@
#if defined(STM32L475xx) || defined(STM32L476xx) || defined(STM32L486xx) #if defined(STM32L475xx) || defined(STM32L476xx) || defined(STM32L486xx)
/* Clock attributes.*/ /* RCC attributes.*/
#define STM32_CLOCK_HAS_HSI48 FALSE #define STM32_RCC_HAS_HSI48 FALSE
/* ADC attributes.*/ /* ADC attributes.*/
#define STM32_HAS_ADC1 TRUE #define STM32_HAS_ADC1 TRUE
@ -1092,8 +1092,8 @@
#if defined(STM32L496xx) || defined(STM32L4A6xx) #if defined(STM32L496xx) || defined(STM32L4A6xx)
/* Clock attributes.*/ /* RCC attributes.*/
#define STM32_CLOCK_HAS_HSI48 FALSE #define STM32_RCC_HAS_HSI48 FALSE
/* ADC attributes.*/ /* ADC attributes.*/
#define STM32_HAS_ADC1 TRUE #define STM32_HAS_ADC1 TRUE