andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

STM32 ICU and PWM drivers adapted to the new ISR names. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4319 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2012-06-21 17:24:17 +00:00
parent dbe26c3e6e
commit a41017aac1
4 changed files with 36 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
os/hal/platforms/STM32/icu_lld.c
View File

@ -480,40 +480,40 @@ void icu_lld_stop(ICUDriver *icup) {
#if STM32_ICU_USE_TIM1 #if STM32_ICU_USE_TIM1
if (&ICUD1 == icup) { if (&ICUD1 == icup) {
nvicDisableVector(TIM1_CC_IRQn); nvicDisableVector(STM32_TIM1_UP_NUMBER);
nvicDisableVector(TIM1_UP_IRQn); nvicDisableVector(STM32_TIM1_CC_NUMBER);
rccDisableTIM1(FALSE); rccDisableTIM1(FALSE);
} }
#endif #endif
#if STM32_ICU_USE_TIM2 #if STM32_ICU_USE_TIM2
if (&ICUD2 == icup) { if (&ICUD2 == icup) {
nvicDisableVector(TIM2_IRQn); nvicDisableVector(STM32_TIM2_NUMBER);
rccDisableTIM2(FALSE); rccDisableTIM2(FALSE);
} }
#endif #endif
#if STM32_ICU_USE_TIM3 #if STM32_ICU_USE_TIM3
if (&ICUD3 == icup) { if (&ICUD3 == icup) {
nvicDisableVector(TIM3_IRQn); nvicDisableVector(STM32_TIM3_NUMBER);
rccDisableTIM3(FALSE); rccDisableTIM3(FALSE);
} }
#endif #endif
#if STM32_ICU_USE_TIM4 #if STM32_ICU_USE_TIM4
if (&ICUD4 == icup) { if (&ICUD4 == icup) {
nvicDisableVector(TIM4_IRQn); nvicDisableVector(STM32_TIM4_NUMBER);
rccDisableTIM4(FALSE); rccDisableTIM4(FALSE);
} }
#endif #endif
#if STM32_ICU_USE_TIM5 #if STM32_ICU_USE_TIM5
if (&ICUD5 == icup) { if (&ICUD5 == icup) {
nvicDisableVector(TIM5_IRQn); nvicDisableVector(STM32_TIM5_NUMBER);
rccDisableTIM5(FALSE); rccDisableTIM5(FALSE);
} }
#endif #endif
} }
#if STM32_ICU_USE_TIM8 #if STM32_ICU_USE_TIM8
if (&ICUD8 == icup) { if (&ICUD8 == icup) {
nvicDisableVector(TIM8_CC_IRQn); nvicDisableVector(STM32_TIM8_UP_NUMBER);
nvicDisableVector(TIM8_UP_IRQn); nvicDisableVector(STM32_TIM8_CC_NUMBER);
rccDisableTIM8(FALSE); rccDisableTIM8(FALSE);
} }
#endif #endif

51
os/hal/platforms/STM32/pwm_lld.c
View File

