aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal/ports/STM32/LLD/EXTIv1
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2015-11-15 09:09:28 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2015-11-15 09:09:28 +0000
commitfd26fb26f44c3eef7b1b207dd2607e6142efd9a8 (patch)
treec6f1b95e32c52c56e5561e259067ec6d540a8603 /os/hal/ports/STM32/LLD/EXTIv1
parent546580f9a05f3fd9ff8a464cf1640dfcb7571980 (diff)
downloadChibiOS-fd26fb26f44c3eef7b1b207dd2607e6142efd9a8.tar.gz
ChibiOS-fd26fb26f44c3eef7b1b207dd2607e6142efd9a8.tar.bz2
ChibiOS-fd26fb26f44c3eef7b1b207dd2607e6142efd9a8.zip
EXT changes for L4.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8492 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/ports/STM32/LLD/EXTIv1')
-rw-r--r--os/hal/ports/STM32/LLD/EXTIv1/ext_lld.c25
1 files changed, 17 insertions, 8 deletions
diff --git a/os/hal/ports/STM32/LLD/EXTIv1/ext_lld.c b/os/hal/ports/STM32/LLD/EXTIv1/ext_lld.c
index 4b649dbf2..c6afad146 100644
--- a/os/hal/ports/STM32/LLD/EXTIv1/ext_lld.c
+++ b/os/hal/ports/STM32/LLD/EXTIv1/ext_lld.c
@@ -30,6 +30,15 @@
/* Driver local definitions. */
/*===========================================================================*/
+/* Handling a difference in ST headers.*/
+#if defined(STM32L4XX)
+#define EMR EMR1
+#define IMR IMR1
+#define PR PR1
+#define RTSR RTSR1
+#define FTSR FTSR1
+#endif
+
/*===========================================================================*/
/* Driver exported variables. */
/*===========================================================================*/
@@ -99,9 +108,9 @@ void ext_lld_stop(EXTDriver *extp) {
if (extp->state == EXT_ACTIVE)
ext_lld_exti_irq_disable();
- EXTI->EMR = 0;
- EXTI->IMR = STM32_EXTI_IMR_MASK;
- EXTI->PR = ~STM32_EXTI_IMR_MASK;
+ EXTI->EMR = 0;
+ EXTI->IMR = STM32_EXTI_IMR_MASK;
+ EXTI->PR = ~STM32_EXTI_IMR_MASK;
#if STM32_EXTI_NUM_LINES > 32
EXTI->IMR2 = STM32_EXTI_IMR2_MASK;
EXTI->PR2 = ~STM32_EXTI_IMR2_MASK;
@@ -208,11 +217,11 @@ void ext_lld_channel_disable(EXTDriver *extp, expchannel_t channel) {
#if STM32_EXTI_NUM_LINES > 32
if (channel < 32) {
#endif
- EXTI->IMR &= ~cmask;
- EXTI->EMR &= ~cmask;
- EXTI->RTSR &= ~cmask;
- EXTI->FTSR &= ~cmask;
- EXTI->PR = cmask;
+ EXTI->IMR &= ~cmask;
+ EXTI->EMR &= ~cmask;
+ EXTI->RTSR &= ~cmask;
+ EXTI->FTSR &= ~cmask;
+ EXTI->PR = cmask;
#if STM32_EXTI_NUM_LINES > 32
}
else {