From 220a01ed52d7ad22d7151b12c1fde7803ebf5bdf Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Tue, 8 Jun 2021 14:11:49 +0000 Subject: [PATCH] Fixed MCO selection. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@14517 27425a3e-05d8-49a3-a47f-9c15f0e5edd8 --- os/hal/ports/STM32/STM32L4xx+/hal_lld.h | 8 ++++---- os/hal/ports/STM32/STM32L4xx/hal_lld.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/os/hal/ports/STM32/STM32L4xx+/hal_lld.h b/os/hal/ports/STM32/STM32L4xx+/hal_lld.h index f2406dbae..1e4e54b9d 100644 --- a/os/hal/ports/STM32/STM32L4xx+/hal_lld.h +++ b/os/hal/ports/STM32/STM32L4xx+/hal_lld.h @@ -1386,7 +1386,7 @@ */ #if (STM32_HSI48_ENABLED && (STM32_CLK48SEL == STM32_CLK48SEL_PLL)) || \ (STM32_SW == STM32_SW_PLL) || \ - (STM32_MCOSEL == STM32_MCOSEL_PLL) || \ + (STM32_MCOSEL == STM32_MCOSEL_PLLRCLK) || \ (STM32_SAI1SEL == STM32_SAI1SEL_PLL) || \ (STM32_SAI2SEL == STM32_SAI2SEL_PLL) || \ defined(__DOXYGEN__) @@ -1425,7 +1425,7 @@ * @brief STM32_PLLREN field. */ #if (STM32_SW == STM32_SW_PLL) || \ - (STM32_MCOSEL == STM32_MCOSEL_PLL) || \ + (STM32_MCOSEL == STM32_MCOSEL_PLLRCLK) || \ defined(__DOXYGEN__) #define STM32_PLLREN (1 << 24) @@ -1578,8 +1578,8 @@ #elif STM32_MCOSEL == STM32_MCOSEL_HSE #define STM32_MCODIVCLK STM32_HSECLK -#elif STM32_MCOSEL == STM32_MCOSEL_PLL -#define STM32_MCODIVCLK STM32_PLL_P_CLKOUT +#elif STM32_MCOSEL == STM32_MCOSEL_PLLRCLK +#define STM32_MCODIVCLK hal_lld_get_clock_point(CLK_PLLRCLK) #elif STM32_MCOSEL == STM32_MCOSEL_LSI #define STM32_MCODIVCLK STM32_LSICLK diff --git a/os/hal/ports/STM32/STM32L4xx/hal_lld.h b/os/hal/ports/STM32/STM32L4xx/hal_lld.h index 5fb280aee..2c83784c0 100644 --- a/os/hal/ports/STM32/STM32L4xx/hal_lld.h +++ b/os/hal/ports/STM32/STM32L4xx/hal_lld.h @@ -1309,7 +1309,7 @@ #define STM32_MCODIVCLK STM32_HSECLK #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 #define STM32_MCODIVCLK STM32_LSICLK