rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed superfluous timerClockDivisor (not used anywhere anymore).

This commit is contained in:
blckmn 2017-07-09 07:41:02 +10:00
parent 750bc6452a
commit a078739ec2
5 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/drivers/timer.h
View File

@ -182,7 +182,6 @@ void timerInit(void);
void timerStart(void); void timerStart(void);
void timerForceOverflow(TIM_TypeDef *tim); void timerForceOverflow(TIM_TypeDef *tim);
uint8_t timerClockDivisor(TIM_TypeDef *tim);
uint32_t timerClock(TIM_TypeDef *tim); uint32_t timerClock(TIM_TypeDef *tim);
void configTimeBase(TIM_TypeDef *tim, uint16_t period, uint32_t hz); // TODO - just for migration void configTimeBase(TIM_TypeDef *tim, uint16_t period, uint32_t hz); // TODO - just for migration

6
src/main/drivers/timer_stm32f10x.c
View File

@ -44,12 +44,6 @@ const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = {
#endif #endif
}; };
uint8_t timerClockDivisor(TIM_TypeDef *tim)
{
UNUSED(tim);
return 1;
}
uint32_t timerClock(TIM_TypeDef *tim) uint32_t timerClock(TIM_TypeDef *tim)
{ {
UNUSED(tim); UNUSED(tim);

6
src/main/drivers/timer_stm32f30x.c
View File

@ -36,12 +36,6 @@ const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = {
{ .TIMx = TIM17, .rcc = RCC_APB2(TIM17), .inputIrq = TIM1_TRG_COM_TIM17_IRQn }, { .TIMx = TIM17, .rcc = RCC_APB2(TIM17), .inputIrq = TIM1_TRG_COM_TIM17_IRQn },
}; };
uint8_t timerClockDivisor(TIM_TypeDef *tim)
{
UNUSED(tim);
return 1;
}
uint32_t timerClock(TIM_TypeDef *tim) uint32_t timerClock(TIM_TypeDef *tim)
{ {
UNUSED(tim); UNUSED(tim);

21
src/main/drivers/timer_stm32f4xx.c
View File

@ -80,23 +80,18 @@ const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = {
7 TIM8_CH1 TIM8_CH2 TIM8_CH3 TIM8_CH4 7 TIM8_CH1 TIM8_CH2 TIM8_CH3 TIM8_CH4
*/ */
uint8_t timerClockDivisor(TIM_TypeDef *tim) uint32_t timerClock(TIM_TypeDef *tim)
{ {
#if defined (STM32F411xE) #if defined (STM32F411xE)
UNUSED(tim); UNUSED(tim);
return 1; return SystemCoreClock;
#elif defined (STM32F40_41xxx) #elif defined (STM32F40_41xxx)
if (tim == TIM8) return 1; if (tim == TIM8 || tim == TIM1 || tim == TIM9 || tim == TIM10 || tim == TIM11) {
#endif return SystemCoreClock;
if (tim == TIM1 || tim == TIM9 || tim == TIM10 || tim == TIM11) {
return 1;
} else { } else {
return 2; return SystemCoreClock / 2;
} }
} #else
#error "No timer clock defined correctly for MCU"
uint32_t timerClock(TIM_TypeDef *tim) #endif
{
return SystemCoreClock / timerClockDivisor(tim);
} }

5
src/main/drivers/timer_stm32f7xx.c
View File

@ -75,11 +75,6 @@ const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = {
6 TIM1_CH1 TIM1_CH2 TIM1_CH1 TIM1_CH4 TIM1_CH3 6 TIM1_CH1 TIM1_CH2 TIM1_CH1 TIM1_CH4 TIM1_CH3
7 TIM8_CH1 TIM8_CH2 TIM8_CH3 TIM8_CH4 7 TIM8_CH1 TIM8_CH2 TIM8_CH3 TIM8_CH4
*/ */
uint8_t timerClockDivisor(TIM_TypeDef *tim)
{
UNUSED(tim);
return 1;
}
uint32_t timerClock(TIM_TypeDef *tim) uint32_t timerClock(TIM_TypeDef *tim)
{ {