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

Fixed bug #448. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6580 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2013-12-27 10:00:39 +00:00
parent c5c7e44f8c
commit 6d966b1a55
4 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
os/hal/platforms/STM32/TIMv1/gpt_lld.c
View File

@ -488,7 +488,11 @@ void gpt_lld_start(GPTDriver *gptp) {
rccResetTIM1(); rccResetTIM1();
nvicEnableVector(STM32_TIM1_UP_NUMBER, nvicEnableVector(STM32_TIM1_UP_NUMBER,
CORTEX_PRIORITY_MASK(STM32_GPT_TIM1_IRQ_PRIORITY)); CORTEX_PRIORITY_MASK(STM32_GPT_TIM1_IRQ_PRIORITY));
#if defined(STM32_TIM1CLK)
gptp->clock = STM32_TIM1CLK;
#else
gptp->clock = STM32_TIMCLK2; gptp->clock = STM32_TIMCLK2;
#endif
} }
#endif #endif
#if STM32_GPT_USE_TIM2 #if STM32_GPT_USE_TIM2
@ -555,7 +559,11 @@ void gpt_lld_start(GPTDriver *gptp) {
rccResetTIM8(); rccResetTIM8();
nvicEnableVector(STM32_TIM8_UP_NUMBER, nvicEnableVector(STM32_TIM8_UP_NUMBER,
CORTEX_PRIORITY_MASK(STM32_GPT_TIM8_IRQ_PRIORITY)); CORTEX_PRIORITY_MASK(STM32_GPT_TIM8_IRQ_PRIORITY));
#if defined(STM32_TIM8CLK)
gptp->clock = STM32_TIM8CLK;
#else
gptp->clock = STM32_TIMCLK2; gptp->clock = STM32_TIMCLK2;
#endif
} }
#endif #endif

8
os/hal/platforms/STM32/TIMv1/icu_lld.c
View File

@ -405,7 +405,11 @@ void icu_lld_start(ICUDriver *icup) {
CORTEX_PRIORITY_MASK(STM32_ICU_TIM1_IRQ_PRIORITY)); CORTEX_PRIORITY_MASK(STM32_ICU_TIM1_IRQ_PRIORITY));
nvicEnableVector(STM32_TIM1_CC_NUMBER, nvicEnableVector(STM32_TIM1_CC_NUMBER,
CORTEX_PRIORITY_MASK(STM32_ICU_TIM1_IRQ_PRIORITY)); CORTEX_PRIORITY_MASK(STM32_ICU_TIM1_IRQ_PRIORITY));
#if defined(STM32_TIM1CLK)
icup->clock = STM32_TIM1CLK;
#else
icup->clock = STM32_TIMCLK2; icup->clock = STM32_TIMCLK2;
#endif
} }
#endif #endif
#if STM32_ICU_USE_TIM2 #if STM32_ICU_USE_TIM2
@ -452,7 +456,11 @@ void icu_lld_start(ICUDriver *icup) {
CORTEX_PRIORITY_MASK(STM32_ICU_TIM8_IRQ_PRIORITY)); CORTEX_PRIORITY_MASK(STM32_ICU_TIM8_IRQ_PRIORITY));
nvicEnableVector(STM32_TIM8_CC_NUMBER, nvicEnableVector(STM32_TIM8_CC_NUMBER,
CORTEX_PRIORITY_MASK(STM32_ICU_TIM8_IRQ_PRIORITY)); CORTEX_PRIORITY_MASK(STM32_ICU_TIM8_IRQ_PRIORITY));
#if defined(STM32_TIM8CLK)
icup->clock = STM32_TIM8CLK;
#else
icup->clock = STM32_TIMCLK2; icup->clock = STM32_TIMCLK2;
#endif
} }
#endif #endif
#if STM32_ICU_USE_TIM9 #if STM32_ICU_USE_TIM9

8
os/hal/platforms/STM32/TIMv1/pwm_lld.c
View File

@ -410,7 +410,11 @@ void pwm_lld_start(PWMDriver *pwmp) {
CORTEX_PRIORITY_MASK(STM32_PWM_TIM1_IRQ_PRIORITY)); CORTEX_PRIORITY_MASK(STM32_PWM_TIM1_IRQ_PRIORITY));
nvicEnableVector(STM32_TIM1_CC_NUMBER, nvicEnableVector(STM32_TIM1_CC_NUMBER,
CORTEX_PRIORITY_MASK(STM32_PWM_TIM1_IRQ_PRIORITY)); CORTEX_PRIORITY_MASK(STM32_PWM_TIM1_IRQ_PRIORITY));
#if defined(STM32_TIM1CLK)
pwmp->clock = STM32_TIM1CLK;
#else
pwmp->clock = STM32_TIMCLK2; pwmp->clock = STM32_TIMCLK2;
#endif
} }
#endif #endif
#if STM32_PWM_USE_TIM2 #if STM32_PWM_USE_TIM2
@ -458,7 +462,11 @@ void pwm_lld_start(PWMDriver *pwmp) {
CORTEX_PRIORITY_MASK(STM32_PWM_TIM8_IRQ_PRIORITY)); CORTEX_PRIORITY_MASK(STM32_PWM_TIM8_IRQ_PRIORITY));
nvicEnableVector(STM32_TIM8_CC_NUMBER, nvicEnableVector(STM32_TIM8_CC_NUMBER,
CORTEX_PRIORITY_MASK(STM32_PWM_TIM8_IRQ_PRIORITY)); CORTEX_PRIORITY_MASK(STM32_PWM_TIM8_IRQ_PRIORITY));
#if defined(STM32_TIM8CLK)
pwmp->clock = STM32_TIM8CLK;
#else
pwmp->clock = STM32_TIMCLK2; pwmp->clock = STM32_TIMCLK2;
#endif
} }
#endif #endif
#if STM32_PWM_USE_TIM9 #if STM32_PWM_USE_TIM9

4
readme.txt
View File

@ -89,7 +89,9 @@
***************************************************************************** *****************************************************************************
*** 2.7.0 *** *** 2.7.0 ***
- FIX: Fixed rong MCO2 check in STM32F4xx HAL driver (bug #447)(backported - FIX: Fixed STM32F30x TIM1/TIM8 alternate clock source setting not
recognized (bug #448)(backported to 2.6.2).
- FIX: Fixed wrong MCO2 check in STM32F4xx HAL driver (bug #447)(backported
to 2.4.6 and 2.6.2). to 2.4.6 and 2.6.2).
- FIX: Fixed spurious half buffer callback in STM32 ADC drivers (bug #446) - FIX: Fixed spurious half buffer callback in STM32 ADC drivers (bug #446)
(backported to 2.4.6 and 2.6.2). (backported to 2.4.6 and 2.6.2).