Skip to content

Commit 0223662

Browse files
mathias-armmathias-arm
committed
lpc4322_hic: update IRQ Handler names
1 parent 6ff1ee5 commit 0223662

File tree

3 files changed

+126
-127
lines changed

3 files changed

+126
-127
lines changed

‎source/hic_hal/nxp/lpc4322/armcc/startup_LPC43xx.s‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ __Vectors DCD __initial_sp ; 0 Top of Sta
6262
DCD BusFault_Handler ; 5 Bus Fault Handler
6363
DCD UsageFault_Handler ; 6 Usage Fault Handler
6464
DCD Sign_Value ; 7 Reserved
65-
DCD DAPLINK_BUILD_KEY ; 8 DAPLINK: Build type (BL/IF)
66-
DCD DAPLINK_HIC_ID ; 9 DAPLINK: Compatibility
67-
DCD DAPLINK_VERSION ; 10 DAPLINK: Version
65+
DCD DAPLINK_BUILD_KEY ; 8 DAPLINK: Build type (BL/IF)
66+
DCD DAPLINK_HIC_ID ; 9 DAPLINK: Compatibility
67+
DCD DAPLINK_VERSION ; 10 DAPLINK: Version
6868
DCD SVC_Handler ; 11 SVCall Handler
6969
DCD DebugMon_Handler ; 12 Debug Monitor Handler
70-
DCD g_board_info ; 13 DAPLINK: Pointer to board/family/target info
70+
DCD g_board_info ; 13 DAPLINK: Pointer to board/family/target info
7171
DCD PendSV_Handler ; 14 PendSV Handler
7272
DCD SysTick_Handler ; 15 SysTick Handler
7373

‎source/hic_hal/nxp/lpc4322/gcc/startup_LPC43xx.S‎

Lines changed: 121 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* DAPLink Interface Firmware
66
* Copyright (c) 1997 - 2016, Freescale Semiconductor, Inc.
77
* Copyright 2016 - 2017 NXP
8-
* Copyright (c) 2009-2016, ARM Limited, All Rights Reserved
8+
* Copyright (c) 2009-2021, Arm Limited, All Rights Reserved
99
* SPDX-License-Identifier: Apache-2.0
1010
*
1111
* Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -30,77 +30,77 @@
3030
.align 2
3131
.globl __isr_vector
3232
__isr_vector:
33-
.long __StackTop /* Top of Stack */
34-
.long Reset_Handler /* Reset Handler */
35-
.long NMI_Handler /* NMI Handler*/
36-
.long HardFault_Handler /* Hard Fault Handler*/
37-
.long MemManage_Handler /* MPU Fault Handler*/
38-
.long BusFault_Handler /* Bus Fault Handler*/
39-
.long UsageFault_Handler /* Usage Fault Handler*/
40-
.long 0x5A5A5A5A /* Reserved*/
41-
.long DAPLINK_BUILD_KEY /* DAPLINK: Build type (BL/IF)*/
42-
.long DAPLINK_HIC_ID /* DAPLINK: Compatibility*/
43-
.long DAPLINK_VERSION /* DAPLINK: Version*/
44-
.long SVC_Handler /* SVCall Handler*/
45-
.long DebugMon_Handler /* Debug Monitor Handler*/
46-
.long g_board_info /* DAPLINK: Pointer to board/family/target info*/
47-
.long PendSV_Handler /* PendSV Handler*/
48-
.long SysTick_Handler /* SysTick Handler*/
33+
.long __StackTop /* Top of Stack */
34+
.long Reset_Handler /* Reset Handler */
35+
.long NMI_Handler /* NMI Handler */
36+
.long HardFault_Handler /* Hard Fault Handler */
37+
.long MemManage_Handler /* MPU Fault Handler */
38+
.long BusFault_Handler /* Bus Fault Handler */
39+
.long UsageFault_Handler /* Usage Fault Handler */
40+
.long 0x5A5A5A5A /* Reserved */
41+
.long DAPLINK_BUILD_KEY /* DAPLINK: Build type (BL/IF) */
42+
.long DAPLINK_HIC_ID /* DAPLINK: Compatibility */
43+
.long DAPLINK_VERSION /* DAPLINK: Version */
44+
.long SVC_Handler /* SVCall Handler */
45+
.long DebugMon_Handler /* Debug Monitor Handler */
46+
.long g_board_info /* DAPLINK: Pointer to board/family/target info */
47+
.long PendSV_Handler /* PendSV Handler */
48+
.long SysTick_Handler /* SysTick Handler */
4949

