From 0af5ddacc3c8a4fe0e4f41e18cbba6dfff0f4bd4 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Fri, 27 Jul 2018 09:02:01 +0000 Subject: Fixed bug #968. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12197 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- os/hal/ports/STM32/STM32L4xx/hal_lld.h | 8 ++++---- readme.txt | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/os/hal/ports/STM32/STM32L4xx/hal_lld.h b/os/hal/ports/STM32/STM32L4xx/hal_lld.h index d18ed02e2..3722fd0ee 100644 --- a/os/hal/ports/STM32/STM32L4xx/hal_lld.h +++ b/os/hal/ports/STM32/STM32L4xx/hal_lld.h @@ -1033,8 +1033,8 @@ #error "HSI16 not enabled, required by STM32_SAI1SEL" #endif -#if ((STM32_SAI2SEL == STM32_SAI1SEL_PLLSAI1) || \ - (STM32_SAI2SEL == STM32_SAI1SEL_PLLSAI2)) && \ +#if ((STM32_SAI2SEL == STM32_SAI2SEL_PLLSAI1) || \ + (STM32_SAI2SEL == STM32_SAI2SEL_PLLSAI2)) && \ (STM32_PLLSRC == STM32_PLLSRC_HSI16) #error "HSI16 not enabled, required by STM32_SAI2SEL" #endif @@ -1095,8 +1095,8 @@ #error "HSE not enabled, required by STM32_SAI1SEL" #endif - #if ((STM32_SAI2SEL == STM32_SAI1SEL_PLLSAI1) | \ - (STM32_SAI2SEL == STM32_SAI1SEL_PLLSAI2)) && \ + #if ((STM32_SAI2SEL == STM32_SAI2SEL_PLLSAI1) | \ + (STM32_SAI2SEL == STM32_SAI2SEL_PLLSAI2)) && \ (STM32_PLLSRC == STM32_PLLSRC_HSE) #error "HSE not enabled, required by STM32_SAI2SEL" #endif diff --git a/readme.txt b/readme.txt index d6af48955..19328ead0 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 incorrect checks on STM32_SAI2SEL option in STM32L4 HAL + (bug #968)(backported to 18.2.2 and 17.6.5). - HAL: Fixed incorrect handling of PDIV dividers in STM32L4 HAL (bug #967) (backported to 18.2.2). - HAL: Fixed documentation error in spiStop() (bug #966)(backported -- cgit v1.2.3