Skip to content

Commit 1413dbf

Browse files
anhmolteivindj-nordic
authored andcommitted
softdevice_handler: align names of application IRQ consume functions
Align name of application IRQ consume weak functions to match the names in nrfx and nrf_sd_isr.h. Signed-off-by: Andreas Moltumyr <[email protected]>
1 parent 786f7dc commit 1413dbf

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

subsys/softdevice_handler/irq_connect.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,37 +79,37 @@ __attribute__((weak)) void C_HardFault_Handler(void)
7979
__asm__("SVC 255");
8080
}
8181

82-
__attribute__((weak)) void C_TIMER0_Handler(void)
82+
__attribute__((weak)) void C_TIMER10_Handler(void)
8383
{
8484
__asm__("SVC 255");
8585
}
8686

87-
__attribute__((weak)) void C_RTC0_Handler(void)
87+
__attribute__((weak)) void C_GRTC_3_Handler(void)
8888
{
8989
__asm__("SVC 255");
9090
}
9191

92-
__attribute__((weak)) void C_SIGNALLING_Handler(void)
92+
__attribute__((weak)) void C_SWI00_Handler(void)
9393
{
9494
__asm__("SVC 255");
9595
}
9696

97-
__attribute__((weak)) void C_RADIO_Handler(void)
97+
__attribute__((weak)) void C_RADIO_0_Handler(void)
9898
{
9999
__asm__("SVC 255");
100100
}
101101

102-
__attribute__((weak)) void C_ECB_Handler(void)
102+
__attribute__((weak)) void C_ECB00_Handler(void)
103103
{
104104
__asm__("SVC 255");
105105
}
106106

107-
__attribute__((weak)) void C_CCM_Handler(void)
107+
__attribute__((weak)) void C_AAR00_CCM00_Handler(void)
108108
{
109109
__asm__("SVC 255");
110110
}
111111

112-
__attribute__((weak)) void C_POWER_CLOCK_Handler(void)
112+
__attribute__((weak)) void C_CLOCK_POWER_Handler(void)
113113
{
114114
__asm__("SVC 255");
115115
}

subsys/softdevice_handler/irq_forward.s

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ HardFault_Handler:
9797
.global CLOCK_POWER_IRQHandler
9898
.type CLOCK_POWER_IRQHandler, "function"
9999
CLOCK_POWER_IRQHandler:
100-
LDR R3, =C_POWER_CLOCK_Handler
100+
LDR R3, =C_CLOCK_POWER_Handler
101101
LDR R0, =NRF_SD_ISR_OFFSET_CLOCK_POWER
102102
LDR R1, =ConsumeOrForwardIRQ
103103
BX R1
@@ -108,7 +108,7 @@ CLOCK_POWER_IRQHandler:
108108
.global RADIO_0_IRQHandler
109109
.type RADIO_0_IRQHandler, "function"
110110
RADIO_0_IRQHandler:
111-
LDR R3, =C_RADIO_Handler
111+
LDR R3, =C_RADIO_0_Handler
112112
LDR R0, =NRF_SD_ISR_OFFSET_RADIO_0
113113
LDR R1, =ConsumeOrForwardIRQ
114114
BX R1
@@ -119,7 +119,7 @@ RADIO_0_IRQHandler:
119119
.global TIMER10_IRQHandler
120120
.type TIMER10_IRQHandler, "function"
121121
TIMER10_IRQHandler:
122-
LDR R3, =C_TIMER0_Handler
122+
LDR R3, =C_TIMER10_Handler
123123
LDR R0, =NRF_SD_ISR_OFFSET_TIMER10
124124
LDR R1, =ConsumeOrForwardIRQ
125125
BX R1
@@ -130,7 +130,7 @@ TIMER10_IRQHandler:
130130
.global GRTC_3_IRQHandler
131131
.type GRTC_3_IRQHandler, "function"
132132
GRTC_3_IRQHandler:
133-
LDR R3, =C_RTC0_Handler
133+
LDR R3, =C_GRTC_3_Handler
134134
LDR R0, =NRF_SD_ISR_OFFSET_GRTC_3
135135
LDR R1, =ConsumeOrForwardIRQ
136136
BX R1
@@ -141,7 +141,7 @@ GRTC_3_IRQHandler:
141141
.global ECB00_IRQHandler
142142
.type ECB00_IRQHandler, "function"
143143
ECB00_IRQHandler:
144-
LDR R3, =C_ECB_Handler
144+
LDR R3, =C_ECB00_Handler
145145
LDR R0, =NRF_SD_ISR_OFFSET_ECB00
146146
LDR R1, =ConsumeOrForwardIRQ
147147
BX R1
@@ -152,7 +152,7 @@ ECB00_IRQHandler:
152152
.global AAR00_CCM00_IRQHandler
153153
.type AAR00_CCM00_IRQHandler, "function"
154154
AAR00_CCM00_IRQHandler:
155-
LDR R3, =C_CCM_Handler
155+
LDR R3, =C_AAR00_CCM00_Handler
156156
LDR R0, =NRF_SD_ISR_OFFSET_AAR00_CCM00
157157
LDR R1, =ConsumeOrForwardIRQ
158158
BX R1
@@ -163,7 +163,7 @@ AAR00_CCM00_IRQHandler:
163163
.global SWI00_IRQHandler
164164
.type SWI00_IRQHandler, "function"
165165
SWI00_IRQHandler:
166-
LDR R3, =C_SIGNALLING_Handler
166+
LDR R3, =C_SWI00_Handler
167167
LDR R0, =NRF_SD_ISR_OFFSET_SWI00
168168
LDR R1, =ConsumeOrForwardIRQ
169169
BX R1

0 commit comments

Comments
 (0)