50-
/* External Interrupts*/
51-
.long DAC_IRQHandler /* 16 D/A Converter */
52-
.long M0CORE_IRQHandler /* 17 M0 Core */
53-
.long DMA_IRQHandler /* 18 General Purpose DMA */
54-
.long EZH_IRQHandler /* 19 EZH/EDM */
55-
.long FLASH_EEPROM_IRQHandler /* 20 Reserved for Typhoon */
56-
.long ETH_IRQHandler /* 21 Ethernet */
57-
.long SDIO_IRQHandler /* 22 SD/MMC */
58-
.long LCD_IRQHandler /* 23 LCD */
59-
.long USB0_IRQHandler /* 24 USB0 */
60-
.long USB1_IRQHandler /* 25 USB1 */
61-
.long SCT_IRQHandler /* 26 State Configurable Timer */
62-
.long RIT_IRQHandler /* 27 Repetitive Interrupt Timer */
63-
.long TIMER0_IRQHandler /* 28 Timer0 */
64-
.long TIMER1_IRQHandler /* 29 Timer1 */
65-
.long TIMER2_IRQHandler /* 30 Timer2 */
66-
.long TIMER3_IRQHandler /* 31 Timer3 */
67-
.long MCPWM_IRQHandler /* 32 Motor Control PWM */
68-
.long ADC0_IRQHandler /* 33 A/D Converter 0 */
69-
.long I2C0_IRQHandler /* 34 I2C0 */
70-
.long I2C1_IRQHandler /* 35 I2C1 */
71-
.long SPI_IRQHandler /* 36 SPI */
72-
.long ADC1_IRQHandler /* 37 A/D Converter 1 */
73-
.long SSP0_IRQHandler /* 38 SSP0 */
74-
.long SSP1_IRQHandler /* 39 SSP1 */
75-
.long UART0_IRQHandler /* 40 UART0 */
76-
.long UART1_IRQHandler /* 41 UART1 */
77-
.long UART2_IRQHandler /* 42 UART2 */
78-
.long UART3_IRQHandler /* 43 UART3 */
79-
.long I2S0_IRQHandler /* 44 I2S0 */
80-
.long I2S1_IRQHandler /* 45 I2S1 */
81-
.long SPIFI_IRQHandler /* 46 SPI Flash Interface */
82-
.long SGPIO_IRQHandler /* 47 SGPIO */
83-
.long GPIO0_IRQHandler /* 48 GPIO0 */
84-
.long GPIO1_IRQHandler /* 49 GPIO1 */
85-
.long GPIO2_IRQHandler /* 50 GPIO2 */
86-
.long GPIO3_IRQHandler /* 51 GPIO3 */
87-
.long GPIO4_IRQHandler /* 52 GPIO4 */
88-
.long GPIO5_IRQHandler /* 53 GPIO5 */
89-
.long GPIO6_IRQHandler /* 54 GPIO6 */
90-
.long GPIO7_IRQHandler /* 55 GPIO7 */
91-
.long GINT0_IRQHandler /* 56 GINT0 */
92-
.long GINT1_IRQHandler /* 57 GINT1 */
93-
.long EVRT_IRQHandler /* 58 Event Router */
94-
.long CAN1_IRQHandler /* 59 C_CAN1 */
95-
.long 0 /* 60 Reserved */
96-
.long VADC_IRQHandler /* 61 VADC */
97-
.long ATIMER_IRQHandler /* 62 ATIMER */
98-
.long RTC_IRQHandler /* 63 RTC */
99-
.long 0 /* 64 Reserved */
100-
.long WDT_IRQHandler /* 65 WDT */
101-
.long M0s_IRQHandler /* 66 M0s */
102-
.long CAN0_IRQHandler /* 67 C_CAN0 */
103-
.long QEI_IRQHandler /* 68 QEI */
50+
/* External LPC43xx/M4 Interrupts */
51+
.long DAC_IRQHandler /* 0 DAC interrupt */
52+
.long M0APP_IRQHandler /* 1 Cortex-M0APP; Latched TXEV; for M4-M0APP communication */
53+
.long DMA_IRQHandler /* 2 DMA interrupt */
54+
.long 0 /* 3 Reserved */
55+
.long FLASHEEPROM_IRQHandler /* 4 flash bank A, flash bank B, EEPROM ORed interrupt */
56+
.long ETHERNET_IRQHandler /* 5 Ethernet interrupt */
57+
.long SDIO_IRQHandler /* 6 SD/MMC interrupt */
58+
.long LCD_IRQHandler /* 7 LCD interrupt */
59+
.long USB0_IRQHandler /* 8 OTG interrupt */
60+
.long USB1_IRQHandler /* 9 USB1 interrupt */
61+
.long SCT_IRQHandler /* 10 SCT combined interrupt */
62+
.long RITIMER_IRQHandler /* 11 RI Timer interrupt */
63+
.long TIMER0_IRQHandler /* 12 Timer 0 interrupt */
64+
.long TIMER1_IRQHandler /* 13 Timer 1 interrupt */
65+
.long TIMER2_IRQHandler /* 14 Timer 2 interrupt */
66+
.long TIMER3_IRQHandler /* 15 Timer 3 interrupt */
67+
.long MCPWM_IRQHandler /* 16 Motor control PWM interrupt */
68+
.long ADC0_IRQHandler /* 17 ADC0 interrupt */
69+
.long I2C0_IRQHandler /* 18 I2C0 interrupt */
70+
.long I2C1_IRQHandler /* 19 I2C1 interrupt */
71+
.long SPI_IRQHandler /* 20 SPI interrupt */
72+
.long ADC1_IRQHandler /* 21 ADC1 interrupt */
73+
.long SSP0_IRQHandler /* 22 SSP0 interrupt */
74+
.long SSP1_IRQHandler /* 23 SSP1 interrupt */
75+
.long USART0_IRQHandler /* 24 USART0 interrupt */
76+
.long UART1_IRQHandler /* 25 Combined UART1, Modem interrupt */
77+
.long USART2_IRQHandler /* 26 USART2 interrupt */
78+
.long USART3_IRQHandler /* 27 Combined USART3, IrDA interrupt */
79+
.long I2S0_IRQHandler /* 28 I2S0 interrupt */
80+
.long I2S1_IRQHandler /* 29 I2S1 interrupt */
81+
.long SPIFI_IRQHandler /* 30 SPISI interrupt */
82+
.long SGPIO_IRQHandler /* 31 SGPIO interrupt */
83+
.long PIN_INT0_IRQHandler /* 32 GPIO pin interrupt 0 */
84+
.long PIN_INT1_IRQHandler /* 33 GPIO pin interrupt 1 */
85+
.long PIN_INT2_IRQHandler /* 34 GPIO pin interrupt 2 */
86+
.long PIN_INT3_IRQHandler /* 35 GPIO pin interrupt 3 */
87+
.long PIN_INT4_IRQHandler /* 36 GPIO pin interrupt 4 */
88+
.long PIN_INT5_IRQHandler /* 37 GPIO pin interrupt 5 */
89+
.long PIN_INT6_IRQHandler /* 38 GPIO pin interrupt 6 */
90+
.long PIN_INT7_IRQHandler /* 39 GPIO pin interrupt 7 */
91+
.long GINT0_IRQHandler /* 40 GPIO global interrupt 0 */
92+
.long GINT1_IRQHandler /* 41 GPIO global interrupt 1 */
93+
.long EVENTROUTER_IRQHandler /* 42 Event router interrupt */
94+
.long C_CAN1_IRQHandler /* 43 C_CAN1 interrupt */
95+
.long 0 /* 44 Reserved */
96+
.long ADCHS_IRQHandler /* 45 ADCHS combined interrupt */
97+
.long ATIMER_IRQHandler /* 46 Alarm timer interrupt */
98+
.long RTC_IRQHandler /* 47 RTC interrupt */
99+
.long 0 /* 48 Reserved */
100+
.long WWDT_IRQHandler /* 49 WWDT interrupt */
101+
.long M0SUB_IRQHandler /* 50 TXEV instruction from the M0 subsystem core interrupt */
102+
.long C_CAN0_IRQHandler /* 51 C_CAN0 interrupt */
103+
.long QEI_IRQHandler /* 52 QEI interrupt */
104104

