Commit 7d1af024 authored by Tomasz Bursztyka's avatar Tomasz Bursztyka Committed by Carles Cufi
Browse files

uart: Fix uart_irq_callback_set usage 



It was already using uart_irq_callback_user_data_set below, now it also
uses uart_irq_callback_user_data_t as callback type, so let's normalize
the callbacks.

Fixes #26923

Signed-off-by: default avatarTomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
parent 4c78d0e3

drivers/bluetooth/hci/h4.c

+2 −1
Original line number Diff line number Diff line
@@ -391,9 +391,10 @@ static inline void process_rx(void) 
	}

}



static void bt_uart_isr(struct device *unused)

static void bt_uart_isr(struct device *unused, void *user_data)

{

	ARG_UNUSED(unused);

	ARG_UNUSED(user_data);



	while (uart_irq_update(h4_dev) && uart_irq_is_pending(h4_dev)) {

		if (uart_irq_tx_ready(h4_dev)) {

drivers/bluetooth/hci/h5.c

+2 −1
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ static inline struct net_buf *get_evt_buf(uint8_t evt) 
	return bt_buf_get_evt(evt, false, K_NO_WAIT);

}



static void bt_uart_isr(struct device *unused)

static void bt_uart_isr(struct device *unused, void *user_data)

{

	static int remaining;

	uint8_t byte;
@@ -413,6 +413,7 @@ static void bt_uart_isr(struct device *unused) 
	static uint8_t hdr[4];



	ARG_UNUSED(unused);

	ARG_UNUSED(user_data);



	while (uart_irq_update(h5_dev) &&

	       uart_irq_is_pending(h5_dev)) {

drivers/console/uart_console.c

+2 −1
Original line number Diff line number Diff line
@@ -434,9 +434,10 @@ static bool handle_mcumgr(struct console_input *cmd, uint8_t byte) 


#endif /* CONFIG_UART_CONSOLE_MCUMGR */



static void uart_console_isr(struct device *unused)

static void uart_console_isr(struct device *unused, void *user_data)

{

	ARG_UNUSED(unused);

	ARG_UNUSED(user_data);



	while (uart_irq_update(uart_console_dev) &&

	       uart_irq_is_pending(uart_console_dev)) {

drivers/console/uart_mcumgr.c

+2 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static struct uart_mcumgr_rx_buf *uart_mcumgr_rx_byte(uint8_t byte) 
/**

 * ISR that is called when UART bytes are received.

 */

static void uart_mcumgr_isr(struct device *unused)

static void uart_mcumgr_isr(struct device *unused, void *user_data)

{

	struct uart_mcumgr_rx_buf *rx_buf;

	uint8_t buf[32];
@@ -123,6 +123,7 @@ static void uart_mcumgr_isr(struct device *unused) 
	int i;



	ARG_UNUSED(unused);

	ARG_UNUSED(user_data);



	while (uart_irq_update(uart_mcumgr_dev) &&

	       uart_irq_is_pending(uart_mcumgr_dev)) {

drivers/console/uart_pipe.c

+3 −1
Original line number Diff line number Diff line
@@ -53,8 +53,10 @@ static void uart_pipe_rx(struct device *dev) 
	}

}



static void uart_pipe_isr(struct device *dev)

static void uart_pipe_isr(struct device *dev, void *user_data)

{

	ARG_UNUSED(user_data);



	uart_irq_update(dev);



	if (uart_irq_is_pending(dev)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE