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

Fixed MCO selection. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@14517 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2021-06-08 14:11:49 +00:00
parent edf3667d2e
commit 220a01ed52
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
os/hal/ports/STM32/STM32L4xx+/hal_lld.h
View File

@ -1386,7 +1386,7 @@
*/ */
#if (STM32_HSI48_ENABLED && (STM32_CLK48SEL == STM32_CLK48SEL_PLL)) || \ #if (STM32_HSI48_ENABLED && (STM32_CLK48SEL == STM32_CLK48SEL_PLL)) || \
(STM32_SW == STM32_SW_PLL) || \ (STM32_SW == STM32_SW_PLL) || \
(STM32_MCOSEL == STM32_MCOSEL_PLL) || \ (STM32_MCOSEL == STM32_MCOSEL_PLLRCLK) || \
(STM32_SAI1SEL == STM32_SAI1SEL_PLL) || \ (STM32_SAI1SEL == STM32_SAI1SEL_PLL) || \
(STM32_SAI2SEL == STM32_SAI2SEL_PLL) || \ (STM32_SAI2SEL == STM32_SAI2SEL_PLL) || \
defined(__DOXYGEN__) defined(__DOXYGEN__)
@ -1425,7 +1425,7 @@
* @brief STM32_PLLREN field. * @brief STM32_PLLREN field.
*/ */
#if (STM32_SW == STM32_SW_PLL) || \ #if (STM32_SW == STM32_SW_PLL) || \
(STM32_MCOSEL == STM32_MCOSEL_PLL) || \ (STM32_MCOSEL == STM32_MCOSEL_PLLRCLK) || \
defined(__DOXYGEN__) defined(__DOXYGEN__)
#define STM32_PLLREN (1 << 24) #define STM32_PLLREN (1 << 24)
@ -1578,8 +1578,8 @@
#elif STM32_MCOSEL == STM32_MCOSEL_HSE #elif STM32_MCOSEL == STM32_MCOSEL_HSE
#define STM32_MCODIVCLK STM32_HSECLK #define STM32_MCODIVCLK STM32_HSECLK
#elif STM32_MCOSEL == STM32_MCOSEL_PLL #elif STM32_MCOSEL == STM32_MCOSEL_PLLRCLK
#define STM32_MCODIVCLK STM32_PLL_P_CLKOUT #define STM32_MCODIVCLK hal_lld_get_clock_point(CLK_PLLRCLK)
#elif STM32_MCOSEL == STM32_MCOSEL_LSI #elif STM32_MCOSEL == STM32_MCOSEL_LSI
#define STM32_MCODIVCLK STM32_LSICLK #define STM32_MCODIVCLK STM32_LSICLK

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

@ -1309,7 +1309,7 @@
#define STM32_MCODIVCLK STM32_HSECLK #define STM32_MCODIVCLK STM32_HSECLK
#elif STM32_MCOSEL == STM32_MCOSEL_PLL #elif STM32_MCOSEL == STM32_MCOSEL_PLL
#define STM32_MCODIVCLK STM32_PLL_P_CLKOUT #define STM32_MCODIVCLK STM32_PLL_R_CLKOUT
#elif STM32_MCOSEL == STM32_MCOSEL_LSI #elif STM32_MCOSEL == STM32_MCOSEL_LSI
#define STM32_MCODIVCLK STM32_LSICLK #define STM32_MCODIVCLK STM32_LSICLK