diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2019-03-17 13:16:01 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2019-03-17 13:16:01 +0000 |
| commit | 71a12f97d5c6ec2d926c67c9bc100f3b2fa3950d (patch) | |
| tree | 92d6828ac96b147b6c8f3b1c2cb46fc1fe822804 /os/hal/ports/STM32/LLD/GPIOv2/hal_pal_lld.c | |
| parent | 7e9ca62aad5269d7feb486797500cba091f7ea36 (diff) | |
| download | ChibiOS-71a12f97d5c6ec2d926c67c9bc100f3b2fa3950d.tar.gz ChibiOS-71a12f97d5c6ec2d926c67c9bc100f3b2fa3950d.tar.bz2 ChibiOS-71a12f97d5c6ec2d926c67c9bc100f3b2fa3950d.zip | |
Fixed bug #1022.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_19.1.x@12709 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
Diffstat (limited to 'os/hal/ports/STM32/LLD/GPIOv2/hal_pal_lld.c')
| -rw-r--r-- | os/hal/ports/STM32/LLD/GPIOv2/hal_pal_lld.c | 36 |
1 files changed, 8 insertions, 28 deletions
diff --git a/os/hal/ports/STM32/LLD/GPIOv2/hal_pal_lld.c b/os/hal/ports/STM32/LLD/GPIOv2/hal_pal_lld.c index a8ce78f87..78d52b94d 100644 --- a/os/hal/ports/STM32/LLD/GPIOv2/hal_pal_lld.c +++ b/os/hal/ports/STM32/LLD/GPIOv2/hal_pal_lld.c @@ -160,13 +160,8 @@ void _pal_lld_enablepadevent(ioportid_t port, /* Multiple channel setting of the same channel not allowed, first disable
it. This is done because on STM32 the same channel cannot be mapped on
multiple ports.*/
-#if defined(STM32_EXTI_ENHANCED)
osalDbgAssert(((EXTI->RTSR1 & padmask) == 0U) &&
((EXTI->FTSR1 & padmask) == 0U), "channel already in use");
-#else
- osalDbgAssert(((EXTI->RTSR & padmask) == 0U) &&
- ((EXTI->FTSR & padmask) == 0U), "channel already in use");
-#endif
/* Index and mask of the SYSCFG CR register to be used.*/
cridx = (uint32_t)pad >> 2U;
@@ -181,7 +176,6 @@ void _pal_lld_enablepadevent(ioportid_t port, SYSCFG->EXTICR[cridx] = (SYSCFG->EXTICR[cridx] & crmask) | (portidx << croff);
/* Programming edge registers.*/
-#if defined(STM32_EXTI_ENHANCED)
if (mode & PAL_EVENT_MODE_RISING_EDGE)
EXTI->RTSR1 |= padmask;
else
@@ -192,21 +186,12 @@ void _pal_lld_enablepadevent(ioportid_t port, EXTI->FTSR1 &= ~padmask;
/* Programming interrupt and event registers.*/
+#if defined(STM32_EXTI_ENHANCED)
EXTI_D1->IMR1 |= padmask;
EXTI_D1->EMR1 &= ~padmask;
#else
- if (mode & PAL_EVENT_MODE_RISING_EDGE)
- EXTI->RTSR |= padmask;
- else
- EXTI->RTSR &= ~padmask;
- if (mode & PAL_EVENT_MODE_FALLING_EDGE)
- EXTI->FTSR |= padmask;
- else
- EXTI->FTSR &= ~padmask;
-
- /* Programming interrupt and event registers.*/
- EXTI->IMR |= padmask;
- EXTI->EMR &= ~padmask;
+ EXTI->IMR1 |= padmask;
+ EXTI->EMR1 &= ~padmask;
#endif
}
@@ -222,13 +207,8 @@ void _pal_lld_enablepadevent(ioportid_t port, void _pal_lld_disablepadevent(ioportid_t port, iopadid_t pad) {
uint32_t padmask, rtsr1, ftsr1;
-#if defined(STM32_EXTI_ENHANCED)
rtsr1 = EXTI->RTSR1;
ftsr1 = EXTI->FTSR1;
-#else
- rtsr1 = EXTI->RTSR;
- ftsr1 = EXTI->FTSR;
-#endif
/* Mask of the pad.*/
padmask = 1U << (uint32_t)pad;
@@ -258,11 +238,11 @@ void _pal_lld_disablepadevent(ioportid_t port, iopadid_t pad) { EXTI_D1->PR1 = padmask;
#else
/* Disabling channel.*/
- EXTI->IMR &= ~padmask;
- EXTI->EMR &= ~padmask;
- EXTI->RTSR = rtsr1 & ~padmask;
- EXTI->FTSR = ftsr1 & ~padmask;
- EXTI->PR = padmask;
+ EXTI->IMR1 &= ~padmask;
+ EXTI->EMR1 &= ~padmask;
+ EXTI->RTSR1 = rtsr1 & ~padmask;
+ EXTI->FTSR1 = ftsr1 & ~padmask;
+ EXTI->PR1 = padmask;
#endif
#if PAL_USE_CALLBACKS || PAL_USE_WAIT
|