Fixed bug #711.

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

1 files changed, 35 insertions, 16 deletions

diff --git a/os/hal/ports/STM32/STM32L1xx/ext_lld_isr.c b/os/hal/ports/STM32/STM32L1xx/ext_lld_isr.c
index f457bacfd..fcf7959e2 100644
--- a/os/hal/ports/STM32/STM32L1xx/ext_lld_isr.c
+++ b/os/hal/ports/STM32/STM32L1xx/ext_lld_isr.c
@@ -58,7 +58,8 @@ OSAL_IRQ_HANDLER(Vector58) {
 

   OSAL_IRQ_PROLOGUE();

 

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

+  pr = EXTI->PR;

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

   EXTI->PR = pr;

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

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

@@ -76,7 +77,8 @@ OSAL_IRQ_HANDLER(Vector5C) {
 

   OSAL_IRQ_PROLOGUE();

 

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

+  pr = EXTI->PR;

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

   EXTI->PR = pr;

   if (pr & (1U << 1))

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

@@ -94,7 +96,8 @@ OSAL_IRQ_HANDLER(Vector60) {
 

   OSAL_IRQ_PROLOGUE();

 

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

+  pr = EXTI->PR;

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

   EXTI->PR = pr;

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

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

@@ -112,7 +115,8 @@ OSAL_IRQ_HANDLER(Vector64) {
 

   OSAL_IRQ_PROLOGUE();

 

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

+  pr = EXTI->PR;

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

   EXTI->PR = pr;

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

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

@@ -130,7 +134,8 @@ OSAL_IRQ_HANDLER(Vector68) {
 

   OSAL_IRQ_PROLOGUE();

 

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

+  pr = EXTI->PR;

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

   EXTI->PR = pr;

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

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

@@ -148,8 +153,9 @@ OSAL_IRQ_HANDLER(Vector9C) {
 

   OSAL_IRQ_PROLOGUE();

 

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

-                               (1U << 9));

+  pr = EXTI->PR;

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

+                     (1U << 9));

   EXTI->PR = pr;

   if (pr & (1U << 5))

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

@@ -175,8 +181,9 @@ OSAL_IRQ_HANDLER(VectorE0) {
 

   OSAL_IRQ_PROLOGUE();

 

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

-                               (1U << 14) | (1U << 15));

+  pr = EXTI->PR;

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

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

   EXTI->PR = pr;

   if (pr & (1U << 10))

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

@@ -204,7 +211,8 @@ OSAL_IRQ_HANDLER(Vector44) {
 

   OSAL_IRQ_PROLOGUE();

 

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

+  pr = EXTI->PR;

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

   EXTI->PR = pr;

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

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

@@ -221,7 +229,9 @@ OSAL_IRQ_HANDLER(VectorE4) {
   uint32_t pr;

 

   OSAL_IRQ_PROLOGUE();

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

+

+  pr = EXTI->PR;

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

   EXTI->PR = pr;

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

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

@@ -237,7 +247,9 @@ OSAL_IRQ_HANDLER(VectorE8) {
   uint32_t pr;

 

   OSAL_IRQ_PROLOGUE();

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

+

+  pr = EXTI->PR;

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

   EXTI->PR = pr;

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

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

@@ -254,7 +266,9 @@ OSAL_IRQ_HANDLER(Vector48) {
   uint32_t pr;

 

   OSAL_IRQ_PROLOGUE();

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

+

+  pr = EXTI->PR;

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

   EXTI->PR = pr;

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

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

@@ -271,7 +285,9 @@ OSAL_IRQ_HANDLER(Vector4C) {
   uint32_t pr;

 

   OSAL_IRQ_PROLOGUE();

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

+

+  pr = EXTI->PR;

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

   EXTI->PR = pr;

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

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

@@ -289,7 +305,8 @@ OSAL_IRQ_HANDLER(Vector98) {
 

   OSAL_IRQ_PROLOGUE();

 

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

+  pr = EXTI->PR;

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

   EXTI->PR = pr;

   if (pr & (1U << 21))

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

@@ -309,7 +326,9 @@ OSAL_IRQ_HANDLER(Vector120) {
   uint32_t pr;

 

   OSAL_IRQ_PROLOGUE();

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

+

+  pr = EXTI->PR;

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

   EXTI->PR = pr;

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

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