From f57e4df3b76e78c373bfef6a2dcf373c4c004aa3 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Fri, 27 Mar 2020 15:19:36 +0000 Subject: [PATCH] Fixed bug #1078. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@13486 27425a3e-05d8-49a3-a47f-9c15f0e5edd8 --- os/hal/ports/STM32/LLD/TIMv1/stm32_tim6.inc | 4 ++++ os/hal/ports/STM32/LLD/TIMv1/stm32_tim7.inc | 4 ++++ readme.txt | 6 ++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/os/hal/ports/STM32/LLD/TIMv1/stm32_tim6.inc b/os/hal/ports/STM32/LLD/TIMv1/stm32_tim6.inc index d8117339f..200d10329 100644 --- a/os/hal/ports/STM32/LLD/TIMv1/stm32_tim6.inc +++ b/os/hal/ports/STM32/LLD/TIMv1/stm32_tim6.inc @@ -107,11 +107,15 @@ OSAL_IRQ_HANDLER(STM32_TIM6_HANDLER) { #endif #endif #if HAL_USE_ICU +#if STM32_ICU_USE_TIM6 icu_lld_serve_interrupt(&ICUD6); #endif +#endif #if HAL_USE_PWM +#if STM32_PWM_USE_TIM6 pwm_lld_serve_interrupt(&PWMD6); #endif +#endif #if 1 #if STM32_ST_USE_TIM6 st_lld_serve_interrupt(); diff --git a/os/hal/ports/STM32/LLD/TIMv1/stm32_tim7.inc b/os/hal/ports/STM32/LLD/TIMv1/stm32_tim7.inc index 8e23caab1..8ea4e0f67 100644 --- a/os/hal/ports/STM32/LLD/TIMv1/stm32_tim7.inc +++ b/os/hal/ports/STM32/LLD/TIMv1/stm32_tim7.inc @@ -107,11 +107,15 @@ OSAL_IRQ_HANDLER(STM32_TIM7_HANDLER) { #endif #endif #if HAL_USE_ICU +#if STM32_ICU_USE_TIM7 icu_lld_serve_interrupt(&ICUD7); #endif +#endif #if HAL_USE_PWM +#if STM32_PWM_USE_TIM7 pwm_lld_serve_interrupt(&PWMD7); #endif +#endif #if 1 #if STM32_ST_USE_TIM7 st_lld_serve_interrupt(); diff --git a/readme.txt b/readme.txt index fa0370be5..2c323fce0 100644 --- a/readme.txt +++ b/readme.txt @@ -78,7 +78,9 @@ MEMS Accelerometers. - NEW: Safer messages mechanism for sandboxes (to be backported to 20.3.1). - NEW: Added latency measurement test application. +- FIX: Fixed missing checks in TIM6 and TIM7 STM32 mini drivers (bug #1078) + (backported to 20.3.1). - FIX: Fixed error in EXTIv1 ISRs (bug #1077) - (backported to 20.3.1) -- FIX: Fixed problem in chMtxUnlockAllS() (bug #1076) + (backported to 20.3.1). +- FIX: Fixed problem in chMtxUnlockAllS() (bug #1076). (backported to 20.3.1)(backported to 19.1.4)(backported to 18.2.3).