From 7e764610b14837e7ca7110bd548e5a1547821fa2 Mon Sep 17 00:00:00 2001 From: Bjarki Arge Andreasen Date: Fri, 24 May 2024 17:45:49 +0200 Subject: [PATCH] drivers: modem: modem_iface_uart: Remove gsm_mux integration gsm_mux and uart_mux are deprecated and will be removed. Remove integration with gsm_mux and uart_mux from modem_shell.c Signed-off-by: Bjarki Arge Andreasen --- drivers/modem/modem_iface_uart_interrupt.c | 27 +++------------------- 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/drivers/modem/modem_iface_uart_interrupt.c b/drivers/modem/modem_iface_uart_interrupt.c index 985e2d5d406..5bc06f59858 100644 --- a/drivers/modem/modem_iface_uart_interrupt.c +++ b/drivers/modem/modem_iface_uart_interrupt.c @@ -125,18 +125,6 @@ static int modem_iface_uart_read(struct modem_iface *iface, return 0; } -static bool mux_is_active(struct modem_iface *iface) -{ - bool active = false; - -#if defined(CONFIG_UART_MUX_DEVICE_NAME) - active = strncmp(CONFIG_UART_MUX_DEVICE_NAME, iface->dev->name, - sizeof(CONFIG_UART_MUX_DEVICE_NAME) - 1) == 0; -#endif /* CONFIG_UART_MUX_DEVICE_NAME */ - - return active; -} - static int modem_iface_uart_write(struct modem_iface *iface, const uint8_t *buf, size_t size) { @@ -148,18 +136,9 @@ static int modem_iface_uart_write(struct modem_iface *iface, return 0; } - /* If we're using gsm_mux, We don't want to use poll_out because sending - * one byte at a time causes each byte to get wrapped in muxing headers. - * But we can safely call uart_fifo_fill outside of ISR context when - * muxing because uart_mux implements it in software. - */ - if (mux_is_active(iface)) { - uart_fifo_fill(iface->dev, buf, size); - } else { - do { - uart_poll_out(iface->dev, *buf++); - } while (--size); - } + do { + uart_poll_out(iface->dev, *buf++); + } while (--size); return 0; }