From b7fe85dfd02d37e3fc072c583c3fbe96f652c4c5 Mon Sep 17 00:00:00 2001 From: Rocco Marco Guglielmi Date: Tue, 1 Aug 2017 20:47:54 +0000 Subject: [PATCH] Fixed Bug #868 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_17.6.x@10347 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/ports/STM32/STM32L0xx/hal_lld.h | 14 +++++++------- readme.txt | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/os/hal/ports/STM32/STM32L0xx/hal_lld.h b/os/hal/ports/STM32/STM32L0xx/hal_lld.h index 550308803..1d93ac4c5 100644 --- a/os/hal/ports/STM32/STM32L0xx/hal_lld.h +++ b/os/hal/ports/STM32/STM32L0xx/hal_lld.h @@ -98,7 +98,7 @@ */ #define STM32_HSI16CLK 16000000 /**< 16MHz internal clock. */ #define STM32_HSI48CLK 48000000 /**< 48MHz internal clock. */ -#define STM32_LSICLK 38000 /**< Low speed internal clock. */ +#define STM32_LSICLK 37000 /**< Low speed internal clock. */ /** @} */ /** @@ -160,12 +160,12 @@ #define STM32_PPRE1_DIV8 (6 << 8) /**< HCLK divided by 8. */ #define STM32_PPRE1_DIV16 (7 << 8) /**< HCLK divided by 16. */ -#define STM32_PPRE2_MASK (7 << 12) /**< PPRE2 field mask. */ -#define STM32_PPRE2_DIV1 (0 << 12) /**< HCLK divided by 1. */ -#define STM32_PPRE2_DIV2 (4 << 12) /**< HCLK divided by 2. */ -#define STM32_PPRE2_DIV4 (5 << 12) /**< HCLK divided by 4. */ -#define STM32_PPRE2_DIV8 (6 << 12) /**< HCLK divided by 8. */ -#define STM32_PPRE2_DIV16 (7 << 12) /**< HCLK divided by 16. */ +#define STM32_PPRE2_MASK (7 << 11) /**< PPRE2 field mask. */ +#define STM32_PPRE2_DIV1 (0 << 11) /**< HCLK divided by 1. */ +#define STM32_PPRE2_DIV2 (4 << 11) /**< HCLK divided by 2. */ +#define STM32_PPRE2_DIV4 (5 << 11) /**< HCLK divided by 4. */ +#define STM32_PPRE2_DIV8 (6 << 11) /**< HCLK divided by 8. */ +#define STM32_PPRE2_DIV16 (7 << 11) /**< HCLK divided by 16. */ #define STM32_STOPWUCK_MASK (1 << 15) /**< PLLDIV field mask. */ #define STM32_STOPWUCK_MSI (0 << 15) /**< MSI is wakeup clock. */ diff --git a/readme.txt b/readme.txt index d9128931a..2bfd4bfe7 100644 --- a/readme.txt +++ b/readme.txt @@ -89,7 +89,8 @@ ***************************************************************************** *** 17.6.1 *** -- HAL: Fixed wrong bit mask in STM32L0 hal lld (bug #866). +- HAL: Fixed wrong PPRE2 and LSI related macros in STM32L0 hal lld (bug #868). +- HAL: Fixed wrong bit mask in STM32L0 hal lld (bug #866). - RT: Fixed misplaced assertion in semaphores code (bug #865). - HAL: Fixed STM32 USBv1 fails the state check when USB_USE_WAIT is TRUE (bug #863).