Adjustments to the EXT driver, not yet finished. Moved all STM32 drivers in private subdirectories.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8119 35acf78f-673a-0410-8e92-d51de3d6d3f4

3 files changed, 82 insertions, 34 deletions

diff --git a/os/hal/ports/STM32/STM32L1xx/ext_lld_isr.c b/os/hal/ports/STM32/STM32L1xx/ext_lld_isr.c
index 9292fb603..148883fcf 100644
--- a/os/hal/ports/STM32/STM32L1xx/ext_lld_isr.c
+++ b/os/hal/ports/STM32/STM32L1xx/ext_lld_isr.c
@@ -54,11 +54,14 @@
  * @isr

  */

 OSAL_IRQ_HANDLER(Vector58) {

+  uint32_t pr;

 

   OSAL_IRQ_PROLOGUE();

 

-  EXTI->PR = (1 << 0);

-  EXTD1.config->channels[0].cb(&EXTD1, 0);

+  pr = EXTI->PR & EXTI->IMR & (1 << 0);

+  EXTI->PR = pr;

+  if (pr & (1 << 0))

+    EXTD1.config->channels[0].cb(&EXTD1, 0);

 

   OSAL_IRQ_EPILOGUE();

 }

@@ -69,11 +72,14 @@ OSAL_IRQ_HANDLER(Vector58) {
  * @isr

  */

 OSAL_IRQ_HANDLER(Vector5C) {

+  uint32_t pr;

 

   OSAL_IRQ_PROLOGUE();

 

-  EXTI->PR = (1 << 1);

-  EXTD1.config->channels[1].cb(&EXTD1, 1);

+  pr = EXTI->PR & EXTI->IMR & (1 << 1);

+  EXTI->PR = pr;

+  if (pr & (1 << 1))

+    EXTD1.config->channels[1].cb(&EXTD1, 1);

 

   OSAL_IRQ_EPILOGUE();

 }

@@ -84,11 +90,14 @@ OSAL_IRQ_HANDLER(Vector5C) {
  * @isr

  */

 OSAL_IRQ_HANDLER(Vector60) {

+  uint32_t pr;

 

   OSAL_IRQ_PROLOGUE();

 

-  EXTI->PR = (1 << 2);

-  EXTD1.config->channels[2].cb(&EXTD1, 2);

+  pr = EXTI->PR & EXTI->IMR & (1 << 2);

+  EXTI->PR = pr;

+  if (pr & (1 << 2))

+    EXTD1.config->channels[2].cb(&EXTD1, 2);

 

   OSAL_IRQ_EPILOGUE();

 }

@@ -99,11 +108,14 @@ OSAL_IRQ_HANDLER(Vector60) {
  * @isr

  */

 OSAL_IRQ_HANDLER(Vector64) {

+  uint32_t pr;

 

   OSAL_IRQ_PROLOGUE();

 

-  EXTI->PR = (1 << 3);

-  EXTD1.config->channels[3].cb(&EXTD1, 3);

+  pr = EXTI->PR & EXTI->IMR & (1 << 3);

+  EXTI->PR = pr;

+  if (pr & (1 << 3))

+    EXTD1.config->channels[3].cb(&EXTD1, 3);

 

   OSAL_IRQ_EPILOGUE();

 }

@@ -114,11 +126,14 @@ OSAL_IRQ_HANDLER(Vector64) {
  * @isr

  */

 OSAL_IRQ_HANDLER(Vector68) {

+  uint32_t pr;

 

   OSAL_IRQ_PROLOGUE();

 

-  EXTI->PR = (1 << 4);

-  EXTD1.config->channels[4].cb(&EXTD1, 4);

+  pr = EXTI->PR & EXTI->IMR & (1 << 4);

+  EXTI->PR = pr;

+  if (pr & (1 << 4))

+    EXTD1.config->channels[4].cb(&EXTD1, 4);

 

   OSAL_IRQ_EPILOGUE();

 }

@@ -133,7 +148,8 @@ OSAL_IRQ_HANDLER(Vector9C) {
 

   OSAL_IRQ_PROLOGUE();

 

-  pr = EXTI->PR & ((1 << 5) | (1 << 6) | (1 << 7) | (1 << 8) | (1 << 9));

+  pr = EXTI->PR & EXTI->IMR & ((1 << 5) | (1 << 6) | (1 << 7) | (1 << 8) |

+                               (1 << 9));

   EXTI->PR = pr;

   if (pr & (1 << 5))

     EXTD1.config->channels[5].cb(&EXTD1, 5);

@@ -159,8 +175,8 @@ OSAL_IRQ_HANDLER(VectorE0) {
 

   OSAL_IRQ_PROLOGUE();

 

-  pr = EXTI->PR & ((1 << 10) | (1 << 11) | (1 << 12) | (1 << 13) | (1 << 14) |

-                   (1 << 15));

+  pr = EXTI->PR & EXTI->IMR & ((1 << 10) | (1 << 11) | (1 << 12) | (1 << 13) |

+                               (1 << 14) | (1 << 15));

   EXTI->PR = pr;

   if (pr & (1 << 10))

     EXTD1.config->channels[10].cb(&EXTD1, 10);

@@ -184,11 +200,14 @@ OSAL_IRQ_HANDLER(VectorE0) {
  * @isr

  */

 OSAL_IRQ_HANDLER(Vector44) {

+  uint32_t pr;

 

   OSAL_IRQ_PROLOGUE();

 

-  EXTI->PR = (1 << 16);

-  EXTD1.config->channels[16].cb(&EXTD1, 16);

+  pr = EXTI->PR & EXTI->IMR & (1 << 16);

+  EXTI->PR = pr;

+  if (pr & (1 << 16))

+    EXTD1.config->channels[16].cb(&EXTD1, 16);

 

   OSAL_IRQ_EPILOGUE();

 }

@@ -199,11 +218,13 @@ OSAL_IRQ_HANDLER(Vector44) {
  * @isr

  */

 OSAL_IRQ_HANDLER(VectorE4) {

+  uint32_t pr;

 

   OSAL_IRQ_PROLOGUE();

-

-  EXTI->PR = (1 << 17);

-  EXTD1.config->channels[17].cb(&EXTD1, 17);

+  pr = EXTI->PR & EXTI->IMR & (1 << 17);

+  EXTI->PR = pr;

+  if (pr & (1 << 17))

+    EXTD1.config->channels[17].cb(&EXTD1, 17);

 

   OSAL_IRQ_EPILOGUE();

 }

@@ -213,11 +234,13 @@ OSAL_IRQ_HANDLER(VectorE4) {
  * @isr

  */

 OSAL_IRQ_HANDLER(VectorE8) {

+  uint32_t pr;

 

   OSAL_IRQ_PROLOGUE();

-

-  EXTI->PR = (1 << 18);

-  EXTD1.config->channels[18].cb(&EXTD1, 18);

+  pr = EXTI->PR & EXTI->IMR & (1 << 18);

+  EXTI->PR = pr;

+  if (pr & (1 << 18))

+    EXTD1.config->channels[18].cb(&EXTD1, 18);

 

   OSAL_IRQ_EPILOGUE();

 }

@@ -228,11 +251,13 @@ OSAL_IRQ_HANDLER(VectorE8) {
  * @isr

  */

 OSAL_IRQ_HANDLER(Vector48) {

+  uint32_t pr;

 

   OSAL_IRQ_PROLOGUE();

-

-  EXTI->PR = (1 << 19);

-  EXTD1.config->channels[19].cb(&EXTD1, 19);

+  pr = EXTI->PR & EXTI->IMR & (1 << 19);

+  EXTI->PR = pr;

+  if (pr & (1 << 19))

+    EXTD1.config->channels[19].cb(&EXTD1, 19);

 

   OSAL_IRQ_EPILOGUE();

 }

@@ -243,11 +268,13 @@ OSAL_IRQ_HANDLER(Vector48) {
  * @isr

  */

 OSAL_IRQ_HANDLER(Vector4C) {

+  uint32_t pr;

 

   OSAL_IRQ_PROLOGUE();

-

-  EXTI->PR = (1 << 20);

-  EXTD1.config->channels[20].cb(&EXTD1, 20);

+  pr = EXTI->PR & EXTI->IMR & (1 << 20);

+  EXTI->PR = pr;

+  if (pr & (1 << 20))

+    EXTD1.config->channels[20].cb(&EXTD1, 20);

 

   OSAL_IRQ_EPILOGUE();

 }

@@ -262,7 +289,7 @@ OSAL_IRQ_HANDLER(Vector98) {
 

   OSAL_IRQ_PROLOGUE();

 

-  pr = EXTI->PR & ((1 << 21) | (1 << 22));

+  pr = EXTI->PR & EXTI->IMR & ((1 << 21) | (1 << 22));

   EXTI->PR = pr;

   if (pr & (1 << 21))

     EXTD1.config->channels[21].cb(&EXTD1, 21);

@@ -272,6 +299,25 @@ OSAL_IRQ_HANDLER(Vector98) {
   OSAL_IRQ_EPILOGUE();

 }

 

+#if (STM32_EXTI_NUM_LINES > 23) || defined(__DOXYGEN__)

+/**

+ * @brief   EXTI[23] interrupt handler (Channel Acquisition).

+ *

+ * @isr

+ */

+OSAL_IRQ_HANDLER(Vector120) {

+  uint32_t pr;

+

+  OSAL_IRQ_PROLOGUE();

+  pr = EXTI->PR & EXTI->IMR & (1 << 23);

+  EXTI->PR = pr;

+  if (pr & (1 << 23))

+    EXTD1.config->channels[23].cb(&EXTD1, 23);

+

+  OSAL_IRQ_EPILOGUE();

+}

+#endif

+

 /*===========================================================================*/

 /* Driver exported functions.                                                */

 /*===========================================================================*/

diff --git a/os/hal/ports/STM32/STM32L1xx/platform.mk b/os/hal/ports/STM32/STM32L1xx/platform.mk
index 6f8e8d053..673edb3b0 100644
--- a/os/hal/ports/STM32/STM32L1xx/platform.mk
+++ b/os/hal/ports/STM32/STM32L1xx/platform.mk
@@ -10,8 +10,8 @@ ifneq ($(findstring HAL_USE_ADC TRUE,$(HALCONF)),)
 PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/adc_lld.c

 endif

 ifneq ($(findstring HAL_USE_EXT TRUE,$(HALCONF)),)

-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/ext_lld_isr.c \

-               $(CHIBIOS)/os/hal/ports/STM32/LLD/ext_lld.c

+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/EXTIv1/ext_lld.c \

+               $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/ext_lld_isr.c

 endif

 ifneq ($(findstring HAL_USE_DAC TRUE,$(HALCONF)),)

 PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/DACv1/dac_lld.c

@@ -52,7 +52,7 @@ PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \
                $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/hal_lld.c \

                $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/adc_lld.c \

                $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/ext_lld_isr.c \

-               $(CHIBIOS)/os/hal/ports/STM32/LLD/ext_lld.c \

+               $(CHIBIOS)/os/hal/ports/STM32/LLD/EXTIv1/ext_lld.c \

                $(CHIBIOS)/os/hal/ports/STM32/LLD/DACv1/dac_lld.c \

                $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c \

                $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv1/i2c_lld.c \

@@ -70,7 +70,7 @@ endif
 # Required include directories

 PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \

                $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx \

-               $(CHIBIOS)/os/hal/ports/STM32/LLD \

+               $(CHIBIOS)/os/hal/ports/STM32/LLD/EXTIv1 \

                $(CHIBIOS)/os/hal/ports/STM32/LLD/DACv1 \

                $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv2 \

                $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv1 \

diff --git a/os/hal/ports/STM32/STM32L1xx/stm32_registry.h b/os/hal/ports/STM32/STM32L1xx/stm32_registry.h
index 53833f657..dd84ad6b6 100644
--- a/os/hal/ports/STM32/STM32L1xx/stm32_registry.h
+++ b/os/hal/ports/STM32/STM32L1xx/stm32_registry.h
@@ -65,7 +65,8 @@
 #define STM32_HAS_ETH                       FALSE

 

 /* EXTI attributes.*/

-#define STM32_EXTI_NUM_CHANNELS             23

+#define STM32_EXTI_NUM_LINES                23

+#define STM32_EXTI_IMR_MASK                 0xFF800000U

 

 /* GPIO attributes.*/

 #define STM32_HAS_GPIOA                     TRUE

@@ -245,7 +246,8 @@
 #define STM32_HAS_ETH                       FALSE

 

 /* EXTI attributes.*/

-#define STM32_EXTI_NUM_CHANNELS             24

+#define STM32_EXTI_NUM_LINES                24

+#define STM32_EXTI_IMR_MASK                 0xFF000000U

 

 /* GPIO attributes.*/

 #define STM32_HAS_GPIOA                     TRUE