diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-05-07 14:05:20 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-05-07 14:05:20 +0000 |
| commit | e1474c129264bf3c378544cf25c79fe8aaf8f5d5 (patch) | |
| tree | 8631641b519066a5fdf27ef58aac19ac00a6d6ff | |
| parent | b058a251b800ac85c10019c6123a629bc942eaaf (diff) | |
| download | ChibiOS-e1474c129264bf3c378544cf25c79fe8aaf8f5d5.tar.gz ChibiOS-e1474c129264bf3c378544cf25c79fe8aaf8f5d5.tar.bz2 ChibiOS-e1474c129264bf3c378544cf25c79fe8aaf8f5d5.zip | |
Added guard for STM32_TIMPRE.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12013 110e8d01-0319-4d1e-a829-52ad28d1bb01
| -rw-r--r-- | os/hal/ports/STM32/STM32F4xx/hal_lld.h | 7 | ||||
| -rw-r--r-- | readme.txt | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/os/hal/ports/STM32/STM32F4xx/hal_lld.h b/os/hal/ports/STM32/STM32F4xx/hal_lld.h index de5aaa5cb..c4dbfa9ed 100644 --- a/os/hal/ports/STM32/STM32F4xx/hal_lld.h +++ b/os/hal/ports/STM32/STM32F4xx/hal_lld.h @@ -914,6 +914,13 @@ #endif
/**
+ * @brief TIM prescaler clock source.
+ */
+#if !defined(STM32_TIMPRE) || defined(__DOXYGEN__)
+#define STM32_TIMPRE STM32_TIMPRE_PCLK
+#endif
+
+/**
* @brief PLL48CLK clock source.
*/
#if !defined(STM32_CK48MSEL) || defined(__DOXYGEN__)
diff --git a/readme.txt b/readme.txt index 04c73486c..8a9babd63 100644 --- a/readme.txt +++ b/readme.txt @@ -92,7 +92,7 @@ *** Next ***
- NEW: Added support for STM32F413, added ability to handle the TIMPRE bit
- in the RCC_CFGR register.
+ in the RCC_DKCFGR register.
- NEW: Added optional support for character match callback in the UART
high level driver.
- NEW: Change, chMtxGetNextMutexS() renamed to chMtxGetNextMutexX().
@@ -124,6 +124,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 binary instead of logic operator in STM32F4 HAL (bug #946)
+ (backported to 18.2.2 and 17.6.5).
- HAL: Fixed Mikroe clicker 2 misaligned board file (bug #945)
(backported to 18.2.2 and 17.6.5).
- EX: Fixed ChibiOS/EX documentation misalignments (bug #943).
|