From ece0fcd51efc71d000fbef8d3f6097d3a7089fd2 Mon Sep 17 00:00:00 2001 From: Rocco Marco Guglielmi Date: Sat, 22 Apr 2017 13:08:50 +0000 Subject: [PATCH] Fixed Bug #831 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10165 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/ports/STM32/LLD/TIMv1/stm32_tim.c | 96 ------------------------ readme.txt | 1 + 2 files changed, 1 insertion(+), 96 deletions(-) delete mode 100644 os/hal/ports/STM32/LLD/TIMv1/stm32_tim.c diff --git a/os/hal/ports/STM32/LLD/TIMv1/stm32_tim.c b/os/hal/ports/STM32/LLD/TIMv1/stm32_tim.c deleted file mode 100644 index 75a4e3000..000000000 --- a/os/hal/ports/STM32/LLD/TIMv1/stm32_tim.c +++ /dev/null @@ -1,96 +0,0 @@ -/* - ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -/** - * @file TIMv1/stm32_tim.h - * @brief STM32 TIM units common code. - * @note This file requires definitions from the ST STM32 header file. - * - * @addtogroup STM32_TIMv1 - * @{ - */ - -#include "hal.h" - -#if HAL_USE_GPT || HAL_USE_ICU || HAL_USE_PWM || defined(__DOXYGEN__) - -/*===========================================================================*/ -/* Driver local definitions. */ -/*===========================================================================*/ - -/*===========================================================================*/ -/* Driver exported variables. */ -/*===========================================================================*/ - -/*===========================================================================*/ -/* Driver local variables and types. */ -/*===========================================================================*/ - -/*===========================================================================*/ -/* Driver local functions. */ -/*===========================================================================*/ - -/*===========================================================================*/ -/* Driver interrupt handlers. */ -/*===========================================================================*/ - -#if defined(STM32_TIM2_IS_USED) || defined(__DOXYGEN__) -#if !defined(STM32_TIM2_SUPPRESS_ISR) -#if !defined(STM32_TIM2_HANDLER) -#error "STM32_TIM2_HANDLER not defined" -#endif -/** - * @brief TIM2 interrupt handler. - * - * @isr - */ -OSAL_IRQ_HANDLER(STM32_TIM2_HANDLER) { - uint32_t sr; - - OSAL_IRQ_PROLOGUE(); - - sr = TIM2->SR; - sr &= TIM2->DIER & STM32_TIM_DIER_IRQ_MASK; - TIM2->SR = ~sr; - -#if STM32_GPT_USE_TIM2 - gpt_lld_serve_interrupt(&GPTD2); -#endif - -#if STM32_ICU_USE_TIM2 - icu_lld_serve_interrupt(&ICUD2, sr); -#endif - -#if STM32_PWM_USE_TIM2 - gpt_lld_serve_interrupt(&PWMD2, sr); -#endif - -#if STM32_ST_USE_TIM2 - st_lld_serve_interrupt(); -#endif - - OSAL_IRQ_EPILOGUE(); -} -#endif /* !defined(STM32_TIM2_SUPPRESS_ISR) */ -#endif /* defined(STM32_TIM2_IS_USED) */ - -/*===========================================================================*/ -/* Driver exported functions. */ -/*===========================================================================*/ - -#endif /* HAL_USE_GPT || HAL_USE_ICU || HAL_USE_PWM */ - -/** @} */ diff --git a/readme.txt b/readme.txt index a253265f1..443552bec 100644 --- a/readme.txt +++ b/readme.txt @@ -157,6 +157,7 @@ - RT: Merged RT4. - NIL: Merged NIL2. - NIL: Added STM32F7 demo. +- HAL: Removed unused file in STM32 TIM driver (bug #831). - HAL: Fixed wrong comment in STM32F7 mcuconf (bug #830)(backported to 16.1.8). - RT: Fixed race condition in chBMReset() (bug #828)(backported to 16.1.8). - HAL: Fixed wrong number of EXTI lines for STM32F303x8 (bug #827)(backported