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

hal: stm32: Keep track of latest STM32 RCC API 

RCC API changed in 01/2018 so apply the changes.

Note that ae7a4d40b8 partially fixed the changes in QEI module but some were missing.
So update the other modules too.
This commit is contained in:
Romain Reignier 2018-03-11 22:13:06 +01:00
parent aa8c6cc4af
commit 918149d48d
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
os/hal/ports/STM32/LLD/TIMv1/hal_eicu_lld.c
View File

@ -1057,75 +1057,75 @@ void eicu_lld_stop(EICUDriver *eicup) {
if (&EICUD1 == eicup) { if (&EICUD1 == eicup) {
nvicDisableVector(STM32_TIM1_UP_NUMBER); nvicDisableVector(STM32_TIM1_UP_NUMBER);
nvicDisableVector(STM32_TIM1_CC_NUMBER); nvicDisableVector(STM32_TIM1_CC_NUMBER);
rccDisableTIM1(FALSE); rccDisableTIM1();
} }
#endif #endif
#if STM32_EICU_USE_TIM2 #if STM32_EICU_USE_TIM2
if (&EICUD2 == eicup) { if (&EICUD2 == eicup) {
nvicDisableVector(STM32_TIM2_NUMBER); nvicDisableVector(STM32_TIM2_NUMBER);
rccDisableTIM2(FALSE); rccDisableTIM2();
} }
#endif #endif
#if STM32_EICU_USE_TIM3 #if STM32_EICU_USE_TIM3
if (&EICUD3 == eicup) { if (&EICUD3 == eicup) {
nvicDisableVector(STM32_TIM3_NUMBER); nvicDisableVector(STM32_TIM3_NUMBER);
rccDisableTIM3(FALSE); rccDisableTIM3();
} }
#endif #endif
#if STM32_EICU_USE_TIM4 #if STM32_EICU_USE_TIM4
if (&EICUD4 == eicup) { if (&EICUD4 == eicup) {
nvicDisableVector(STM32_TIM4_NUMBER); nvicDisableVector(STM32_TIM4_NUMBER);
rccDisableTIM4(FALSE); rccDisableTIM4();
} }
#endif #endif
#if STM32_EICU_USE_TIM5 #if STM32_EICU_USE_TIM5
if (&EICUD5 == eicup) { if (&EICUD5 == eicup) {
nvicDisableVector(STM32_TIM5_NUMBER); nvicDisableVector(STM32_TIM5_NUMBER);
rccDisableTIM5(FALSE); rccDisableTIM5();
} }
#endif #endif
#if STM32_EICU_USE_TIM8 #if STM32_EICU_USE_TIM8
if (&EICUD8 == eicup) { if (&EICUD8 == eicup) {
nvicDisableVector(STM32_TIM8_UP_NUMBER); nvicDisableVector(STM32_TIM8_UP_NUMBER);
nvicDisableVector(STM32_TIM8_CC_NUMBER); nvicDisableVector(STM32_TIM8_CC_NUMBER);
rccDisableTIM8(FALSE); rccDisableTIM8();
} }
#endif #endif
#if STM32_EICU_USE_TIM9 #if STM32_EICU_USE_TIM9
if (&EICUD9 == eicup) { if (&EICUD9 == eicup) {
nvicDisableVector(STM32_TIM9_NUMBER); nvicDisableVector(STM32_TIM9_NUMBER);
rccDisableTIM9(FALSE); rccDisableTIM9();
} }
#endif #endif
#if STM32_EICU_USE_TIM12 #if STM32_EICU_USE_TIM12
if (&EICUD12 == eicup) { if (&EICUD12 == eicup) {
nvicDisableVector(STM32_TIM12_NUMBER); nvicDisableVector(STM32_TIM12_NUMBER);
rccDisableTIM12(FALSE); rccDisableTIM12();
} }
#endif #endif
} }
#if STM32_EICU_USE_TIM10 #if STM32_EICU_USE_TIM10
if (&EICUD10 == eicup) { if (&EICUD10 == eicup) {
nvicDisableVector(STM32_TIM10_NUMBER); nvicDisableVector(STM32_TIM10_NUMBER);
rccDisableTIM10(FALSE); rccDisableTIM10();
} }
#endif #endif
#if STM32_EICU_USE_TIM11 #if STM32_EICU_USE_TIM11
if (&EICUD11 == eicup) { if (&EICUD11 == eicup) {
nvicDisableVector(STM32_TIM11_NUMBER); nvicDisableVector(STM32_TIM11_NUMBER);
rccDisableTIM11(FALSE); rccDisableTIM11();
} }
#endif #endif
#if STM32_EICU_USE_TIM13 #if STM32_EICU_USE_TIM13
if (&EICUD13 == eicup) { if (&EICUD13 == eicup) {
nvicDisableVector(STM32_TIM13_NUMBER); nvicDisableVector(STM32_TIM13_NUMBER);
rccDisableTIM13(FALSE); rccDisableTIM13();
} }
#endif #endif
#if STM32_EICU_USE_TIM14 #if STM32_EICU_USE_TIM14
if (&EICUD14 == eicup) { if (&EICUD14 == eicup) {
nvicDisableVector(STM32_TIM14_NUMBER); nvicDisableVector(STM32_TIM14_NUMBER);
rccDisableTIM14(FALSE); rccDisableTIM14();
} }
#endif #endif
} }

