pbio/drv/uart: Convert exit to stop.

We can use this to stop UART operations per port, to support multimodal ports.

Author: laurensvalk

lib/pbio/drv/uart/uart_stm32f0.c

@@ -205,12 +205,9 @@ void pbdrv_uart_stm32f0_handle_irq(uint8_t id) {
     }
 }
 
-// Currently not used
-void handle_exit(void) {
-    for (int i = 0; i < PBDRV_CONFIG_UART_STM32F0_NUM_UART; i++) {
-        pbdrv_uart_t *uart = &pbdrv_uart[i];
-        NVIC_DisableIRQ(uart->irq);
-    }
+void pbdrv_uart_stop(pbdrv_uart_dev_t *uart_dev) {
+    pbdrv_uart_t *uart = PBIO_CONTAINER_OF(uart_dev, pbdrv_uart_t, uart_dev);
+    NVIC_DisableIRQ(uart->irq);
 }
 
 void pbdrv_uart_init(void) {

lib/pbio/drv/uart/uart_stm32f4_ll_irq.c

@@ -243,13 +243,10 @@ void pbdrv_uart_stm32f4_ll_irq_handle_irq(uint8_t id) {
     }
 }
 
-// Currently not used
-void handle_exit(void) {
-    for (int i = 0; i < PBDRV_CONFIG_UART_STM32F4_LL_IRQ_NUM_UART; i++) {
-        const pbdrv_uart_stm32f4_ll_irq_platform_data_t *pdata = &pbdrv_uart_stm32f4_ll_irq_platform_data[i];
-        LL_USART_Disable(pdata->uart);
-        NVIC_DisableIRQ(pdata->irq);
-    }
+void pbdrv_uart_stop(pbdrv_uart_dev_t *uart_dev) {
+    pbdrv_uart_t *uart = PBIO_CONTAINER_OF(uart_dev, pbdrv_uart_t, uart_dev);
+    LL_USART_Disable(uart->pdata->uart);
+    NVIC_DisableIRQ(uart->pdata->irq);
 }
 
 void pbdrv_uart_init(void) {

lib/pbio/drv/uart/uart_stm32l4_ll_dma.c

@@ -369,16 +369,15 @@ void pbdrv_uart_stm32l4_ll_dma_handle_uart_irq(uint8_t id) {
 }
 
 // Currently not used
-void handle_exit(void) {
-    for (int i = 0; i < PBDRV_CONFIG_UART_STM32L4_LL_DMA_NUM_UART; i++) {
-        const pbdrv_uart_stm32l4_ll_dma_platform_data_t *pdata = &pbdrv_uart_stm32l4_ll_dma_platform_data[i];
-        LL_USART_Disable(pdata->uart);
-        LL_DMA_DisableChannel(pdata->rx_dma, pdata->rx_dma_ch);
-        LL_DMA_DisableChannel(pdata->tx_dma, pdata->tx_dma_ch);
-        NVIC_DisableIRQ(pdata->uart_irq);
-        NVIC_DisableIRQ(pdata->rx_dma_irq);
-        NVIC_DisableIRQ(pdata->tx_dma_irq);
-    }
+void pbdrv_uart_stop(pbdrv_uart_dev_t *uart_dev) {
+    pbdrv_uart_t *uart = PBIO_CONTAINER_OF(uart_dev, pbdrv_uart_t, uart_dev);
+    const pbdrv_uart_stm32l4_ll_dma_platform_data_t *pdata = uart->pdata;
+    LL_USART_Disable(pdata->uart);
+    LL_DMA_DisableChannel(pdata->rx_dma, pdata->rx_dma_ch);
+    LL_DMA_DisableChannel(pdata->tx_dma, pdata->tx_dma_ch);
+    NVIC_DisableIRQ(pdata->uart_irq);
+    NVIC_DisableIRQ(pdata->rx_dma_irq);
+    NVIC_DisableIRQ(pdata->tx_dma_irq);
 }
 
 void pbdrv_uart_init(void) {

lib/pbio/include/pbdrv/uart.h

@@ -20,20 +20,15 @@ typedef struct {
 
 } pbdrv_uart_dev_t;
 
-typedef void (*pbdrv_uart_poll_callback_t)(pbdrv_uart_dev_t *uart);
+typedef void (*pbdrv_uart_poll_callback_t)(pbdrv_uart_dev_t *uart_dev);
 
 #if PBDRV_CONFIG_UART
 
 pbio_error_t pbdrv_uart_get(uint8_t id, pbdrv_uart_dev_t **uart_dev);
 
-/**
- * Sets the baud rate.
- * @param [in]  uart    The UART device
- * @param [in]  baud    The baud rate
- * @return              ::PBIO_SUCCESS if the baud rate was set or
- */
-void pbdrv_uart_set_baud_rate(pbdrv_uart_dev_t *uart, uint32_t baud);
-void pbdrv_uart_flush(pbdrv_uart_dev_t *uart);
+void pbdrv_uart_set_baud_rate(pbdrv_uart_dev_t *uart_dev, uint32_t baud);
+void pbdrv_uart_stop(pbdrv_uart_dev_t *uart_dev);
+void pbdrv_uart_flush(pbdrv_uart_dev_t *uart_dev);
 void pbdrv_uart_set_poll_callback(pbdrv_uart_dev_t *uart_dev, pbdrv_uart_poll_callback_t callback);
 
 PT_THREAD(pbdrv_uart_read(struct pt *pt, pbdrv_uart_dev_t *uart_dev, uint8_t *msg, uint8_t length, uint32_t timeout, pbio_error_t *err));
@@ -45,23 +40,25 @@ static inline pbio_error_t pbdrv_uart_get(uint8_t id, pbdrv_uart_dev_t **uart_de
     *uart_dev = NULL;
     return PBIO_ERROR_NOT_SUPPORTED;
 }
-static inline void pbdrv_uart_set_baud_rate(pbdrv_uart_dev_t *uart, uint32_t baud) {
+static inline void pbdrv_uart_set_baud_rate(pbdrv_uart_dev_t *uart_dev, uint32_t baud) {
+}
+static inline void pbdrv_uart_stop(pbdrv_uart_dev_t *uart_dev) {
 }
-static inline pbio_error_t pbdrv_uart_read_begin(pbdrv_uart_dev_t *uart, uint8_t *msg, uint8_t length, uint32_t timeout) {
+static inline pbio_error_t pbdrv_uart_read_begin(pbdrv_uart_dev_t *uart_dev, uint8_t *msg, uint8_t length, uint32_t timeout) {
     return PBIO_ERROR_NOT_SUPPORTED;
 }
-static inline pbio_error_t pbdrv_uart_read_end(pbdrv_uart_dev_t *uart) {
+static inline pbio_error_t pbdrv_uart_read_end(pbdrv_uart_dev_t *uart_dev) {
     return PBIO_ERROR_NOT_SUPPORTED;
 }
-static inline pbio_error_t pbdrv_uart_write_begin(pbdrv_uart_dev_t *uart, uint8_t *msg, uint8_t length, uint32_t timeout) {
+static inline pbio_error_t pbdrv_uart_write_begin(pbdrv_uart_dev_t *uart_dev, uint8_t *msg, uint8_t length, uint32_t timeout) {
     return PBIO_ERROR_NOT_SUPPORTED;
 }
-static inline pbio_error_t pbdrv_uart_write_end(pbdrv_uart_dev_t *uart) {
+static inline pbio_error_t pbdrv_uart_write_end(pbdrv_uart_dev_t *uart_dev) {
     return PBIO_ERROR_NOT_SUPPORTED;
 }
-static inline void pbdrv_uart_write_cancel(pbdrv_uart_dev_t *uart) {
+static inline void pbdrv_uart_write_cancel(pbdrv_uart_dev_t *uart_dev) {
 }
-static inline void pbdrv_uart_flush(pbdrv_uart_dev_t *uart) {
+static inline void pbdrv_uart_flush(pbdrv_uart_dev_t *uart_dev) {
 }
 static inline void pbdrv_uart_set_poll_callback(pbdrv_uart_poll_callback_t callback) {
 }