tests: uart: remove CONFIG_UART_CONSOLE_ON_DEV_NAME usage

Use DT_CHOSEN(zephyr_console) instead of
CONFIG_UART_CONSOLE_ON_DEV_NAME Kconfig option.

Signed-off-by: Johann Fischer <[email protected]>

Author: jfischer-no

tests/drivers/uart/uart_async_api/src/test_uart.h

@@ -44,7 +44,7 @@
 #elif defined(CONFIG_BOARD_NUCLEO_H723ZG)
 #define UART_DEVICE_NAME DT_LABEL(DT_NODELABEL(usart2))
 #else
-#define UART_DEVICE_NAME CONFIG_UART_CONSOLE_ON_DEV_NAME
+#define UART_DEVICE_NAME DT_LABEL(DT_CHOSEN(zephyr_console))
 #endif
 
 void init_test(void);

tests/drivers/uart/uart_basic_api/src/test_uart.h

@@ -18,8 +18,6 @@
 #include <drivers/uart.h>
 #include <ztest.h>
 
-#define UART_DEVICE_NAME CONFIG_UART_CONSOLE_ON_DEV_NAME
-
 void test_uart_configure(void);
 void test_uart_config_get(void);
 void test_uart_poll_out(void);

tests/drivers/uart/uart_basic_api/src/test_uart_config.c

@@ -36,10 +36,10 @@ const struct uart_config uart_cfg = {
 
 static int test_configure(void)
 {
-	const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME);
+	const struct device *uart_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_console));
 
-	if (!uart_dev) {
-		TC_PRINT("Cannot get UART device\n");
+	if (!device_is_ready(uart_dev)) {
+		TC_PRINT("UART device not ready\n");
 		return TC_FAIL;
 	}
 
@@ -58,10 +58,10 @@ static int test_configure(void)
 /* test UART configure get (retrieve configuration) */
 static int test_config_get(void)
 {
-	const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME);
+	const struct device *uart_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_console));
 
-	if (!uart_dev) {
-		TC_PRINT("Cannot get UART device\n");
+	if (!device_is_ready(uart_dev)) {
+		TC_PRINT("UART device not ready\n");
 		return TC_FAIL;
 	}
 

tests/drivers/uart/uart_basic_api/src/test_uart_fifo.c

@@ -92,7 +92,12 @@ static void uart_fifo_callback(const struct device *dev, void *user_data)
 
 static int test_fifo_read(void)
 {
-	const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME);
+	const struct device *uart_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_console));
+
+	if (!device_is_ready(uart_dev)) {
+		TC_PRINT("UART device not ready\n");
+		return TC_FAIL;
+	}
 
 	/* Verify uart_irq_callback_set() */
 	uart_irq_callback_set(uart_dev, uart_fifo_callback);
@@ -115,7 +120,12 @@ static int test_fifo_read(void)
 
 static int test_fifo_fill(void)
 {
-	const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME);
+	const struct device *uart_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_console));
+
+	if (!device_is_ready(uart_dev)) {
+		TC_PRINT("UART device not ready\n");
+		return TC_FAIL;
+	}
 
 	char_sent = 0;
 

tests/drivers/uart/uart_basic_api/src/test_uart_pending.c

@@ -93,7 +93,12 @@ static void uart_pending_callback(const struct device *dev, void *user_data)
 
 static int test_pending(void)
 {
-	const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME);
+	const struct device *uart_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_console));
+
+	if (!device_is_ready(uart_dev)) {
+		TC_PRINT("UART device not ready\n");
+		return TC_FAIL;
+	}
 
 	/*
 	 * Set IRQ callback function to handle RX IRQ.

tests/drivers/uart/uart_basic_api/src/test_uart_poll.c

@@ -11,10 +11,10 @@ static const char *poll_data = "This is a POLL test.\r\n";
 static int test_poll_in(void)
 {
 	unsigned char recv_char;
-	const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME);
+	const struct device *uart_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_console));
 
-	if (!uart_dev) {
-		TC_PRINT("Cannot get UART device\n");
+	if (!device_is_ready(uart_dev)) {
+		TC_PRINT("UART device not ready\n");
 		return TC_FAIL;
 	}
 
@@ -38,10 +38,10 @@ static int test_poll_in(void)
 static int test_poll_out(void)
 {
 	int i;
-	const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME);
+	const struct device *uart_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_console));
 
-	if (!uart_dev) {
-		TC_PRINT("Cannot get UART device\n");
+	if (!device_is_ready(uart_dev)) {
+		TC_PRINT("UART device not ready\n");
 		return TC_FAIL;
 	}
 

tests/drivers/uart/uart_mix_fifo_poll/src/main.c

@@ -28,7 +28,7 @@
 #elif defined(CONFIG_BOARD_ATSAME54_XPRO)
 #define UART_DEVICE_NAME DT_LABEL(DT_NODELABEL(sercom1))
 #else
-#define UART_DEVICE_NAME CONFIG_UART_CONSOLE_ON_DEV_NAME
+#define UART_DEVICE_NAME DT_LABEL(DT_CHOSEN(zephyr_console))
 #endif
 
 struct rx_source {