From 4657d8515abb7d19742bde5db89d91043419caa7 Mon Sep 17 00:00:00 2001 From: Carles Cufi Date: Sat, 9 Nov 2019 15:21:27 +0100 Subject: [PATCH] Bluetooth: controller: openisa: Fix radio ISR signature Non-direct ISRs are supposed to take a void pointer as an argument, unliike direct ones, which take no arguments. Since the radio ISR is not declared as direct, the void pointer argument was missing, likely due to a copy-paste mistake from the nordic LLL, which indeed uses a direct ISR for the radio ISR. Signed-off-by: Carles Cufi --- .../controller/ll_sw/openisa/hal/RV32M1/radio/radio.c | 4 +++- .../controller/ll_sw/openisa/hal/RV32M1/radio/radio.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/radio/radio.c b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/radio/radio.c index 6345d6e51f3..9ba95d209b2 100644 --- a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/radio/radio.c +++ b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/radio/radio.c @@ -167,8 +167,10 @@ static void pkt_rx(void) #define IRQ_MASK ~(GENFSK_IRQ_CTRL_T2_IRQ_MASK | \ GENFSK_IRQ_CTRL_RX_WATERMARK_IRQ_MASK | \ GENFSK_IRQ_CTRL_TX_IRQ_MASK) -void isr_radio(void) +void isr_radio(void *arg) { + ARG_UNUSED(arg); + u32_t tmr = GENFSK->EVENT_TMR & GENFSK_EVENT_TMR_EVENT_TMR_MASK; u32_t irq = GENFSK->IRQ_CTRL; diff --git a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/radio/radio.h b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/radio/radio.h index b5ed43c340a..68bb5bb0c16 100644 --- a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/radio/radio.h +++ b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/radio/radio.h @@ -10,7 +10,7 @@ typedef void (*radio_isr_cb_t) (void *param); -void isr_radio(void); +void isr_radio(void *arg); void radio_isr_set(radio_isr_cb_t cb, void *param); void radio_setup(void);