zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug #588. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7931 35acf78f-673a-0410-8e92-d51de3d6d3f4
master
Giovanni Di Sirio 2015-04-26 17:42:55 +00:00
parent ac0e817fb9
commit 86ac7d3e37
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
os/hal/ports/STM32/STM32F3xx/ext_lld_isr.c
View File

@ -226,7 +226,7 @@ OSAL_IRQ_HANDLER(VectorE4) {
} }
#endif #endif
#if !defined(STM32_DISABLE_EXTI18_HANDLER) #if !defined(STM32_DISABLE_EXTI18_HANDLER) && STM32_HAS_USB
/** /**
* @brief EXTI[18] interrupt handler (USB Wakeup). * @brief EXTI[18] interrupt handler (USB Wakeup).
* *
@ -365,7 +365,9 @@ void ext_lld_exti_irq_enable(void) {
nvicEnableVector(EXTI15_10_IRQn, STM32_EXT_EXTI10_15_IRQ_PRIORITY); nvicEnableVector(EXTI15_10_IRQn, STM32_EXT_EXTI10_15_IRQ_PRIORITY);
nvicEnableVector(PVD_IRQn, STM32_EXT_EXTI16_IRQ_PRIORITY); nvicEnableVector(PVD_IRQn, STM32_EXT_EXTI16_IRQ_PRIORITY);
nvicEnableVector(RTC_Alarm_IRQn, STM32_EXT_EXTI17_IRQ_PRIORITY); nvicEnableVector(RTC_Alarm_IRQn, STM32_EXT_EXTI17_IRQ_PRIORITY);
#if STM32_HAS_USB
nvicEnableVector(USBWakeUp_IRQn, STM32_EXT_EXTI18_IRQ_PRIORITY); nvicEnableVector(USBWakeUp_IRQn, STM32_EXT_EXTI18_IRQ_PRIORITY);
#endif
nvicEnableVector(TAMP_STAMP_IRQn, STM32_EXT_EXTI19_IRQ_PRIORITY); nvicEnableVector(TAMP_STAMP_IRQn, STM32_EXT_EXTI19_IRQ_PRIORITY);
nvicEnableVector(RTC_WKUP_IRQn, STM32_EXT_EXTI20_IRQ_PRIORITY); nvicEnableVector(RTC_WKUP_IRQn, STM32_EXT_EXTI20_IRQ_PRIORITY);
nvicEnableVector(COMP1_2_3_IRQn, STM32_EXT_EXTI21_22_29_IRQ_PRIORITY); nvicEnableVector(COMP1_2_3_IRQn, STM32_EXT_EXTI21_22_29_IRQ_PRIORITY);
@ -391,7 +393,9 @@ void ext_lld_exti_irq_disable(void) {
nvicDisableVector(EXTI15_10_IRQn); nvicDisableVector(EXTI15_10_IRQn);
nvicDisableVector(PVD_IRQn); nvicDisableVector(PVD_IRQn);
nvicDisableVector(RTC_Alarm_IRQn); nvicDisableVector(RTC_Alarm_IRQn);
#if STM32_HAS_USB
nvicDisableVector(USBWakeUp_IRQn); nvicDisableVector(USBWakeUp_IRQn);
#endif
nvicDisableVector(TAMP_STAMP_IRQn); nvicDisableVector(TAMP_STAMP_IRQn);
nvicDisableVector(RTC_WKUP_IRQn); nvicDisableVector(RTC_WKUP_IRQn);
nvicDisableVector(COMP1_2_3_IRQn); nvicDisableVector(COMP1_2_3_IRQn);

1
readme.txt
View File

@ -74,6 +74,7 @@
***************************************************************************** *****************************************************************************
*** 3.0.0p4 *** *** 3.0.0p4 ***
- HAL: Fixed STM32F334 does not have an EXT18 interrupt (bug #588).
- HAL: Fixed wrong vector number for STM32L1xx USB (bug #586). - HAL: Fixed wrong vector number for STM32L1xx USB (bug #586).
- HAL: Fixed spurious TC interrupt in STM32 UART (v1 and v2) driver (bug #584). - HAL: Fixed spurious TC interrupt in STM32 UART (v1 and v2) driver (bug #584).
- HAL: Fixed invalid checks on STM32L1xx LSI and LSE clocks (bug #583). - HAL: Fixed invalid checks on STM32L1xx LSI and LSE clocks (bug #583).