zrzk
/
px4_autopilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Apply STM32 timer patch from Mike Smith 

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4280 7fd9a85b-ad96-42d3-883c-3090e2eb8679
sbg
patacongo 13 years ago
parent
d94c97fcdd
commit
c7a7ac6cfb
1 changed files with 54 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 54
      nuttx/arch/arm/src/stm32/stm32_tim.c

54
nuttx/arch/arm/src/stm32/stm32_tim.c
Unescape View File

@ -458,40 +458,76 @@ static int stm32_tim_setchannel(FAR struct stm32_tim_dev_s *dev, uint8_t channel
#if CONFIG_STM32_TIM2 #if CONFIG_STM32_TIM2
case STM32_TIM2_BASE: case STM32_TIM2_BASE:
switch(channel) { switch(channel) {
#if defined(GPIO_TIM2_CH1OUT)
case 0: stm32_tim_gpioconfig(GPIO_TIM2_CH1OUT, mode); break; case 0: stm32_tim_gpioconfig(GPIO_TIM2_CH1OUT, mode); break;
#endif
#if defined(GPIO_TIM2_CH2OUT)
case 1: stm32_tim_gpioconfig(GPIO_TIM2_CH2OUT, mode); break; case 1: stm32_tim_gpioconfig(GPIO_TIM2_CH2OUT, mode); break;
#endif
#if defined(GPIO_TIM2_CH3OUT)
case 2: stm32_tim_gpioconfig(GPIO_TIM2_CH3OUT, mode); break; case 2: stm32_tim_gpioconfig(GPIO_TIM2_CH3OUT, mode); break;
#endif
#if defined(GPIO_TIM2_CH4OUT)
case 3: stm32_tim_gpioconfig(GPIO_TIM2_CH4OUT, mode); break; case 3: stm32_tim_gpioconfig(GPIO_TIM2_CH4OUT, mode); break;
#endif
default: return ERROR;
} }
break; break;
#endif #endif
#if CONFIG_STM32_TIM3 #if CONFIG_STM32_TIM3
case STM32_TIM3_BASE: case STM32_TIM3_BASE:
switch(channel) { switch(channel) {
#if defined(GPIO_TIM3_CH1OUT)
case 0: stm32_tim_gpioconfig(GPIO_TIM3_CH1OUT, mode); break; case 0: stm32_tim_gpioconfig(GPIO_TIM3_CH1OUT, mode); break;
#endif
#if defined(GPIO_TIM3_CH2OUT)
case 1: stm32_tim_gpioconfig(GPIO_TIM3_CH2OUT, mode); break; case 1: stm32_tim_gpioconfig(GPIO_TIM3_CH2OUT, mode); break;
#endif
#if defined(GPIO_TIM3_CH3OUT)
case 2: stm32_tim_gpioconfig(GPIO_TIM3_CH3OUT, mode); break; case 2: stm32_tim_gpioconfig(GPIO_TIM3_CH3OUT, mode); break;
#endif
#if defined(GPIO_TIM3_CH4OUT)
case 3: stm32_tim_gpioconfig(GPIO_TIM3_CH4OUT, mode); break; case 3: stm32_tim_gpioconfig(GPIO_TIM3_CH4OUT, mode); break;
#endif
default: return ERROR;
} }
break; break;
#endif #endif
#if CONFIG_STM32_TIM4 #if CONFIG_STM32_TIM4
case STM32_TIM4_BASE: case STM32_TIM4_BASE:
switch(channel) { switch(channel) {
#if defined(GPIO_TIM4_CH1OUT)
case 0: stm32_tim_gpioconfig(GPIO_TIM4_CH1OUT, mode); break; case 0: stm32_tim_gpioconfig(GPIO_TIM4_CH1OUT, mode); break;
#endif
#if defined(GPIO_TIM4_CH2OUT)
case 1: stm32_tim_gpioconfig(GPIO_TIM4_CH2OUT, mode); break; case 1: stm32_tim_gpioconfig(GPIO_TIM4_CH2OUT, mode); break;
#endif
#if defined(GPIO_TIM4_CH3OUT)
case 2: stm32_tim_gpioconfig(GPIO_TIM4_CH3OUT, mode); break; case 2: stm32_tim_gpioconfig(GPIO_TIM4_CH3OUT, mode); break;
#endif
#if defined(GPIO_TIM4_CH4OUT)
case 3: stm32_tim_gpioconfig(GPIO_TIM4_CH4OUT, mode); break; case 3: stm32_tim_gpioconfig(GPIO_TIM4_CH4OUT, mode); break;
#endif
default: return ERROR;
} }
break; break;
#endif #endif
#if CONFIG_STM32_TIM5 #if CONFIG_STM32_TIM5
case STM32_TIM5_BASE: case STM32_TIM5_BASE:
switch(channel) { switch(channel) {
#if defined(GPIO_TIM5_CH1OUT)
case 0: stm32_tim_gpioconfig(GPIO_TIM5_CH1OUT, mode); break; case 0: stm32_tim_gpioconfig(GPIO_TIM5_CH1OUT, mode); break;
#endif
#if defined(GPIO_TIM5_CH2OUT)
case 1: stm32_tim_gpioconfig(GPIO_TIM5_CH2OUT, mode); break; case 1: stm32_tim_gpioconfig(GPIO_TIM5_CH2OUT, mode); break;
#endif
#if defined(GPIO_TIM5_CH3OUT)
case 2: stm32_tim_gpioconfig(GPIO_TIM5_CH3OUT, mode); break; case 2: stm32_tim_gpioconfig(GPIO_TIM5_CH3OUT, mode); break;
#endif
#if defined(GPIO_TIM5_CH4OUT)
case 3: stm32_tim_gpioconfig(GPIO_TIM5_CH4OUT, mode); break; case 3: stm32_tim_gpioconfig(GPIO_TIM5_CH4OUT, mode); break;
#endif
default: return ERROR;
} }
break; break;
#endif #endif
@ -500,20 +536,38 @@ static int stm32_tim_setchannel(FAR struct stm32_tim_dev_s *dev, uint8_t channel
#if CONFIG_STM32_TIM1 #if CONFIG_STM32_TIM1
case STM32_TIM1_BASE: case STM32_TIM1_BASE:
switch(channel) { switch(channel) {
#if defined(GPIO_TIM1_CH1OUT)
case 0: stm32_tim_gpioconfig(GPIO_TIM1_CH1OUT, mode); break; case 0: stm32_tim_gpioconfig(GPIO_TIM1_CH1OUT, mode); break;
#endif
#if defined(GPIO_TIM1_CH2OUT)
case 1: stm32_tim_gpioconfig(GPIO_TIM1_CH2OUT, mode); break; case 1: stm32_tim_gpioconfig(GPIO_TIM1_CH2OUT, mode); break;
#endif
#if defined(GPIO_TIM1_CH3OUT)
case 2: stm32_tim_gpioconfig(GPIO_TIM1_CH3OUT, mode); break; case 2: stm32_tim_gpioconfig(GPIO_TIM1_CH3OUT, mode); break;
#endif
#if defined(GPIO_TIM1_CH4OUT)
case 3: stm32_tim_gpioconfig(GPIO_TIM1_CH4OUT, mode); break; case 3: stm32_tim_gpioconfig(GPIO_TIM1_CH4OUT, mode); break;
#endif
default: return ERROR;
} }
break; break;
#endif #endif
#if CONFIG_STM32_TIM8 #if CONFIG_STM32_TIM8
case STM32_TIM8_BASE: case STM32_TIM8_BASE:
switch(channel) { switch(channel) {
#if defined(GPIO_TIM8_CH1OUT)
case 0: stm32_tim_gpioconfig(GPIO_TIM8_CH1OUT, mode); break; case 0: stm32_tim_gpioconfig(GPIO_TIM8_CH1OUT, mode); break;
#endif
#if defined(GPIO_TIM8_CH2OUT)
case 1: stm32_tim_gpioconfig(GPIO_TIM8_CH2OUT, mode); break; case 1: stm32_tim_gpioconfig(GPIO_TIM8_CH2OUT, mode); break;
#endif
#if defined(GPIO_TIM8_CH3OUT)
case 2: stm32_tim_gpioconfig(GPIO_TIM8_CH3OUT, mode); break; case 2: stm32_tim_gpioconfig(GPIO_TIM8_CH3OUT, mode); break;
#endif
#if defined(GPIO_TIM8_CH4OUT)
case 3: stm32_tim_gpioconfig(GPIO_TIM8_CH4OUT, mode); break; case 3: stm32_tim_gpioconfig(GPIO_TIM8_CH4OUT, mode); break;
#endif
default: return ERROR;
} }
break; break;
#endif #endif

Write Preview
Loading…
Cancel
Save