aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2015-04-26 17:42:55 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2015-04-26 17:42:55 +0000
commit86ac7d3e373171df529b1d182896fd637514e3de (patch)
tree6cdb4fbd6ea169041eda0547a8aeca8372f2608d /os/hal
parentac0e817fb9b2ede002fe5198181eeaabe4e79665 (diff)
downloadChibiOS-86ac7d3e373171df529b1d182896fd637514e3de.tar.gz
ChibiOS-86ac7d3e373171df529b1d182896fd637514e3de.tar.bz2
ChibiOS-86ac7d3e373171df529b1d182896fd637514e3de.zip
Fixed bug #588.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7931 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal')
-rw-r--r--os/hal/ports/STM32/STM32F3xx/ext_lld_isr.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/os/hal/ports/STM32/STM32F3xx/ext_lld_isr.c b/os/hal/ports/STM32/STM32F3xx/ext_lld_isr.c
index f540b0e94..7d5e38cff 100644
--- a/os/hal/ports/STM32/STM32F3xx/ext_lld_isr.c
+++ b/os/hal/ports/STM32/STM32F3xx/ext_lld_isr.c
@@ -226,7 +226,7 @@ OSAL_IRQ_HANDLER(VectorE4) {
}
#endif
-#if !defined(STM32_DISABLE_EXTI18_HANDLER)
+#if !defined(STM32_DISABLE_EXTI18_HANDLER) && STM32_HAS_USB
/**
* @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(PVD_IRQn, STM32_EXT_EXTI16_IRQ_PRIORITY);
nvicEnableVector(RTC_Alarm_IRQn, STM32_EXT_EXTI17_IRQ_PRIORITY);
+#if STM32_HAS_USB
nvicEnableVector(USBWakeUp_IRQn, STM32_EXT_EXTI18_IRQ_PRIORITY);
+#endif
nvicEnableVector(TAMP_STAMP_IRQn, STM32_EXT_EXTI19_IRQ_PRIORITY);
nvicEnableVector(RTC_WKUP_IRQn, STM32_EXT_EXTI20_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(PVD_IRQn);
nvicDisableVector(RTC_Alarm_IRQn);
+#if STM32_HAS_USB
nvicDisableVector(USBWakeUp_IRQn);
+#endif
nvicDisableVector(TAMP_STAMP_IRQn);
nvicDisableVector(RTC_WKUP_IRQn);
nvicDisableVector(COMP1_2_3_IRQn);