ports: analog: Improve portability for BUSIO.UART

- Move Init & Flow Control into wrapper functions in peripherals/
- Unify API differences (e.g. AsyncHandler doesn't always return an err)
- Create UART register macro for TX_BUSY checking in peripherals/

Signed-off-by: Brandon-Hurst <brandon.hurst97@gmail.com>

Author: Brandon-Hurst

ports/analog/common-hal/busio/UART.c

@@ -182,7 +182,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
     }
 
     if ((rx != NULL) && (tx != NULL)) {
-        err = MXC_UART_Init(self->uart_regs, baudrate, MXC_UART_IBRO_CLK);
+        err = uart_init(self->uart_regs, baudrate);
         if (err != E_NO_ERROR) {
             mp_raise_RuntimeError_varg(MP_ERROR_TEXT("%q init failed"), MP_QSTR_UART);
         }
@@ -197,7 +197,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
     }
 
     if ((cts) && (rts)) {
-        MXC_UART_SetFlowCtrl(self->uart_regs, MXC_UART_FLOW_EN, 8);
+        uart_set_flow_ctrl(self->uart_regs, true, 8);
         self->cts_pin = cts;
         self->rts_pin = rts;
         common_hal_mcu_pin_claim(self->cts_pin);
@@ -377,7 +377,7 @@ size_t common_hal_busio_uart_write(busio_uart_obj_t *self,
     uart_wr_req.rxCnt = 0;
     uart_wr_req.txCnt = 0;
     uart_wr_req.rxData = NULL;
-    uart_wr_req.txData = data;
+    uart_wr_req.txData = (uint8_t *)data;
     uart_wr_req.txLen = bytes_remaining;
     uart_wr_req.rxLen = 0;
     uart_wr_req.uart = self->uart_regs;
@@ -394,11 +394,7 @@ size_t common_hal_busio_uart_write(busio_uart_obj_t *self,
 
     // Wait for transaction completion
     while (uart_status[self->uart_id] != UART_FREE) {
-        // Call the handler and abort if errors
-        uart_err = MXC_UART_AsyncHandler(self->uart_regs);
-        if (uart_err != E_NO_ERROR) {
-            MXC_UART_AbortAsync(self->uart_regs);
-        }
+        MXC_UART_AsyncHandler(self->uart_regs);
     }
     // Check for errors from the callback
     if (uart_err != E_NO_ERROR) {
@@ -446,7 +442,7 @@ void common_hal_busio_uart_clear_rx_buffer(busio_uart_obj_t *self) {
 }
 
 bool common_hal_busio_uart_ready_to_tx(busio_uart_obj_t *self) {
-    return !(MXC_UART_GetStatus(self->uart_regs) & (MXC_F_UART_STATUS_TX_BUSY));
+    return !(MXC_UART_GetStatus(self->uart_regs) & (UART_F_STATUS_TX_BUSY));
 }
 
 void common_hal_busio_uart_never_reset(busio_uart_obj_t *self) {

ports/analog/peripherals/max32650/max32_uart.c

@@ -32,3 +32,12 @@ int pinsToUart(const mcu_pin_obj_t *rx, const mcu_pin_obj_t *tx) {
     mp_raise_ValueError_varg(MP_ERROR_TEXT("Invalid %q"), MP_QSTR_pins);
     return -1;
 }
+
+int uart_init(mxc_uart_regs_t *uart, unsigned int baud) {
+    return MXC_UART_Init(uart, baud);
+}
+
+int uart_set_flow_ctrl(mxc_uart_regs_t *uart, bool enable, int rtsThreshold) {
+    mxc_uart_flow_t flow = enable ? MXC_UART_FLOW_EN_LOW : MXC_UART_FLOW_DIS;
+    return MXC_UART_SetFlowCtrl(uart, flow, rtsThreshold);
+}

ports/analog/peripherals/max32650/max32_uart.h

@@ -13,4 +13,11 @@
 
 #define NUM_UARTS 3
 
+// UART register compatibility macro
+#define UART_F_STATUS_TX_BUSY       MXC_F_UART_STAT_TX_BUSY
+
 int pinsToUart(const mcu_pin_obj_t *rx, const mcu_pin_obj_t *tx);
+
+// UART wrappers for portability
+int uart_init(mxc_uart_regs_t *uart, unsigned int baud);
+int uart_set_flow_ctrl(mxc_uart_regs_t *uart, bool enable, int rtsThreshold);

ports/analog/peripherals/max32665/max32_uart.c

@@ -13,7 +13,7 @@
 #include "py/runtime.h"
 #include "py/mperrno.h"
 
-// Assuming the use of MAP_A in MSDK, since all documentation 
+// Assuming the use of MAP_A in MSDK, since all documentation
 // states the GPIO maps are the same
 
 const mxc_gpio_cfg_t uart_maps[NUM_UARTS] = {
@@ -38,3 +38,12 @@ int pinsToUart(const mcu_pin_obj_t *rx, const mcu_pin_obj_t *tx) {
     mp_raise_ValueError_varg(MP_ERROR_TEXT("Invalid %q"), MP_QSTR_pins);
     return -1;
 }
+
+int uart_init(mxc_uart_regs_t *uart, unsigned int baud) {
+    return MXC_UART_Init(uart, baud, MAP_A);
+}
+
+int uart_set_flow_ctrl(mxc_uart_regs_t *uart, bool enable, int rtsThreshold) {
+    mxc_uart_flow_t flow = enable ? MXC_UART_FLOW_EN_LOW : MXC_UART_FLOW_DIS;
+    return MXC_UART_SetFlowCtrl(uart, flow, rtsThreshold, MAP_A);
+}

ports/analog/peripherals/max32665/max32_uart.h

@@ -13,4 +13,11 @@
 
 #define NUM_UARTS 3
 
+// UART register compatibility macro
+#define UART_F_STATUS_TX_BUSY       MXC_F_UART_STATUS_TX_BUSY
+
 int pinsToUart(const mcu_pin_obj_t *rx, const mcu_pin_obj_t *tx);
+
+// UART wrappers for portability
+int uart_init(mxc_uart_regs_t *uart, unsigned int baud);
+int uart_set_flow_ctrl(mxc_uart_regs_t *uart, bool enable, int rtsThreshold);

ports/analog/peripherals/max32690/max32_uart.c

@@ -34,3 +34,12 @@ int pinsToUart(const mcu_pin_obj_t *rx, const mcu_pin_obj_t *tx) {
     mp_raise_ValueError_varg(MP_ERROR_TEXT("Invalid %q"), MP_QSTR_pins);
     return -1;
 }
+
+int uart_init(mxc_uart_regs_t *uart, unsigned int baud) {
+    return MXC_UART_Init(uart, baud, MXC_UART_IBRO_CLK);
+}
+
+int uart_set_flow_ctrl(mxc_uart_regs_t *uart, bool enable, int rtsThreshold) {
+    mxc_uart_flow_t flow = enable ? MXC_UART_FLOW_EN : MXC_UART_FLOW_DIS;
+    return MXC_UART_SetFlowCtrl(uart, flow, rtsThreshold);
+}

ports/analog/peripherals/max32690/max32_uart.h

@@ -13,4 +13,11 @@
 
 #define NUM_UARTS 4
 
+// UART register compatibility macro
+#define UART_F_STATUS_TX_BUSY       MXC_F_UART_STATUS_TX_BUSY
+
 int pinsToUart(const mcu_pin_obj_t *rx, const mcu_pin_obj_t *tx);
+
+// UART Wrappers for compatibility
+int uart_init(mxc_uart_regs_t *uart, unsigned int baud);
+int uart_set_flow_ctrl(mxc_uart_regs_t *uart, bool enable, int rtsThreshold);