"fix" SAM/LLD/SERCOMv1: it'll need a real fix soon

ChibiOS · Jan 20, 2024 · 1ce1880 · 1ce1880
1 parent dc3338e
commit 1ce1880
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 13 deletions.
diff --git a/os/hal/ports/SAM/LLD/SERCOMv1/hal_sio_lld.c b/os/hal/ports/SAM/LLD/SERCOMv1/hal_sio_lld.c
@@ -177,47 +177,47 @@ static inline void usart_enable_tx_end_irq(SIODriver *siop) {
  * @notapi
  */
 void sio_lld_serve_interrupt(SIODriver *siop) {
-  osalDbgAssert(siop->state == SIO_ACTIVE, "invalid state");
+  osalDbgAssert(siop->state == SIO_READY, "invalid state");
   uint8_t intflag = siop->usart->SERCOM_INTFLAG;
   uint8_t intenset = siop->usart->SERCOM_INTENSET;
   uint8_t evtmask = intflag & (SERCOM_USART_INT_INTFLAG_ERROR_Msk | 
                                 SERCOM_USART_INT_INTFLAG_RXBRK_Msk);
   if(evtmask != 0) {
     siop->usart->SERCOM_INTENCLR = (SERCOM_USART_INT_INTENCLR_ERROR_Msk | SERCOM_USART_INT_INTENCLR_RXBRK_Msk);
-    __sio_callback_rx_evt(siop);
+    __sio_callback(siop);
 
     /* Waiting thread woken, if any.*/
-    __sio_wakeup_rx(siop, SIO_MSG_ERRORS);
+    __sio_wakeup_rx(siop);
   }
   if((intflag & SERCOM_USART_INT_INTFLAG_RXC_Msk) && 
     (intenset & SERCOM_USART_INT_INTENSET_RXC_Msk)) {
     siop->usart->SERCOM_INTENCLR = SERCOM_USART_INT_INTENCLR_RXC_Msk;
     /* The callback is invoked if defined.*/
-    __sio_callback_rx(siop);
+    __sio_callback(siop);
 
     /* Waiting thread woken, if any.*/
-    __sio_wakeup_rx(siop, MSG_OK);
+    __sio_wakeup_rx(siop);
   }
   /* TX FIFO is non-full.*/
   if ((intflag & SERCOM_USART_INT_INTFLAG_DRE_Msk) && 
     (intenset & SERCOM_USART_INT_INTENSET_DRE_Msk))  {
     siop->usart->SERCOM_INTENCLR = SERCOM_USART_INT_INTENCLR_DRE_Msk;
     /* The callback is invoked if defined.*/
-    __sio_callback_tx(siop);
+    __sio_callback(siop);
 
     /* Waiting thread woken, if any.*/
-    __sio_wakeup_tx(siop, MSG_OK);
+    __sio_wakeup_tx(siop);
   }
 
   /* Physical transmission end.*/
   if ((intflag & SERCOM_USART_INT_INTFLAG_TXC_Msk) && 
     (intenset & SERCOM_USART_INT_INTENSET_TXC_Msk)) {
     siop->usart->SERCOM_INTENCLR = SERCOM_USART_INT_INTENCLR_TXC_Msk;
     /* The callback is invoked if defined.*/
-    __sio_callback_tx_end(siop);
+    __sio_callback(siop);
 
     /* Waiting thread woken, if any.*/
-    __sio_wakeup_txend(siop, MSG_OK);
+    __sio_wakeup_txend(siop);
   }
 }
 
@@ -533,16 +533,16 @@ sio_events_mask_t  sio_lld_get_and_clear_events(SIODriver *siop) {
   status = (uint8_t)(siop->usart->SERCOM_STATUS);
   irq_status = (uint8_t)(siop->usart->SERCOM_INTFLAG);
   if(status & SERCOM_USART_INT_STATUS_BUFOVF_Msk) {
-    evtmask |= SIO_OVERRUN_ERROR;
+    evtmask |= SD_OVERRUN_ERROR;
   }
   if(status & SERCOM_USART_INT_STATUS_FERR_Msk) {
-    evtmask |= SIO_FRAMING_ERROR;
+    evtmask |= SD_FRAMING_ERROR;
   }
   if(status & SERCOM_USART_INT_STATUS_PERR_Msk) {
-    evtmask |= SIO_PARITY_ERROR;
+    evtmask |= SD_PARITY_ERROR;
   }
   if(irq_status & SERCOM_USART_INT_INTFLAG_RXBRK_Msk) {
-    evtmask |= SIO_BREAK_DETECTED;
+    evtmask |= SD_BREAK_DETECTED;
     irq_status |= SERCOM_USART_INT_INTFLAG_RXBRK_Msk;
   }
 
@@ -690,6 +690,15 @@ msg_t sio_lld_control(SIODriver *siop, unsigned int operation, void *arg) {
   return MSG_OK;
 }
 
+/**
+ * @brief   Enable flags change notification.
+ *
+ * @param[in] siop      pointer to the @p SIODriver object
+ */
+void sio_lld_update_enable_flags(SIODriver *siop) {
+
+  (void)siop;
+ }
 
 #endif /* HAL_USE_SIO == TRUE */
 

diff --git a/os/hal/ports/SAM/LLD/SERCOMv1/hal_sio_lld.h b/os/hal/ports/SAM/LLD/SERCOMv1/hal_sio_lld.h
@@ -208,6 +208,20 @@ typedef uint32_t sio_events_mask_t;
 #define sio_lld_is_tx_ongoing(siop) !((siop->usart->SERCOM_INTFLAG & SERCOM_USART_INT_INTFLAG_TXC_Msk) == \
                                     SERCOM_USART_INT_INTFLAG_TXC_Msk)
 
+/**
+ * @brief   Determines if RX has pending error events to be read and cleared.
+ * @note    Only error and protocol errors are handled, data events are not
+ *          considered.
+ *
+ * @param[in] siop      pointer to the @p SIODriver object
+ * @return              The RX error events.
+ * @retval false        if RX has no pending events
+ * @retval true         if RX has pending events
+ *
+ * @notapi
+ */
+#define sio_lld_has_rx_errors(siop) false
+
 /*===========================================================================*/
 /* External declarations.                                                    */
 /*===========================================================================*/