From 5b85acb8246275f7ff27a9bb3315c9399f188bd7 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sun, 26 Aug 2018 07:24:51 +0000 Subject: Fixed bug #973. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12215 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- os/hal/ports/STM32/STM32F37x/hal_lld.h | 9 ++++++--- readme.txt | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/os/hal/ports/STM32/STM32F37x/hal_lld.h b/os/hal/ports/STM32/STM32F37x/hal_lld.h index 1da524c3c..7dbdfbf57 100644 --- a/os/hal/ports/STM32/STM32F37x/hal_lld.h +++ b/os/hal/ports/STM32/STM32F37x/hal_lld.h @@ -853,13 +853,16 @@ #endif /* SDADC maximum frequency check.*/ -#if (STM32_ADC_USE_SDADC1 | STM32_ADC_USE_SDADC1 | STM32_ADC_USE_SDADC1) && \ - (STM32_SDADCCLK > STM32_SDADCCLK_FAST_MAX) +#if (STM32_ADC_USE_SDADC1 || \ + STM32_ADC_USE_SDADC2 || \ + STM32_ADC_USE_SDADC3) && (STM32_SDADCCLK > STM32_SDADCCLK_FAST_MAX) #error "STM32_SDADCCLK exceeding maximum frequency (STM32_SDADCCLK_FAST_MAX)" #endif /* SDADC minimum frequency check.*/ -#if (STM32_ADC_USE_SDADC1 | STM32_ADC_USE_SDADC1 | STM32_ADC_USE_SDADC1) && \ +#if (STM32_ADC_USE_SDADC1 || \ + STM32_ADC_USE_SDADC2 || \ + STM32_ADC_USE_SDADC3) && \ (STM32_SDADCCLK < STM32_SDADCCLK_MIN) #error "STM32_SDADCCLK exceeding maximum frequency (STM32_SDADCCLK_MIN)" #endif diff --git a/readme.txt b/readme.txt index ae0a3b812..d9cceab47 100644 --- a/readme.txt +++ b/readme.txt @@ -141,6 +141,8 @@ - EX: Updated LIS302DL to 1.1.0 (backported to 18.2.1). - EX: Updated LPS25H to 1.1.0 (backported to 18.2.1). - EX: Updated LSM303DLHC to 1.1.0 (backported to 18.2.1). +- HAL: Fixed invalid checks in STM32F37x HAL related to SDADC (bug #973) + (backported to 18.2.2 and 17.6.5). - HAL: Fixed option STM32_LSCOSEL not written in STM32L4 HAL (bug #970) (backported to 18.2.2 and 17.6.5). - HAL: Fixed invalid DFSDM1SEL option in STM32L4 HAL (bug #969)(backported -- cgit v1.2.3