From 50a472715f2b38c45f0d8ec11b5957ee80737eef Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sat, 27 Feb 2016 08:00:47 +0000 Subject: Fixed bug #711. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8952 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/ports/STM32/STM32L4xx/ext_lld_isr.c | 40 +++++++++++++++++++----------- 1 file changed, 26 insertions(+), 14 deletions(-) (limited to 'os/hal/ports/STM32/STM32L4xx') diff --git a/os/hal/ports/STM32/STM32L4xx/ext_lld_isr.c b/os/hal/ports/STM32/STM32L4xx/ext_lld_isr.c index 32c113e9b..dc4e5f002 100644 --- a/os/hal/ports/STM32/STM32L4xx/ext_lld_isr.c +++ b/os/hal/ports/STM32/STM32L4xx/ext_lld_isr.c @@ -58,7 +58,8 @@ OSAL_IRQ_HANDLER(Vector58) { OSAL_IRQ_PROLOGUE(); - pr = EXTI->PR1 & EXTI->IMR1 & (1U << 0); + pr = EXTI->PR1; + pr &= EXTI->IMR1 & (1U << 0); EXTI->PR1 = 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->PR1 & EXTI->IMR1 & (1U << 1); + pr = EXTI->PR1; + pr &= EXTI->IMR1 & (1U << 1); EXTI->PR1 = 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->PR1 & EXTI->IMR1 & (1U << 2); + pr = EXTI->PR1; + pr &= EXTI->IMR1 & (1U << 2); EXTI->PR1 = 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->PR1 & EXTI->IMR1 & (1U << 3); + pr = EXTI->PR1; + pr &= EXTI->IMR1 & (1U << 3); EXTI->PR1 = 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->PR1 & EXTI->IMR1 & (1U << 4); + pr = EXTI->PR1; + pr &= EXTI->IMR1 & (1U << 4); EXTI->PR1 = 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->PR1 & EXTI->IMR1 & ((1U << 5) | (1U << 6) | (1U << 7) | (1U << 8) | - (1U << 9)); + pr = EXTI->PR1; + pr &= EXTI->IMR1 & ((1U << 5) | (1U << 6) | (1U << 7) | (1U << 8) | + (1U << 9)); EXTI->PR1 = 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->PR1 & EXTI->IMR1 & ((1U << 10) | (1U << 11) | (1U << 12) | (1U << 13) | - (1U << 14) | (1U << 15)); + pr = EXTI->PR1; + pr &= EXTI->IMR1 & ((1U << 10) | (1U << 11) | (1U << 12) | (1U << 13) | + (1U << 14) | (1U << 15)); EXTI->PR1 = 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->PR1 & EXTI->IMR1 & (1U << 16); + pr = EXTI->PR1; + pr &= EXTI->IMR1 & (1U << 16); EXTI->PR1 = pr; if (pr & (1U << 16)) EXTD1.config->channels[16].cb(&EXTD1, 16); @@ -234,7 +242,8 @@ OSAL_IRQ_HANDLER(VectorE4) { OSAL_IRQ_PROLOGUE(); - pr = EXTI->PR1 & EXTI->IMR1 & (1U << 18); + pr = EXTI->PR1; + pr &= EXTI->IMR1 & (1U << 18); EXTI->PR1 = pr; if (pr & (1U << 18)) EXTD1.config->channels[18].cb(&EXTD1, 18); @@ -252,7 +261,8 @@ OSAL_IRQ_HANDLER(Vector48) { OSAL_IRQ_PROLOGUE(); - pr = EXTI->PR1 & EXTI->IMR1 & (1U << 19); + pr = EXTI->PR1; + pr &= EXTI->IMR1 & (1U << 19); EXTI->PR1 = pr; if (pr & (1U << 19)) EXTD1.config->channels[19].cb(&EXTD1, 19); @@ -270,7 +280,8 @@ OSAL_IRQ_HANDLER(Vector4C) { OSAL_IRQ_PROLOGUE(); - pr = EXTI->PR1 & EXTI->IMR1 & (1U << 20); + pr = EXTI->PR1; + pr &= EXTI->IMR1 & (1U << 20); EXTI->PR1 = pr; if (pr & (1U << 20)) EXTD1.config->channels[20].cb(&EXTD1, 20); @@ -288,7 +299,8 @@ OSAL_IRQ_HANDLER(Vector140) { OSAL_IRQ_PROLOGUE(); - pr = EXTI->PR1 & EXTI->IMR1 & ( (1U << 21) | ( 1U << 22 ) ); + pr = EXTI->PR1; + pr &= EXTI->IMR1 & ( (1U << 21) | ( 1U << 22 ) ); EXTI->PR1 = pr; if (pr & (1U << 21)) EXTD1.config->channels[21].cb(&EXTD1, 21); -- cgit v1.2.3