Continue working on the GIC-less Cortex-A5 port for IAR:

[freertos] / FreeRTOS / Source / portable / IAR / ARM_CA5_No_GIC / portASM.s

diff --git a/FreeRTOS/Source/portable/IAR/ARM_CA5_No_GIC/portASM.s b/FreeRTOS/Source/portable/IAR/ARM_CA5_No_GIC/portASM.s
index b9086d486fea060b1323e6e3c3bdb8461b5c0d8e..c66146964e3981eb5de7f63e48a2687a4b3ca5cd 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/ARM_CA5_No_GIC/portASM.s
+++ b/FreeRTOS/Source/portable/IAR/ARM_CA5_No_GIC/portASM.s
@@ -67,10 +67,6 @@ SYS_MODE                     EQU             0x1f
 SVC_MODE                       EQU             0x13\r
 IRQ_MODE                       EQU             0x12\r
 \r
-; AIC register definitions.\r
-AIC_IVR                                EQU             0xFFFFF010UL\r
-AIC_EOICR                      EQU             0xFFFFF038UL\r
-\r
        SECTION .text:CODE:ROOT(2)\r
        ARM\r
 \r
@@ -93,7 +89,7 @@ vPortRestoreTaskContext
 \r
 \r
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\r
-; AIC interrupt handler\r
+; IRQ interrupt handler used when individual priorities cannot be masked\r
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\r
 FreeRTOS_IRQ_Handler\r
 \r
@@ -127,7 +123,7 @@ FreeRTOS_IRQ_Handler
 \r
        ; Call the interrupt handler\r
        PUSH    {r0-r3, lr}\r
-       LDR             r1, =AIC_IVR\r
+       LDR             r1, =configINTERRUPT_VECTOR_ADDRESS\r
        LDR             r0, [r1]\r
        STR             r1, [r1] ; Write to IVR in case protect mode is being used.\r
        BLX             r0\r
@@ -137,7 +133,7 @@ FreeRTOS_IRQ_Handler
        CPSID   i\r
 \r
        ; Write to the EOI register\r
-       LDR     r4, =AIC_EOICR\r
+       LDR     r4, =configEOI_ADDRESS\r
        STR             r0, [r4]\r
 \r
        ; Restore the old nesting count\r