drivers: serial: convert Zephyr constants to rpi-hal constants

rpi-hal function "uart_set_format" expects data width in the range
of 5..8. So I created a new function “uart_rpi_set_format” which
contains common parts of “uart_rpi_configure”.

Signed-off-by: Jan Hilsdorf <[email protected]>

Author: 68ec020

drivers/serial/uart_rpi_pico.c

@@ -59,6 +59,60 @@ static void uart_rpi_poll_out(const struct device *dev, unsigned char c)
 	uart_hw->dr = c;
 }
 
+static int uart_rpi_set_format(const struct device *dev, const struct uart_config *cfg)
+{
+	const struct uart_rpi_config *config = dev->config;
+	uart_inst_t * const uart_inst = config->uart_dev;
+	uart_parity_t parity = 0;
+	uint data_bits = 0;
+	uint stop_bits = 0;
+
+	switch (cfg->data_bits) {
+	case UART_CFG_DATA_BITS_5:
+		data_bits = 5;
+		break;
+	case UART_CFG_DATA_BITS_6:
+		data_bits = 6;
+		break;
+	case UART_CFG_DATA_BITS_7:
+		data_bits = 7;
+		break;
+	case UART_CFG_DATA_BITS_8:
+		data_bits = 8;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	switch (cfg->stop_bits) {
+	case UART_CFG_STOP_BITS_1:
+		stop_bits = 1;
+		break;
+	case UART_CFG_STOP_BITS_2:
+		stop_bits = 2;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	switch (cfg->parity) {
+	case UART_CFG_PARITY_NONE:
+		parity = UART_PARITY_NONE;
+		break;
+	case UART_CFG_PARITY_EVEN:
+		parity = UART_PARITY_EVEN;
+		break;
+	case UART_CFG_PARITY_ODD:
+		parity = UART_PARITY_ODD;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	uart_set_format(uart_inst, data_bits, stop_bits, parity);
+	return 0;
+}
+
 static int uart_rpi_init(const struct device *dev)
 {
 	const struct uart_rpi_config *config = dev->config;
@@ -94,10 +148,7 @@ static int uart_rpi_init(const struct device *dev)
 		.parity = UART_CFG_PARITY_NONE,
 		.stop_bits = UART_CFG_STOP_BITS_1
 	};
-	uart_set_format(uart_inst,
-			data->uart_config.data_bits,
-			data->uart_config.stop_bits,
-			data->uart_config.parity);
+	uart_rpi_set_format(dev, &data->uart_config);
 	hw_clear_bits(&uart_hw->lcr_h, UART_UARTLCR_H_FEN_BITS);
 	uart_hw->dr = 0U;
 
@@ -121,58 +172,17 @@ static int uart_rpi_configure(const struct device *dev, const struct uart_config
 	const struct uart_rpi_config *config = dev->config;
 	uart_inst_t * const uart_inst = config->uart_dev;
 	struct uart_rpi_data *data = dev->data;
-	uart_parity_t parity = 0;
-	uint data_bits = 0;
-	uint stop_bits = 0;
 	uint baudrate = 0;
 
-	switch (cfg->data_bits) {
-	case UART_CFG_DATA_BITS_5:
-		data_bits = 5;
-		break;
-	case UART_CFG_DATA_BITS_6:
-		data_bits = 6;
-		break;
-	case UART_CFG_DATA_BITS_7:
-		data_bits = 7;
-		break;
-	case UART_CFG_DATA_BITS_8:
-		data_bits = 8;
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	switch (cfg->stop_bits) {
-	case UART_CFG_STOP_BITS_1:
-		stop_bits = 1;
-		break;
-	case UART_CFG_STOP_BITS_2:
-		stop_bits = 2;
-		break;
-	default:
+	baudrate = uart_set_baudrate(uart_inst, cfg->baudrate);
+	if (baudrate == 0) {
 		return -EINVAL;
 	}
 
-	switch (cfg->parity) {
-	case UART_CFG_PARITY_NONE:
-		parity = UART_PARITY_NONE;
-		break;
-	case UART_CFG_PARITY_EVEN:
-		parity = UART_PARITY_EVEN;
-		break;
-	case UART_CFG_PARITY_ODD:
-		parity = UART_PARITY_ODD;
-		break;
-	default:
+	if (uart_rpi_set_format(dev, cfg) != 0) {
 		return -EINVAL;
 	}
 
-	baudrate = uart_set_baudrate(uart_inst, cfg->baudrate);
-	if (baudrate == 0) {
-		return -EINVAL;
-	}
-	uart_set_format(uart_inst, data_bits, stop_bits, parity);
 	data->uart_config = *cfg;
 	return 0;
 }