From 404c07817d31eff10b195e2b52fd42e9c7227cc0 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sun, 8 Nov 2020 09:56:11 +0000 Subject: [PATCH] Fixed bug #1131. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@13900 27425a3e-05d8-49a3-a47f-9c15f0e5edd8 --- os/hal/ports/STM32/STM32F0xx/hal_lld.h | 2 +- os/hal/ports/STM32/STM32F1xx/hal_lld_f100.h | 2 +- os/hal/ports/STM32/STM32F1xx/hal_lld_f103.h | 2 +- os/hal/ports/STM32/STM32F1xx/hal_lld_f105_f107.h | 2 +- os/hal/ports/STM32/STM32F37x/hal_lld.h | 2 +- os/hal/ports/STM32/STM32F3xx/hal_lld.h | 2 +- os/hal/ports/STM32/STM32F4xx/hal_lld_type1.h | 2 +- os/hal/ports/STM32/STM32F4xx/hal_lld_type2.h | 2 +- os/hal/ports/STM32/STM32F7xx/hal_lld.h | 2 +- os/hal/ports/STM32/STM32G0xx/hal_lld.h | 2 +- os/hal/ports/STM32/STM32G4xx/hal_lld.h | 2 +- os/hal/ports/STM32/STM32H7xx/hal_lld.h | 2 +- os/hal/ports/STM32/STM32L0xx/hal_lld.h | 2 +- os/hal/ports/STM32/STM32L1xx/hal_lld.h | 2 +- os/hal/ports/STM32/STM32L4xx+/hal_lld.h | 2 +- os/hal/ports/STM32/STM32L4xx/hal_lld.h | 2 +- readme.txt | 1 + 17 files changed, 17 insertions(+), 16 deletions(-) diff --git a/os/hal/ports/STM32/STM32F0xx/hal_lld.h b/os/hal/ports/STM32/STM32F0xx/hal_lld.h index 780c64847..4de929fd8 100644 --- a/os/hal/ports/STM32/STM32F0xx/hal_lld.h +++ b/os/hal/ports/STM32/STM32F0xx/hal_lld.h @@ -616,7 +616,7 @@ #if STM32_LSI_ENABLED #else /* !STM32_LSI_ENABLED */ -#if STM32_RTCSEL == STM32_RTCSEL_LSI +#if HAL_USE_RTC && (STM32_RTCSEL == STM32_RTCSEL_LSI) #error "LSI not enabled, required by STM32_RTCSEL" #endif diff --git a/os/hal/ports/STM32/STM32F1xx/hal_lld_f100.h b/os/hal/ports/STM32/STM32F1xx/hal_lld_f100.h index 0f54b2f27..65d857127 100644 --- a/os/hal/ports/STM32/STM32F1xx/hal_lld_f100.h +++ b/os/hal/ports/STM32/STM32F1xx/hal_lld_f100.h @@ -329,7 +329,7 @@ #if STM32_LSI_ENABLED #else /* !STM32_LSI_ENABLED */ -#if STM32_RTCSEL == STM32_RTCSEL_LSI +#if HAL_USE_RTC && (STM32_RTCSEL == STM32_RTCSEL_LSI) #error "LSI not enabled, required by STM32_RTCSEL" #endif diff --git a/os/hal/ports/STM32/STM32F1xx/hal_lld_f103.h b/os/hal/ports/STM32/STM32F1xx/hal_lld_f103.h index a237dcc0d..64c27deaa 100644 --- a/os/hal/ports/STM32/STM32F1xx/hal_lld_f103.h +++ b/os/hal/ports/STM32/STM32F1xx/hal_lld_f103.h @@ -346,7 +346,7 @@ #if STM32_LSI_ENABLED #else /* !STM32_LSI_ENABLED */ -#if STM32_RTCSEL == STM32_RTCSEL_LSI +#if HAL_USE_RTC && (STM32_RTCSEL == STM32_RTCSEL_LSI) #error "LSI not enabled, required by STM32_RTCSEL" #endif diff --git a/os/hal/ports/STM32/STM32F1xx/hal_lld_f105_f107.h b/os/hal/ports/STM32/STM32F1xx/hal_lld_f105_f107.h index ee8a60dca..efbe94deb 100644 --- a/os/hal/ports/STM32/STM32F1xx/hal_lld_f105_f107.h +++ b/os/hal/ports/STM32/STM32F1xx/hal_lld_f105_f107.h @@ -424,7 +424,7 @@ #if STM32_LSI_ENABLED #else /* !STM32_LSI_ENABLED */ -#if STM32_RTCSEL == STM32_RTCSEL_LSI +#if HAL_USE_RTC && (STM32_RTCSEL == STM32_RTCSEL_LSI) #error "LSI not enabled, required by STM32_RTCSEL" #endif diff --git a/os/hal/ports/STM32/STM32F37x/hal_lld.h b/os/hal/ports/STM32/STM32F37x/hal_lld.h index 010bd202a..2745108c5 100644 --- a/os/hal/ports/STM32/STM32F37x/hal_lld.h +++ b/os/hal/ports/STM32/STM32F37x/hal_lld.h @@ -578,7 +578,7 @@ #if STM32_LSI_ENABLED #else /* !STM32_LSI_ENABLED */ -#if STM32_RTCSEL == STM32_RTCSEL_LSI +#if HAL_USE_RTC && (STM32_RTCSEL == STM32_RTCSEL_LSI) #error "LSI not enabled, required by STM32_RTCSEL" #endif diff --git a/os/hal/ports/STM32/STM32F3xx/hal_lld.h b/os/hal/ports/STM32/STM32F3xx/hal_lld.h index fbccd3cf6..cfeec4954 100644 --- a/os/hal/ports/STM32/STM32F3xx/hal_lld.h +++ b/os/hal/ports/STM32/STM32F3xx/hal_lld.h @@ -668,7 +668,7 @@ #if STM32_LSI_ENABLED #else /* !STM32_LSI_ENABLED */ -#if STM32_RTCSEL == STM32_RTCSEL_LSI +#if HAL_USE_RTC && (STM32_RTCSEL == STM32_RTCSEL_LSI) #error "LSI not enabled, required by STM32_RTCSEL" #endif diff --git a/os/hal/ports/STM32/STM32F4xx/hal_lld_type1.h b/os/hal/ports/STM32/STM32F4xx/hal_lld_type1.h index 87903a6b4..79a1effad 100644 --- a/os/hal/ports/STM32/STM32F4xx/hal_lld_type1.h +++ b/os/hal/ports/STM32/STM32F4xx/hal_lld_type1.h @@ -1401,7 +1401,7 @@ #if STM32_LSI_ENABLED #else /* !STM32_LSI_ENABLED */ -#if STM32_RTCSEL == STM32_RTCSEL_LSI +#if HAL_USE_RTC && (STM32_RTCSEL == STM32_RTCSEL_LSI) #error "LSI not enabled, required by STM32_RTCSEL" #endif diff --git a/os/hal/ports/STM32/STM32F4xx/hal_lld_type2.h b/os/hal/ports/STM32/STM32F4xx/hal_lld_type2.h index 14c5803de..250dc5ed6 100644 --- a/os/hal/ports/STM32/STM32F4xx/hal_lld_type2.h +++ b/os/hal/ports/STM32/STM32F4xx/hal_lld_type2.h @@ -807,7 +807,7 @@ #if STM32_LSI_ENABLED #else /* !STM32_LSI_ENABLED */ -#if STM32_RTCSEL == STM32_RTCSEL_LSI +#if HAL_USE_RTC && (STM32_RTCSEL == STM32_RTCSEL_LSI) #error "LSI not enabled, required by STM32_RTCSEL" #endif diff --git a/os/hal/ports/STM32/STM32F7xx/hal_lld.h b/os/hal/ports/STM32/STM32F7xx/hal_lld.h index d6fafaed1..877eabf3d 100644 --- a/os/hal/ports/STM32/STM32F7xx/hal_lld.h +++ b/os/hal/ports/STM32/STM32F7xx/hal_lld.h @@ -1148,7 +1148,7 @@ #if STM32_LSI_ENABLED #else /* !STM32_LSI_ENABLED */ -#if STM32_RTCSEL == STM32_RTCSEL_LSI +#if HAL_USE_RTC && (STM32_RTCSEL == STM32_RTCSEL_LSI) #error "LSI not enabled, required by STM32_RTCSEL" #endif diff --git a/os/hal/ports/STM32/STM32G0xx/hal_lld.h b/os/hal/ports/STM32/STM32G0xx/hal_lld.h index cdb714e70..1745eeb0b 100644 --- a/os/hal/ports/STM32/STM32G0xx/hal_lld.h +++ b/os/hal/ports/STM32/STM32G0xx/hal_lld.h @@ -862,7 +862,7 @@ #if STM32_LSI_ENABLED #else /* !STM32_LSI_ENABLED */ - #if STM32_RTCSEL == STM32_RTCSEL_LSI + #if HAL_USE_RTC && (STM32_RTCSEL == STM32_RTCSEL_LSI) #error "LSI not enabled, required by STM32_RTCSEL" #endif diff --git a/os/hal/ports/STM32/STM32G4xx/hal_lld.h b/os/hal/ports/STM32/STM32G4xx/hal_lld.h index 45bf31781..248989f19 100644 --- a/os/hal/ports/STM32/STM32G4xx/hal_lld.h +++ b/os/hal/ports/STM32/STM32G4xx/hal_lld.h @@ -983,7 +983,7 @@ #if STM32_LSI_ENABLED #else /* !STM32_LSI_ENABLED */ - #if STM32_RTCSEL == STM32_RTCSEL_LSI + #if HAL_USE_RTC && (STM32_RTCSEL == STM32_RTCSEL_LSI) #error "LSI not enabled, required by STM32_RTCSEL" #endif diff --git a/os/hal/ports/STM32/STM32H7xx/hal_lld.h b/os/hal/ports/STM32/STM32H7xx/hal_lld.h index 3dc31c512..b640fa246 100644 --- a/os/hal/ports/STM32/STM32H7xx/hal_lld.h +++ b/os/hal/ports/STM32/STM32H7xx/hal_lld.h @@ -1501,7 +1501,7 @@ #else /* !STM32_LSI_ENABLED */ #define STM32_LSI_CK 0U -#if STM32_RTCSEL == STM32_RTCSEL_LSI_CK +#if HAL_USE_RTC && (STM32_RTCSEL == STM32_RTCSEL_LSI_CK) #error "LSI not enabled, required by STM32_RTCSEL" #endif diff --git a/os/hal/ports/STM32/STM32L0xx/hal_lld.h b/os/hal/ports/STM32/STM32L0xx/hal_lld.h index bb630adba..8b974c68b 100644 --- a/os/hal/ports/STM32/STM32L0xx/hal_lld.h +++ b/os/hal/ports/STM32/STM32L0xx/hal_lld.h @@ -758,7 +758,7 @@ #error "LSI not enabled, required by STM32_MCOSEL" #endif -#if STM32_RTCSEL == STM32_RTCSEL_LSI +#if HAL_USE_RTC && (STM32_RTCSEL == STM32_RTCSEL_LSI) #error "LSI not enabled, required by STM32_RTCSEL" #endif diff --git a/os/hal/ports/STM32/STM32L1xx/hal_lld.h b/os/hal/ports/STM32/STM32L1xx/hal_lld.h index 87846c266..05362ba6b 100644 --- a/os/hal/ports/STM32/STM32L1xx/hal_lld.h +++ b/os/hal/ports/STM32/STM32L1xx/hal_lld.h @@ -496,7 +496,7 @@ #error "LSI not enabled, required by STM32_MCOSEL" #endif -#if STM32_RTCSEL == STM32_RTCSEL_LSI +#if HAL_USE_RTC && (STM32_RTCSEL == STM32_RTCSEL_LSI) #error "LSI not enabled, required by STM32_RTCSEL" #endif diff --git a/os/hal/ports/STM32/STM32L4xx+/hal_lld.h b/os/hal/ports/STM32/STM32L4xx+/hal_lld.h index e9b904822..b3f5f4b02 100644 --- a/os/hal/ports/STM32/STM32L4xx+/hal_lld.h +++ b/os/hal/ports/STM32/STM32L4xx+/hal_lld.h @@ -1246,7 +1246,7 @@ #if STM32_LSI_ENABLED #else /* !STM32_LSI_ENABLED */ - #if STM32_RTCSEL == STM32_RTCSEL_LSI + #if HAL_USE_RTC && (STM32_RTCSEL == STM32_RTCSEL_LSI) #error "LSI not enabled, required by STM32_RTCSEL" #endif diff --git a/os/hal/ports/STM32/STM32L4xx/hal_lld.h b/os/hal/ports/STM32/STM32L4xx/hal_lld.h index 91a0f57f5..363cf2ee8 100644 --- a/os/hal/ports/STM32/STM32L4xx/hal_lld.h +++ b/os/hal/ports/STM32/STM32L4xx/hal_lld.h @@ -1175,7 +1175,7 @@ #if STM32_LSI_ENABLED #else /* !STM32_LSI_ENABLED */ - #if STM32_RTCSEL == STM32_RTCSEL_LSI + #if HAL_USE_RTC && (STM32_RTCSEL == STM32_RTCSEL_LSI) #error "LSI not enabled, required by STM32_RTCSEL" #endif diff --git a/readme.txt b/readme.txt index a279dff98..6f46daaef 100644 --- a/readme.txt +++ b/readme.txt @@ -74,6 +74,7 @@ ***************************************************************************** *** 20.3.3 *** +- FIX: Fixed wrong check on LSI on all STM32 platforms (bug #1131). - FIX: Fixed missing EFL driver in platform_l432.mk (bug #1130). - FIX: Fixed wrong check in STM32 ST driver (bug #1129). - FIX: Fixed OSAL does not allow 64 bits resolution values (bug #1128).