From 8db4d4f31264458d9e2bfbca768166c5b5afa4e0 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Tue, 26 Dec 2017 09:48:19 +0000 Subject: PAL EXTI vectors adapted to H7. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11188 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- ...H743I-NUCLEO144 (OpenOCD, Flash and Run).launch | 2 +- os/hal/ports/STM32/STM32H7xx/platform.mk | 2 +- os/hal/ports/STM32/STM32H7xx/stm32_isr.c | 46 +++++++++++----------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/demos/STM32/RT-STM32H743I-NUCLEO144/debug/RT-STM32H743I-NUCLEO144 (OpenOCD, Flash and Run).launch b/demos/STM32/RT-STM32H743I-NUCLEO144/debug/RT-STM32H743I-NUCLEO144 (OpenOCD, Flash and Run).launch index fa9261ad2..c69b25933 100644 --- a/demos/STM32/RT-STM32H743I-NUCLEO144/debug/RT-STM32H743I-NUCLEO144 (OpenOCD, Flash and Run).launch +++ b/demos/STM32/RT-STM32H743I-NUCLEO144/debug/RT-STM32H743I-NUCLEO144 (OpenOCD, Flash and Run).launch @@ -33,7 +33,7 @@ - + diff --git a/os/hal/ports/STM32/STM32H7xx/platform.mk b/os/hal/ports/STM32/STM32H7xx/platform.mk index 6f8969233..fbe8dfe69 100644 --- a/os/hal/ports/STM32/STM32H7xx/platform.mk +++ b/os/hal/ports/STM32/STM32H7xx/platform.mk @@ -1,7 +1,7 @@ # Required platform files. PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \ + $(CHIBIOS)/os/hal/ports/STM32/STM32H7xx/stm32_isr.c \ $(CHIBIOS)/os/hal/ports/STM32/STM32H7xx/hal_lld.c -# $(CHIBIOS)/os/hal/ports/STM32/STM32H7xx/stm32_isr.c \ # Required include directories. PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \ diff --git a/os/hal/ports/STM32/STM32H7xx/stm32_isr.c b/os/hal/ports/STM32/STM32H7xx/stm32_isr.c index 005466142..95ae09e2e 100644 --- a/os/hal/ports/STM32/STM32H7xx/stm32_isr.c +++ b/os/hal/ports/STM32/STM32H7xx/stm32_isr.c @@ -63,9 +63,9 @@ OSAL_IRQ_HANDLER(Vector58) { OSAL_IRQ_PROLOGUE(); - pr = EXTI->PR; - pr &= EXTI->IMR & (1U << 0); - EXTI->PR = pr; + pr = EXTI_D1->PR1; + pr &= EXTI_D1->IMR1 & (1U << 0); + EXTI_D1->PR1 = pr; exti_serve_irq(pr, 0); @@ -84,9 +84,9 @@ OSAL_IRQ_HANDLER(Vector5C) { OSAL_IRQ_PROLOGUE(); - pr = EXTI->PR; - pr &= EXTI->IMR & (1U << 1); - EXTI->PR = pr; + pr = EXTI_D1->PR1; + pr &= EXTI_D1->IMR1 & (1U << 1); + EXTI_D1->PR1 = pr; exti_serve_irq(pr, 1); @@ -105,9 +105,9 @@ OSAL_IRQ_HANDLER(Vector60) { OSAL_IRQ_PROLOGUE(); - pr = EXTI->PR; - pr &= EXTI->IMR & (1U << 2); - EXTI->PR = pr; + pr = EXTI_D1->PR1; + pr &= EXTI_D1->IMR1 & (1U << 2); + EXTI_D1->PR1 = pr; exti_serve_irq(pr, 2); @@ -126,9 +126,9 @@ OSAL_IRQ_HANDLER(Vector64) { OSAL_IRQ_PROLOGUE(); - pr = EXTI->PR; - pr &= EXTI->IMR & (1U << 3); - EXTI->PR = pr; + pr = EXTI_D1->PR1; + pr &= EXTI_D1->IMR1 & (1U << 3); + EXTI_D1->PR1 = pr; exti_serve_irq(pr, 3); @@ -147,9 +147,9 @@ OSAL_IRQ_HANDLER(Vector68) { OSAL_IRQ_PROLOGUE(); - pr = EXTI->PR; - pr &= EXTI->IMR & (1U << 4); - EXTI->PR = pr; + pr = EXTI_D1->PR1; + pr &= EXTI_D1->IMR1 & (1U << 4); + EXTI_D1->PR1 = pr; exti_serve_irq(pr, 4); @@ -168,10 +168,10 @@ OSAL_IRQ_HANDLER(Vector9C) { OSAL_IRQ_PROLOGUE(); - pr = EXTI->PR; - pr &= EXTI->IMR & ((1U << 5) | (1U << 6) | (1U << 7) | (1U << 8) | - (1U << 9)); - EXTI->PR = pr; + pr = EXTI_D1->PR1; + pr &= EXTI_D1->IMR1 & ((1U << 5) | (1U << 6) | (1U << 7) | (1U << 8) | + (1U << 9)); + EXTI_D1->PR1 = pr; exti_serve_irq(pr, 5); exti_serve_irq(pr, 6); @@ -194,10 +194,10 @@ OSAL_IRQ_HANDLER(VectorE0) { OSAL_IRQ_PROLOGUE(); - pr = EXTI->PR; - pr &= EXTI->IMR & ((1U << 10) | (1U << 11) | (1U << 12) | (1U << 13) | - (1U << 14) | (1U << 15)); - EXTI->PR = pr; + pr = EXTI_D1->PR1; + pr &= EXTI_D1->IMR1 & ((1U << 10) | (1U << 11) | (1U << 12) | (1U << 13) | + (1U << 14) | (1U << 15)); + EXTI_D1->PR1 = pr; exti_serve_irq(pr, 10); exti_serve_irq(pr, 11); -- cgit v1.2.3