From 6ffbdecc9398048c834118ebaf3e78069fcd6d6d Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sat, 24 Apr 2021 18:05:49 +0000 Subject: [PATCH] Removed duplicated check. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@14305 27425a3e-05d8-49a3-a47f-9c15f0e5edd8 --- os/hal/ports/STM32/STM32G4xx/hal_lld.h | 14 ------ os/hal/ports/STM32/STM32L4xx+/hal_lld.h | 64 ++++++++++--------------- os/hal/ports/STM32/STM32L4xx/hal_lld.h | 64 ++++++++++--------------- 3 files changed, 50 insertions(+), 92 deletions(-) diff --git a/os/hal/ports/STM32/STM32G4xx/hal_lld.h b/os/hal/ports/STM32/STM32G4xx/hal_lld.h index a60777c71..0c157b3b6 100644 --- a/os/hal/ports/STM32/STM32G4xx/hal_lld.h +++ b/os/hal/ports/STM32/STM32G4xx/hal_lld.h @@ -911,20 +911,6 @@ */ #if STM32_HSE_ENABLED - #if STM32_HSECLK == 0 - #error "HSE frequency not defined" - #else /* STM32_HSECLK != 0 */ - #if defined(STM32_HSE_BYPASS) - #if (STM32_HSECLK < STM32_HSECLK_BYP_MIN) || (STM32_HSECLK > STM32_HSECLK_BYP_MAX) - #error "STM32_HSECLK outside acceptable range (STM32_HSECLK_BYP_MIN...STM32_HSECLK_BYP_MAX)" - #endif - #else /* !defined(STM32_HSE_BYPASS) */ - #if (STM32_HSECLK < STM32_HSECLK_MIN) || (STM32_HSECLK > STM32_HSECLK_MAX) - #error "STM32_HSECLK outside acceptable range (STM32_HSECLK_MIN...STM32_HSECLK_MAX)" - #endif - #endif /* !defined(STM32_HSE_BYPASS) */ - #endif /* STM32_HSECLK != 0 */ - #else /* !STM32_HSE_ENABLED */ #if STM32_SW == STM32_SW_HSE diff --git a/os/hal/ports/STM32/STM32L4xx+/hal_lld.h b/os/hal/ports/STM32/STM32L4xx+/hal_lld.h index f026d80b4..50790e3d8 100644 --- a/os/hal/ports/STM32/STM32L4xx+/hal_lld.h +++ b/os/hal/ports/STM32/STM32L4xx+/hal_lld.h @@ -1101,51 +1101,37 @@ */ #if STM32_HSE_ENABLED - #if STM32_HSECLK == 0 - #error "HSE frequency not defined" - #else /* STM32_HSECLK != 0 */ - #if defined(STM32_HSE_BYPASS) - #if (STM32_HSECLK < STM32_HSECLK_BYP_MIN) || (STM32_HSECLK > STM32_HSECLK_BYP_MAX) - #error "STM32_HSECLK outside acceptable range (STM32_HSECLK_BYP_MIN...STM32_HSECLK_BYP_MAX)" - #endif - #else /* !defined(STM32_HSE_BYPASS) */ - #if (STM32_HSECLK < STM32_HSECLK_MIN) || (STM32_HSECLK > STM32_HSECLK_MAX) - #error "STM32_HSECLK outside acceptable range (STM32_HSECLK_MIN...STM32_HSECLK_MAX)" - #endif - #endif /* !defined(STM32_HSE_BYPASS) */ - #endif /* STM32_HSECLK != 0 */ +#else /* !STM32_HSE_ENABLED */ - #else /* !STM32_HSE_ENABLED */ + #if STM32_SW == STM32_SW_HSE + #error "HSE not enabled, required by STM32_SW" + #endif - #if STM32_SW == STM32_SW_HSE - #error "HSE not enabled, required by STM32_SW" - #endif + #if (STM32_SW == STM32_SW_PLL) && (STM32_PLLSRC == STM32_PLLSRC_HSE) + #error "HSE not enabled, required by STM32_SW and STM32_PLLSRC" + #endif - #if (STM32_SW == STM32_SW_PLL) && (STM32_PLLSRC == STM32_PLLSRC_HSE) - #error "HSE not enabled, required by STM32_SW and STM32_PLLSRC" - #endif + #if (STM32_MCOSEL == STM32_MCOSEL_HSE) || \ + ((STM32_MCOSEL == STM32_MCOSEL_PLL) && \ + (STM32_PLLSRC == STM32_PLLSRC_HSE)) + #error "HSE not enabled, required by STM32_MCOSEL" + #endif - #if (STM32_MCOSEL == STM32_MCOSEL_HSE) || \ - ((STM32_MCOSEL == STM32_MCOSEL_PLL) && \ - (STM32_PLLSRC == STM32_PLLSRC_HSE)) - #error "HSE not enabled, required by STM32_MCOSEL" - #endif + #if ((STM32_SAI1SEL == STM32_SAI1SEL_PLLSAI1) | \ + (STM32_SAI1SEL == STM32_SAI1SEL_PLLSAI2)) && \ + (STM32_PLLSRC == STM32_PLLSRC_HSE) + #error "HSE not enabled, required by STM32_SAI1SEL" + #endif - #if ((STM32_SAI1SEL == STM32_SAI1SEL_PLLSAI1) | \ - (STM32_SAI1SEL == STM32_SAI1SEL_PLLSAI2)) && \ - (STM32_PLLSRC == STM32_PLLSRC_HSE) - #error "HSE not enabled, required by STM32_SAI1SEL" - #endif + #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 - #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 - - #if STM32_RTCSEL == STM32_RTCSEL_HSEDIV - #error "HSE not enabled, required by STM32_RTCSEL" - #endif + #if STM32_RTCSEL == STM32_RTCSEL_HSEDIV + #error "HSE not enabled, required by STM32_RTCSEL" + #endif #endif /* !STM32_HSE_ENABLED */ diff --git a/os/hal/ports/STM32/STM32L4xx/hal_lld.h b/os/hal/ports/STM32/STM32L4xx/hal_lld.h index 889b24ac8..afbcfef8b 100644 --- a/os/hal/ports/STM32/STM32L4xx/hal_lld.h +++ b/os/hal/ports/STM32/STM32L4xx/hal_lld.h @@ -1035,51 +1035,37 @@ */ #if STM32_HSE_ENABLED - #if STM32_HSECLK == 0 - #error "HSE frequency not defined" - #else /* STM32_HSECLK != 0 */ - #if defined(STM32_HSE_BYPASS) - #if (STM32_HSECLK < STM32_HSECLK_BYP_MIN) || (STM32_HSECLK > STM32_HSECLK_BYP_MAX) - #error "STM32_HSECLK outside acceptable range (STM32_HSECLK_BYP_MIN...STM32_HSECLK_BYP_MAX)" - #endif - #else /* !defined(STM32_HSE_BYPASS) */ - #if (STM32_HSECLK < STM32_HSECLK_MIN) || (STM32_HSECLK > STM32_HSECLK_MAX) - #error "STM32_HSECLK outside acceptable range (STM32_HSECLK_MIN...STM32_HSECLK_MAX)" - #endif - #endif /* !defined(STM32_HSE_BYPASS) */ - #endif /* STM32_HSECLK != 0 */ +#else /* !STM32_HSE_ENABLED */ - #else /* !STM32_HSE_ENABLED */ + #if STM32_SW == STM32_SW_HSE + #error "HSE not enabled, required by STM32_SW" + #endif - #if STM32_SW == STM32_SW_HSE - #error "HSE not enabled, required by STM32_SW" - #endif + #if (STM32_SW == STM32_SW_PLL) && (STM32_PLLSRC == STM32_PLLSRC_HSE) + #error "HSE not enabled, required by STM32_SW and STM32_PLLSRC" + #endif - #if (STM32_SW == STM32_SW_PLL) && (STM32_PLLSRC == STM32_PLLSRC_HSE) - #error "HSE not enabled, required by STM32_SW and STM32_PLLSRC" - #endif + #if (STM32_MCOSEL == STM32_MCOSEL_HSE) || \ + ((STM32_MCOSEL == STM32_MCOSEL_PLL) && \ + (STM32_PLLSRC == STM32_PLLSRC_HSE)) + #error "HSE not enabled, required by STM32_MCOSEL" + #endif - #if (STM32_MCOSEL == STM32_MCOSEL_HSE) || \ - ((STM32_MCOSEL == STM32_MCOSEL_PLL) && \ - (STM32_PLLSRC == STM32_PLLSRC_HSE)) - #error "HSE not enabled, required by STM32_MCOSEL" - #endif + #if ((STM32_SAI1SEL == STM32_SAI1SEL_PLLSAI1) | \ + (STM32_SAI1SEL == STM32_SAI1SEL_PLLSAI2)) && \ + (STM32_PLLSRC == STM32_PLLSRC_HSE) + #error "HSE not enabled, required by STM32_SAI1SEL" + #endif - #if ((STM32_SAI1SEL == STM32_SAI1SEL_PLLSAI1) | \ - (STM32_SAI1SEL == STM32_SAI1SEL_PLLSAI2)) && \ - (STM32_PLLSRC == STM32_PLLSRC_HSE) - #error "HSE not enabled, required by STM32_SAI1SEL" - #endif + #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 - #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 - - #if STM32_RTCSEL == STM32_RTCSEL_HSEDIV - #error "HSE not enabled, required by STM32_RTCSEL" - #endif + #if STM32_RTCSEL == STM32_RTCSEL_HSEDIV + #error "HSE not enabled, required by STM32_RTCSEL" + #endif #endif /* !STM32_HSE_ENABLED */