12
os/hal/ports/STM32/LLD/TIMv1/hal_qei_lld.c
View File

@ -157,38 +157,38 @@ void qei_lld_start(QEIDriver *qeip) {
/* Clock activation and timer reset.*/ /* Clock activation and timer reset.*/
#if STM32_QEI_USE_TIM1 #if STM32_QEI_USE_TIM1
if (&QEID1 == qeip) { if (&QEID1 == qeip) {
rccEnableTIM1(); rccEnableTIM1(FALSE);
rccResetTIM1(); rccResetTIM1();
} }
#endif #endif
#if STM32_QEI_USE_TIM2 #if STM32_QEI_USE_TIM2
if (&QEID2 == qeip) { if (&QEID2 == qeip) {
rccEnableTIM2(); rccEnableTIM2(FALSE);
rccResetTIM2(); rccResetTIM2();
} }
#endif #endif
#if STM32_QEI_USE_TIM3 #if STM32_QEI_USE_TIM3
if (&QEID3 == qeip) { if (&QEID3 == qeip) {
rccEnableTIM3(); rccEnableTIM3(FALSE);
rccResetTIM3(); rccResetTIM3();
} }
#endif #endif
#if STM32_QEI_USE_TIM4 #if STM32_QEI_USE_TIM4
if (&QEID4 == qeip) { if (&QEID4 == qeip) {
rccEnableTIM4(); rccEnableTIM4(FALSE);
rccResetTIM4(); rccResetTIM4();
} }
#endif #endif
#if STM32_QEI_USE_TIM5 #if STM32_QEI_USE_TIM5
if (&QEID5 == qeip) { if (&QEID5 == qeip) {
rccEnableTIM5(); rccEnableTIM5(FALSE);
rccResetTIM5(); rccResetTIM5();
} }
#endif #endif
#if STM32_QEI_USE_TIM8 #if STM32_QEI_USE_TIM8
if (&QEID8 == qeip) { if (&QEID8 == qeip) {
rccEnableTIM8(); rccEnableTIM8(FALSE);
rccResetTIM8(); rccResetTIM8();
} }
#endif #endif

14
os/hal/ports/STM32/LLD/TIMv1/hal_timcap_lld.c
View File

@ -713,44 +713,44 @@ void timcap_lld_stop(TIMCAPDriver *timcapp) {
if (&TIMCAPD1 == timcapp) { if (&TIMCAPD1 == timcapp) {
nvicDisableVector(STM32_TIM1_UP_NUMBER); nvicDisableVector(STM32_TIM1_UP_NUMBER);
nvicDisableVector(STM32_TIM1_CC_NUMBER); nvicDisableVector(STM32_TIM1_CC_NUMBER);
rccDisableTIM1(FALSE); rccDisableTIM1();
} }
#endif #endif
#if STM32_TIMCAP_USE_TIM2 #if STM32_TIMCAP_USE_TIM2
if (&TIMCAPD2 == timcapp) { if (&TIMCAPD2 == timcapp) {
nvicDisableVector(STM32_TIM2_NUMBER); nvicDisableVector(STM32_TIM2_NUMBER);
rccDisableTIM2(FALSE); rccDisableTIM2();
} }
#endif #endif
#if STM32_TIMCAP_USE_TIM3 #if STM32_TIMCAP_USE_TIM3
if (&TIMCAPD3 == timcapp) { if (&TIMCAPD3 == timcapp) {
nvicDisableVector(STM32_TIM3_NUMBER); nvicDisableVector(STM32_TIM3_NUMBER);
rccDisableTIM3(FALSE); rccDisableTIM3();
} }
#endif #endif
#if STM32_TIMCAP_USE_TIM4 #if STM32_TIMCAP_USE_TIM4
if (&TIMCAPD4 == timcapp) { if (&TIMCAPD4 == timcapp) {
nvicDisableVector(STM32_TIM4_NUMBER); nvicDisableVector(STM32_TIM4_NUMBER);
rccDisableTIM4(FALSE); rccDisableTIM4();
} }
#endif #endif
#if STM32_TIMCAP_USE_TIM5 #if STM32_TIMCAP_USE_TIM5
if (&TIMCAPD5 == timcapp) { if (&TIMCAPD5 == timcapp) {
nvicDisableVector(STM32_TIM5_NUMBER); nvicDisableVector(STM32_TIM5_NUMBER);
rccDisableTIM5(FALSE); rccDisableTIM5();
} }
#endif #endif
#if STM32_TIMCAP_USE_TIM8 #if STM32_TIMCAP_USE_TIM8
if (&TIMCAPD8 == timcapp) { if (&TIMCAPD8 == timcapp) {
nvicDisableVector(STM32_TIM8_UP_NUMBER); nvicDisableVector(STM32_TIM8_UP_NUMBER);
nvicDisableVector(STM32_TIM8_CC_NUMBER); nvicDisableVector(STM32_TIM8_CC_NUMBER);
rccDisableTIM8(FALSE); rccDisableTIM8();
} }
#endif #endif
#if STM32_TIMCAP_USE_TIM9 #if STM32_TIMCAP_USE_TIM9
if (&TIMCAPD9 == timcapp) { if (&TIMCAPD9 == timcapp) {
nvicDisableVector(STM32_TIM9_NUMBER); nvicDisableVector(STM32_TIM9_NUMBER);
rccDisableTIM9(FALSE); rccDisableTIM9();
} }
#endif #endif
} }