@ -134,7 +134,7 @@ static void serve_interrupt(PWMDriver *pwmp) {
* *
* @isr * @isr
*/ */
CH_IRQ_HANDLER(TIM1_UP_IRQHandler) { CH_IRQ_HANDLER(STM32_TIM1_UP_HANDLER) {
CH_IRQ_PROLOGUE(); CH_IRQ_PROLOGUE();
@ -152,7 +152,7 @@ CH_IRQ_HANDLER(TIM1_UP_IRQHandler) {
* *
* @isr * @isr
*/ */
CH_IRQ_HANDLER(TIM1_CC_IRQHandler) { CH_IRQ_HANDLER(STM32_TIM1_CC_HANDLER) {
uint16_t sr; uint16_t sr;
CH_IRQ_PROLOGUE(); CH_IRQ_PROLOGUE();
@ -179,7 +179,7 @@ CH_IRQ_HANDLER(TIM1_CC_IRQHandler) {
* *
* @isr * @isr
*/ */
CH_IRQ_HANDLER(TIM2_IRQHandler) { CH_IRQ_HANDLER(STM32_TIM2_HANDLER) {
CH_IRQ_PROLOGUE(); CH_IRQ_PROLOGUE();
@ -195,7 +195,7 @@ CH_IRQ_HANDLER(TIM2_IRQHandler) {
* *
* @isr * @isr
*/ */
CH_IRQ_HANDLER(TIM3_IRQHandler) { CH_IRQ_HANDLER(STM32_TIM3_HANDLER) {
CH_IRQ_PROLOGUE(); CH_IRQ_PROLOGUE();
@ -211,7 +211,7 @@ CH_IRQ_HANDLER(TIM3_IRQHandler) {
* *
* @isr * @isr
*/ */
CH_IRQ_HANDLER(TIM4_IRQHandler) { CH_IRQ_HANDLER(STM32_TIM4_HANDLER) {
CH_IRQ_PROLOGUE(); CH_IRQ_PROLOGUE();
@ -227,7 +227,7 @@ CH_IRQ_HANDLER(TIM4_IRQHandler) {
* *
* @isr * @isr
*/ */
CH_IRQ_HANDLER(TIM5_IRQHandler) { CH_IRQ_HANDLER(STM32_TIM5_HANDLER) {
CH_IRQ_PROLOGUE(); CH_IRQ_PROLOGUE();
@ -246,7 +246,7 @@ CH_IRQ_HANDLER(TIM5_IRQHandler) {
* *
* @isr * @isr
*/ */
CH_IRQ_HANDLER(TIM8_UP_IRQHandler) { CH_IRQ_HANDLER(STM32_TIM8_UP_HANDLER) {
CH_IRQ_PROLOGUE(); CH_IRQ_PROLOGUE();
@ -264,13 +264,14 @@ CH_IRQ_HANDLER(TIM8_UP_IRQHandler) {
* *
* @isr * @isr
*/ */
CH_IRQ_HANDLER(TIM8_CC_IRQHandler) { CH_IRQ_HANDLER(STM32_TIM8_CC_HANDLER) {
uint16_t sr; uint16_t sr;
CH_IRQ_PROLOGUE(); CH_IRQ_PROLOGUE();
sr = STM32_TIM8->SR & STM32_TIM8->DIER; sr = STM32_TIM8->SR & STM32_TIM8->DIER;
STM32_TIM8->SR = ~(TIM_SR_CC1IF | TIM_SR_CC2IF | TIM_SR_CC3IF | TIM_SR_CC4IF); STM32_TIM8->SR = ~(TIM_SR_CC1IF | TIM_SR_CC2IF |
TIM_SR_CC3IF | TIM_SR_CC4IF);
if ((sr & TIM_SR_CC1IF) != 0) if ((sr & TIM_SR_CC1IF) != 0)
PWMD8.config->channels[0].callback(&PWMD8); PWMD8.config->channels[0].callback(&PWMD8);
if ((sr & TIM_SR_CC2IF) != 0) if ((sr & TIM_SR_CC2IF) != 0)
@ -351,9 +352,9 @@ void pwm_lld_start(PWMDriver *pwmp) {
if (&PWMD1 == pwmp) { if (&PWMD1 == pwmp) {
rccEnableTIM1(FALSE); rccEnableTIM1(FALSE);
rccResetTIM1(); rccResetTIM1();
nvicEnableVector(TIM1_UP_IRQn, nvicEnableVector(STM32_TIM1_UP_NUMBER,
CORTEX_PRIORITY_MASK(STM32_PWM_TIM1_IRQ_PRIORITY)); CORTEX_PRIORITY_MASK(STM32_PWM_TIM1_IRQ_PRIORITY));
nvicEnableVector(TIM1_CC_IRQn, nvicEnableVector(STM32_TIM1_CC_NUMBER,
CORTEX_PRIORITY_MASK(STM32_PWM_TIM1_IRQ_PRIORITY)); CORTEX_PRIORITY_MASK(STM32_PWM_TIM1_IRQ_PRIORITY));
pwmp->clock = STM32_TIMCLK2; pwmp->clock = STM32_TIMCLK2;
} }
@ -362,7 +363,7 @@ void pwm_lld_start(PWMDriver *pwmp) {
if (&PWMD2 == pwmp) { if (&PWMD2 == pwmp) {
rccEnableTIM2(FALSE); rccEnableTIM2(FALSE);
rccResetTIM2(); rccResetTIM2();
nvicEnableVector(TIM2_IRQn, nvicEnableVector(STM32_TIM2_NUMBER,
CORTEX_PRIORITY_MASK(STM32_PWM_TIM2_IRQ_PRIORITY)); CORTEX_PRIORITY_MASK(STM32_PWM_TIM2_IRQ_PRIORITY));
pwmp->clock = STM32_TIMCLK1; pwmp->clock = STM32_TIMCLK1;
} }
@ -371,7 +372,7 @@ void pwm_lld_start(PWMDriver *pwmp) {
if (&PWMD3 == pwmp) { if (&PWMD3 == pwmp) {
rccEnableTIM3(FALSE); rccEnableTIM3(FALSE);
rccResetTIM3(); rccResetTIM3();
nvicEnableVector(TIM3_IRQn, nvicEnableVector(STM32_TIM3_NUMBER,
CORTEX_PRIORITY_MASK(STM32_PWM_TIM3_IRQ_PRIORITY)); CORTEX_PRIORITY_MASK(STM32_PWM_TIM3_IRQ_PRIORITY));
pwmp->clock = STM32_TIMCLK1; pwmp->clock = STM32_TIMCLK1;
} }
@ -380,7 +381,7 @@ void pwm_lld_start(PWMDriver *pwmp) {
if (&PWMD4 == pwmp) { if (&PWMD4 == pwmp) {
rccEnableTIM4(FALSE); rccEnableTIM4(FALSE);
rccResetTIM4(); rccResetTIM4();
nvicEnableVector(TIM4_IRQn, nvicEnableVector(STM32_TIM4_NUMBER,
CORTEX_PRIORITY_MASK(STM32_PWM_TIM4_IRQ_PRIORITY)); CORTEX_PRIORITY_MASK(STM32_PWM_TIM4_IRQ_PRIORITY));
pwmp->clock = STM32_TIMCLK1; pwmp->clock = STM32_TIMCLK1;
} }
@ -390,7 +391,7 @@ void pwm_lld_start(PWMDriver *pwmp) {
if (&PWMD5 == pwmp) { if (&PWMD5 == pwmp) {
rccEnableTIM5(FALSE); rccEnableTIM5(FALSE);
rccResetTIM5(); rccResetTIM5();
nvicEnableVector(TIM5_IRQn, nvicEnableVector(STM32_TIM5_NUMBER,
CORTEX_PRIORITY_MASK(STM32_PWM_TIM5_IRQ_PRIORITY)); CORTEX_PRIORITY_MASK(STM32_PWM_TIM5_IRQ_PRIORITY));
pwmp->clock = STM32_TIMCLK1; pwmp->clock = STM32_TIMCLK1;
} }
@ -399,9 +400,9 @@ void pwm_lld_start(PWMDriver *pwmp) {
if (&PWMD8 == pwmp) { if (&PWMD8 == pwmp) {
rccEnableTIM8(FALSE); rccEnableTIM8(FALSE);
rccResetTIM8(); rccResetTIM8();
nvicEnableVector(TIM8_UP_IRQn, nvicEnableVector(STM32_TIM8_UP_NUMBER,
CORTEX_PRIORITY_MASK(STM32_PWM_TIM8_IRQ_PRIORITY)); CORTEX_PRIORITY_MASK(STM32_PWM_TIM8_IRQ_PRIORITY));
nvicEnableVector(TIM8_CC_IRQn, nvicEnableVector(STM32_TIM8_CC_NUMBER,
CORTEX_PRIORITY_MASK(STM32_PWM_TIM8_IRQ_PRIORITY)); CORTEX_PRIORITY_MASK(STM32_PWM_TIM8_IRQ_PRIORITY));
pwmp->clock = STM32_TIMCLK2; pwmp->clock = STM32_TIMCLK2;
} }
@ -545,39 +546,39 @@ void pwm_lld_stop(PWMDriver *pwmp) {
#if STM32_PWM_USE_TIM1 #if STM32_PWM_USE_TIM1
if (&PWMD1 == pwmp) { if (&PWMD1 == pwmp) {
nvicDisableVector(TIM1_UP_IRQn); nvicDisableVector(STM32_TIM1_UP_NUMBER);
nvicDisableVector(TIM1_CC_IRQn); nvicDisableVector(STM32_TIM1_CC_NUMBER);
rccDisableTIM1(FALSE); rccDisableTIM1(FALSE);
} }
#endif #endif
#if STM32_PWM_USE_TIM2 #if STM32_PWM_USE_TIM2
if (&PWMD2 == pwmp) { if (&PWMD2 == pwmp) {
nvicDisableVector(TIM2_IRQn); nvicDisableVector(STM32_TIM2_NUMBER);
rccDisableTIM2(FALSE); rccDisableTIM2(FALSE);
} }
#endif #endif
#if STM32_PWM_USE_TIM3 #if STM32_PWM_USE_TIM3
if (&PWMD3 == pwmp) { if (&PWMD3 == pwmp) {
nvicDisableVector(TIM3_IRQn); nvicDisableVector(STM32_TIM3_NUMBER);
rccDisableTIM3(FALSE); rccDisableTIM3(FALSE);
} }
#endif #endif
#if STM32_PWM_USE_TIM4 #if STM32_PWM_USE_TIM4
if (&PWMD4 == pwmp) { if (&PWMD4 == pwmp) {
nvicDisableVector(TIM4_IRQn); nvicDisableVector(STM32_TIM4_NUMBER);
rccDisableTIM4(FALSE); rccDisableTIM4(FALSE);
} }
#endif #endif
#if STM32_PWM_USE_TIM5 #if STM32_PWM_USE_TIM5
if (&PWMD5 == pwmp) { if (&PWMD5 == pwmp) {
nvicDisableVector(TIM5_IRQn); nvicDisableVector(STM32_TIM5_NUMBER);
rccDisableTIM5(FALSE); rccDisableTIM5(FALSE);
} }
#endif #endif
#if STM32_PWM_USE_TIM8 #if STM32_PWM_USE_TIM8
if (&PWMD8 == pwmp) { if (&PWMD8 == pwmp) {
nvicDisableVector(TIM8_UP_IRQn); nvicDisableVector(STM32_TIM8_UP_NUMBER);
nvicDisableVector(TIM8_CC_IRQn); nvicDisableVector(STM32_TIM8_CC_NUMBER);
rccDisableTIM8(FALSE); rccDisableTIM8(FALSE);
} }
#endif #endif

15
os/hal/platforms/STM32/stm32.h
View File

@ -57,28 +57,13 @@
/* Resolving naming anomalies related to the STM32F1xx sub-family.*/ /* Resolving naming anomalies related to the STM32F1xx sub-family.*/
#define CAN1_TX_IRQn USB_HP_CAN1_TX_IRQn #define CAN1_TX_IRQn USB_HP_CAN1_TX_IRQn
#define CAN1_RX0_IRQn USB_LP_CAN1_RX0_IRQn #define CAN1_RX0_IRQn USB_LP_CAN1_RX0_IRQn
#if defined(STM32F10X_XL)
#define TIM1_UP_IRQn TIM1_UP_TIM16_IRQn
#define TIM8_UP_IRQn TIM8_UP_TIM13_IRQn
#elif defined(STM32F10X_LD_VL) || defined(STM32F10X_MD_VL) || \
defined(STM32F10X_HD_VL)
#define TIM1_UP_IRQn TIM1_UP_TIM16_IRQn
#endif
#elif defined(STM32F2XX) #elif defined(STM32F2XX)
#include "stm32f2xx.h" #include "stm32f2xx.h"
/* Resolving naming anomalies related to the STM32F2xx sub-family.*/
#define TIM1_UP_IRQn TIM1_UP_TIM10_IRQn
#define TIM8_UP_IRQn TIM8_UP_TIM13_IRQn
#elif defined(STM32F4XX) #elif defined(STM32F4XX)
#include "stm32f4xx.h" #include "stm32f4xx.h"
/* Resolving naming anomalies related to the STM32F4xx sub-family.*/
#define TIM1_UP_IRQn TIM1_UP_TIM10_IRQn
#define TIM8_UP_IRQn TIM8_UP_TIM13_IRQn
#elif defined(STM32L1XX_MD) #elif defined(STM32L1XX_MD)
#include "stm32l1xx.h" #include "stm32l1xx.h"

2
os/hal/platforms/STM32F0xx/platform.mk
View File

@ -5,6 +5,8 @@ PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/STM32F0xx/stm32_dma.c \
${CHIBIOS}/os/hal/platforms/STM32F0xx/ext_lld_isr.c \ ${CHIBIOS}/os/hal/platforms/STM32F0xx/ext_lld_isr.c \
${CHIBIOS}/os/hal/platforms/STM32/ext_lld.c \ ${CHIBIOS}/os/hal/platforms/STM32/ext_lld.c \
${CHIBIOS}/os/hal/platforms/STM32/gpt_lld.c \ ${CHIBIOS}/os/hal/platforms/STM32/gpt_lld.c \
${CHIBIOS}/os/hal/platforms/STM32/icu_lld.c \
${CHIBIOS}/os/hal/platforms/STM32/pwm_lld.c \
${CHIBIOS}/os/hal/platforms/STM32/serial_lld.c \ ${CHIBIOS}/os/hal/platforms/STM32/serial_lld.c \
${CHIBIOS}/os/hal/platforms/STM32/spi_lld.c \ ${CHIBIOS}/os/hal/platforms/STM32/spi_lld.c \
${CHIBIOS}/os/hal/platforms/STM32/GPIOv2/pal_lld.c ${CHIBIOS}/os/hal/platforms/STM32/GPIOv2/pal_lld.c