From 5bda88234e2c8e69037ddef4d8dfdf8cdf4c5e97 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Tue, 12 Mar 2013 13:15:12 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5417
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/hal/platforms/STM32/ext_lld.c         |  2 +-
 os/hal/platforms/STM32F37x/ext_lld_isr.c | 10 ++++------
 os/hal/platforms/STM32F37x/ext_lld_isr.h |  2 +-
 os/hal/platforms/STM32F37x/platform.mk   |  1 +
 4 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'os')

diff --git a/os/hal/platforms/STM32/ext_lld.c b/os/hal/platforms/STM32/ext_lld.c
index e9e6622b9..60acd71b3 100644
--- a/os/hal/platforms/STM32/ext_lld.c
+++ b/os/hal/platforms/STM32/ext_lld.c
@@ -180,7 +180,7 @@ void ext_lld_channel_enable(EXTDriver *extp, expchannel_t channel) {
                      EXT_MODE_GPIO_OFF) << ((channel & 3) * 4);
 
 #if defined(STM32L1XX_MD) || defined(STM32F0XX) || defined(STM32F2XX) ||    \
-    defined(STM32F30X) || defined(STM32F4XX)
+    defined(STM32F30X) || defined(STM32F37X) || defined(STM32F4XX)
   SYSCFG->EXTICR[n] = (SYSCFG->EXTICR[n] & mask) | port;
 #else /* STM32F1XX */
   AFIO->EXTICR[n] = (AFIO->EXTICR[n] & mask) | port;
diff --git a/os/hal/platforms/STM32F37x/ext_lld_isr.c b/os/hal/platforms/STM32F37x/ext_lld_isr.c
index 22ea42b6b..6bcb7345d 100644
--- a/os/hal/platforms/STM32F37x/ext_lld_isr.c
+++ b/os/hal/platforms/STM32F37x/ext_lld_isr.c
@@ -293,14 +293,12 @@ CH_IRQ_HANDLER(Vector140) {
 
   CH_IRQ_PROLOGUE();
 
-  pr = EXTI->PR & ((1 << 21) | (1 << 22) | (1 << 23));
+  pr = EXTI->PR & ((1 << 21) | (1 << 22));
   EXTI->PR = pr;
   if (pr & (1 << 21))
     EXTD1.config->channels[21].cb(&EXTD1, 21);
   if (pr & (1 << 22))
     EXTD1.config->channels[22].cb(&EXTD1, 22);
-  if (pr & (1 << 23))
-    EXTD1.config->channels[23].cb(&EXTD1, 23);
 
   CH_IRQ_EPILOGUE();
 }
@@ -341,8 +339,8 @@ void ext_lld_exti_irq_enable(void) {
                    CORTEX_PRIORITY_MASK(STM32_EXT_EXTI19_IRQ_PRIORITY));
   nvicEnableVector(RTC_WKUP_IRQn,
                    CORTEX_PRIORITY_MASK(STM32_EXT_EXTI20_IRQ_PRIORITY));
-  nvicEnableVector(COMP1_2_3_IRQn,
-                   CORTEX_PRIORITY_MASK(STM32_EXT_EXTI21_22_29_IRQ_PRIORITY));
+  nvicEnableVector(COMP_IRQn,
+                   CORTEX_PRIORITY_MASK(STM32_EXT_EXTI21_22_IRQ_PRIORITY));
 }
 
 /**
@@ -364,7 +362,7 @@ void ext_lld_exti_irq_disable(void) {
   nvicDisableVector(USBWakeUp_IRQn);
   nvicDisableVector(TAMPER_STAMP_IRQn);
   nvicDisableVector(RTC_WKUP_IRQn);
-  nvicDisableVector(COMP1_2_3_IRQn);
+  nvicDisableVector(COMP_IRQn);
 }
 
 #endif /* HAL_USE_EXT */
diff --git a/os/hal/platforms/STM32F37x/ext_lld_isr.h b/os/hal/platforms/STM32F37x/ext_lld_isr.h
index fd8486503..1e545875b 100644
--- a/os/hal/platforms/STM32F37x/ext_lld_isr.h
+++ b/os/hal/platforms/STM32F37x/ext_lld_isr.h
@@ -131,7 +131,7 @@
  * @brief   EXTI21..22 interrupt priority level setting.
  */
 #if !defined(STM32_EXT_EXTI21_22_IRQ_PRIORITY) || defined(__DOXYGEN__)
-#define STM32_EXT_EXTI21_22_IRQ_PRIORITY 6
+#define STM32_EXT_EXTI21_22_IRQ_PRIORITY    6
 #endif
 /** @} */
 
diff --git a/os/hal/platforms/STM32F37x/platform.mk b/os/hal/platforms/STM32F37x/platform.mk
index 9838c6e87..9475796a0 100644
--- a/os/hal/platforms/STM32F37x/platform.mk
+++ b/os/hal/platforms/STM32F37x/platform.mk
@@ -3,6 +3,7 @@ PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/STM32F37x/stm32_dma.c \
               ${CHIBIOS}/os/hal/platforms/STM32F37x/hal_lld.c \
               ${CHIBIOS}/os/hal/platforms/STM32F37x/ext_lld_isr.c \
               ${CHIBIOS}/os/hal/platforms/STM32/can_lld.c \
+              ${CHIBIOS}/os/hal/platforms/STM32/ext_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 \
-- 
cgit v1.2.3