105105
#if defined(MBED_BOOTLOADER)
106106

@@ -308,56 +308,55 @@ SysTick_Handler:
308308
.endm
309309

310310
/* Exception Handlers */
311-
def_irq_handler DAC_IRQHandler /* 16 D/A Converter */
312-
def_irq_handler M0CORE_IRQHandler /* 17 M0 Core */
313-
def_irq_handler DMA_IRQHandler /* 18 General Purpose DMA */
314-
def_irq_handler EZH_IRQHandler /* 19 EZH/EDM */
315-
def_irq_handler FLASH_EEPROM_IRQHandler /* 20 Reserved for Typhoon */
316-
def_irq_handler ETH_IRQHandler /* 21 Ethernet */
317-
def_irq_handler SDIO_IRQHandler /* 22 SD/MMC */
318-
def_irq_handler LCD_IRQHandler /* 23 LCD */
319-
def_irq_handler USB0_IRQHandler /* 24 USB0 */
320-
def_irq_handler USB1_IRQHandler /* 25 USB1 */
321-
def_irq_handler SCT_IRQHandler /* 26 State Configurable Timer */
322-
def_irq_handler RIT_IRQHandler /* 27 Repetitive Interrupt Timer */
323-
def_irq_handler TIMER0_IRQHandler /* 28 Timer0 */
324-
def_irq_handler TIMER1_IRQHandler /* 29 Timer1 */
325-
def_irq_handler TIMER2_IRQHandler /* 30 Timer2 */
326-
def_irq_handler TIMER3_IRQHandler /* 31 Timer3 */
327-
def_irq_handler MCPWM_IRQHandler /* 32 Motor Control PWM */
328-
def_irq_handler ADC0_IRQHandler /* 33 A/D Converter 0 */
329-
def_irq_handler I2C0_IRQHandler /* 34 I2C0 */
330-
def_irq_handler I2C1_IRQHandler /* 35 I2C1 */
331-
def_irq_handler SPI_IRQHandler /* 36 SPI */
332-
def_irq_handler ADC1_IRQHandler /* 37 A/D Converter 1 */
333-
def_irq_handler SSP0_IRQHandler /* 38 SSP0 */
334-
def_irq_handler SSP1_IRQHandler /* 39 SSP1 */
335-
def_irq_handler UART0_IRQHandler /* 40 UART0 */
336-
def_irq_handler UART1_IRQHandler /* 41 UART1 */
337-
def_irq_handler UART2_IRQHandler /* 42 UART2 */
338-
def_irq_handler UART3_IRQHandler /* 43 UART3 */
339-
def_irq_handler I2S0_IRQHandler /* 44 I2S0 */
340-
def_irq_handler I2S1_IRQHandler /* 45 I2S1 */
341-
def_irq_handler SPIFI_IRQHandler /* 46 SPI Flash Interface */
342-
def_irq_handler SGPIO_IRQHandler /* 47 SGPIO */
343-
def_irq_handler GPIO0_IRQHandler /* 48 GPIO0 */
344-
def_irq_handler GPIO1_IRQHandler /* 49 GPIO1 */
345-
def_irq_handler GPIO2_IRQHandler /* 50 GPIO2 */
346-
def_irq_handler GPIO3_IRQHandler /* 51 GPIO3 */
347-
def_irq_handler GPIO4_IRQHandler /* 52 GPIO4 */
348-
def_irq_handler GPIO5_IRQHandler /* 53 GPIO5 */
349-
def_irq_handler GPIO6_IRQHandler /* 54 GPIO6 */
350-
def_irq_handler GPIO7_IRQHandler /* 55 GPIO7 */
351-
def_irq_handler GINT0_IRQHandler /* 56 GINT0 */
352-
def_irq_handler GINT1_IRQHandler /* 57 GINT1 */
353-
def_irq_handler EVRT_IRQHandler /* 58 Event Router */
354-
def_irq_handler CAN1_IRQHandler /* 59 C_CAN1 */
355-
def_irq_handler VADC_IRQHandler /* 61 VADC */
356-
def_irq_handler ATIMER_IRQHandler /* 62 ATIMER */
357-
def_irq_handler RTC_IRQHandler /* 63 RTC */
358-
def_irq_handler WDT_IRQHandler /* 65 WDT */
359-
def_irq_handler M0s_IRQHandler /* 66 M0s */
360-
def_irq_handler CAN0_IRQHandler /* 67 C_CAN0 */
361-
def_irq_handler QEI_IRQHandler /* 68 QEI */
311+
def_irq_handler DAC_IRQHandler /* D/A Converter */
312+
def_irq_handler M0APP_IRQHandler /* M0 Core */
313+
def_irq_handler DMA_IRQHandler /* General Purpose DMA */
314+
def_irq_handler FLASHEEPROM_IRQHandler /* EZH/EDM */
315+
def_irq_handler ETHERNET_IRQHandler /* Ethernet */
316+
def_irq_handler SDIO_IRQHandler /* SD/MMC */
317+
def_irq_handler LCD_IRQHandler /* LCD */
318+
def_irq_handler USB0_IRQHandler /* USB0 */
319+
def_irq_handler USB1_IRQHandler /* USB1 */
320+
def_irq_handler SCT_IRQHandler /* State Configurable Timer */
321+
def_irq_handler RITIMER_IRQHandler /* Repetitive Interrupt Timer */
322+
def_irq_handler TIMER0_IRQHandler /* Timer0 */
323+
def_irq_handler TIMER1_IRQHandler /* Timer1 */
324+
def_irq_handler TIMER2_IRQHandler /* Timer2 */
325+
def_irq_handler TIMER3_IRQHandler /* Timer3 */
326+
def_irq_handler MCPWM_IRQHandler /* Motor Control PWM */
327+
def_irq_handler ADC0_IRQHandler /* A/D Converter 0 */
328+
def_irq_handler I2C0_IRQHandler /* I2C0 */
329+
def_irq_handler I2C1_IRQHandler /* I2C1 */
330+
def_irq_handler SPI_IRQHandler /* SPI */
331+
def_irq_handler ADC1_IRQHandler /* A/D Converter 1 */
332+
def_irq_handler SSP0_IRQHandler /* SSP0 */
333+
def_irq_handler SSP1_IRQHandler /* SSP1 */
334+
def_irq_handler USART0_IRQHandler /* UART0 */
335+
def_irq_handler UART1_IRQHandler /* UART1 */
336+
def_irq_handler USART2_IRQHandler /* UART2 */
337+
def_irq_handler USART3_IRQHandler /* UART3 */
338+
def_irq_handler I2S0_IRQHandler /* I2S0 */
339+
def_irq_handler I2S1_IRQHandler /* I2S1 */
340+
def_irq_handler SPIFI_IRQHandler /* SPI Flash Interface */
341+
def_irq_handler SGPIO_IRQHandler /* SGPIO */
342+
def_irq_handler PIN_INT0_IRQHandler /* GPIO0 */
343+
def_irq_handler PIN_INT1_IRQHandler /* GPIO1 */
344+
def_irq_handler PIN_INT2_IRQHandler /* GPIO2 */
345+
def_irq_handler PIN_INT3_IRQHandler /* GPIO3 */
346+
def_irq_handler PIN_INT4_IRQHandler /* GPIO4 */
347+
def_irq_handler PIN_INT5_IRQHandler /* GPIO5 */
348+
def_irq_handler PIN_INT6_IRQHandler /* GPIO6 */
349+
def_irq_handler PIN_INT7_IRQHandler /* GPIO7 */
350+
def_irq_handler GINT0_IRQHandler /* GINT0 */
351+
def_irq_handler GINT1_IRQHandler /* GINT1 */
352+
def_irq_handler EVENTROUTER_IRQHandler /* Event Router */
353+
def_irq_handler C_CAN1_IRQHandler /* C_CAN1 */
354+
def_irq_handler ADCHS_IRQHandler /* VADC */
355+
def_irq_handler ATIMER_IRQHandler /* ATIMER */
356+
def_irq_handler RTC_IRQHandler /* RTC */
357+
def_irq_handler WWDT_IRQHandler /* WDT */
358+
def_irq_handler M0SUB_IRQHandler /* M0s */
359+
def_irq_handler C_CAN0_IRQHandler /* C_CAN0 */
360+
def_irq_handler QEI_IRQHandler /* QEI */
362361

363362
.end

‎source/hic_hal/nxp/lpc4322/uart.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ static int32_t reset(void);
4646

4747
#define UART_IRQn USART0_IRQn
4848
#define LPC_USART LPC_USART0
49-
#define UART_IRQHandler UART0_IRQHandler
49+
#define UART_IRQHandler USART0_IRQHandler
5050

5151
// UART Control Pin P2_2: GPIO5[2]
5252
#define PORT_UARTCTRL 5

0 commit comments

Comments
 (0)