From 9590773bc5c47749f6adff25e8ea4591f8ce29e3 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Wed, 19 Feb 2020 13:01:11 +0000 Subject: [PATCH] Fixed some problems in clock definitions. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@13366 27425a3e-05d8-49a3-a47f-9c15f0e5edd8 --- os/hal/ports/STM32/STM32G4xx/hal_lld.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/os/hal/ports/STM32/STM32G4xx/hal_lld.h b/os/hal/ports/STM32/STM32G4xx/hal_lld.h index e59fef1b5..d0fd48b55 100644 --- a/os/hal/ports/STM32/STM32G4xx/hal_lld.h +++ b/os/hal/ports/STM32/STM32G4xx/hal_lld.h @@ -246,10 +246,10 @@ #define STM32_CLK48SEL_HSI48 (0U << 26U) /**< CLK48 source is HSI48. */ #define STM32_CLK48SEL_PLLQCLK (2U << 26U) /**< CLK48 source is PLLQCLK. */ -#define STM32_ADC12SEL_MASK (3U << 30U) /**< ADC12SEL mask. */ -#define STM32_ADC12SEL_NOCLK (0U << 30U) /**< ADC12 source is none. */ -#define STM32_ADC12SEL_PLLPCLK (1U << 30U) /**< ADC12 source is PLLPCLK. */ -#define STM32_ADC12SEL_SYSCLK (2U << 30U) /**< ADC12 source is SYSCLK. */ +#define STM32_ADC12SEL_MASK (3U << 28U) /**< ADC12SEL mask. */ +#define STM32_ADC12SEL_NOCLK (0U << 28U) /**< ADC12 source is none. */ +#define STM32_ADC12SEL_PLLPCLK (1U << 28U) /**< ADC12 source is PLLPCLK. */ +#define STM32_ADC12SEL_SYSCLK (2U << 28U) /**< ADC12 source is SYSCLK. */ #define STM32_ADC345SEL_MASK (3U << 30U) /**< ADC345SEL mask. */ #define STM32_ADC345SEL_NOCLK (0U << 30U) /**< ADC345 source is none. */ @@ -1720,8 +1720,8 @@ #elif STM32_ADC12SEL == STM32_ADC12SEL_PLLPCLK #define STM32_ADC12CLK STM32_PLL_P_CLKOUT -#elif STM32_ADC12SEL == STM32_ADC12SEL_HSI16 - #define STM32_ADC12CLK STM32_HSI16CLK +#elif STM32_ADC12SEL == STM32_ADC12SEL_SYSCLK + #define STM32_ADC12CLK STM32_SYSCLK #else #error "invalid source selected for ADC clock" @@ -1736,8 +1736,8 @@ #elif STM32_ADC345SEL == STM32_ADC345SEL_PLLPCLK #define STM32_ADC345CLK STM32_PLL_P_CLKOUT -#elif STM32_ADC345SEL == STM32_ADC345SEL_HSI16 - #define STM32_ADC345CLK STM32_HSI16CLK +#elif STM32_ADC345SEL == STM32_ADC345SEL_SYSCLK + #define STM32_ADC345CLK STM32_SYSCLK #else #error "invalid source selected for ADC clock"