Skip to content

Commit ac3c458

Browse files
authored
move irq_has_handler() so it can be used without shared handlers (#2383)
1 parent 472c781 commit ac3c458

File tree

1 file changed

+6
-7
lines changed
  • src/rp2_common/hardware_irq

1 file changed

+6
-7
lines changed

src/rp2_common/hardware_irq/irq.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -196,12 +196,6 @@ static inline bool is_shared_irq_raw_handler(irq_handler_t raw_handler) {
196196
return (uintptr_t)raw_handler - (uintptr_t)irq_handler_chain_slots < sizeof(irq_handler_chain_slots);
197197
}
198198

199-
bool irq_has_handler(uint irq_num) {
200-
check_irq_param(irq_num);
201-
irq_handler_t handler = irq_get_vtable_handler(irq_num);
202-
return handler && handler != __unhandled_user_irq;
203-
}
204-
205199
bool irq_has_shared_handler(uint irq_num) {
206200
check_irq_param(irq_num);
207201
irq_handler_t handler = irq_get_vtable_handler(irq_num);
@@ -223,12 +217,17 @@ bool irq_has_shared_handler(uint irq_num) {
223217
}
224218
#endif
225219

226-
227220
irq_handler_t irq_get_vtable_handler(uint num) {
228221
check_irq_param(num);
229222
return get_vtable()[VTABLE_FIRST_IRQ + num];
230223
}
231224

225+
bool irq_has_handler(uint irq_num) {
226+
check_irq_param(irq_num);
227+
irq_handler_t handler = irq_get_vtable_handler(irq_num);
228+
return handler && handler != __unhandled_user_irq;
229+
}
230+
232231
void irq_set_exclusive_handler(uint num, irq_handler_t handler) {
233232
check_irq_param(num);
234233
#if !PICO_NO_RAM_VECTOR_TABLE

0 commit comments

Comments
 (0)