Update ADC v1/2, USART v2, SDIO LLD drivers.

HorrorTroll · HorrorTroll · commit 7e29212c2032 · 2026-01-14T00:06:16.000+07:00
diff --git a/os/hal/ports/AT32/LLD/ADCv1/hal_adc_lld.c b/os/hal/ports/AT32/LLD/ADCv1/hal_adc_lld.c
@@ -1,7 +1,7 @@
 /*
     ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
-    ChibiOS - Copyright (C) 2023..2025 HorrorTroll
-    ChibiOS - Copyright (C) 2023..2025 Zhaqian
+    ChibiOS - Copyright (C) 2023..2026 HorrorTroll
+    ChibiOS - Copyright (C) 2023..2026 Zhaqian
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -265,6 +265,7 @@ void adc_lld_start_conversion(ADCDriver *adcp) {
          is enabled in order to allow streaming processing.*/
       mode |= AT32_DMA_CCTRL_HDTIEN;
     }
+    ctrl2 = 0U;
   }
   dmaStreamSetMemory0(adcp->dmastp, adcp->samples);
   dmaStreamSetTransactionSize(adcp->dmastp, (uint32_t)grpp->num_channels *
@@ -286,10 +287,12 @@ void adc_lld_start_conversion(ADCDriver *adcp) {
   adcp->adc->CTRL1 = grpp->ctrl1 | ADC_CTRL1_SQEN;
 
   /* Enforcing the mandatory bits in CTRL2.*/
-  ctrl2 = grpp->ctrl2 | ADC_CTRL2_OCDMAEN | ADC_CTRL2_ADCEN;
+  ctrl2 |= grpp->ctrl2 | ADC_CTRL2_OCDMAEN | ADC_CTRL2_ADCEN;
 
-  if ((ctrl2 & (ADC_CTRL2_OCTEN | ADC_CTRL2_PCTEN)) == 0)
+  if ((ctrl2 & (ADC_CTRL2_OCTEN | ADC_CTRL2_PCTEN)) == 0) {
     ctrl2 |= ADC_CTRL2_RPEN;
+  }
+
   adcp->adc->CTRL2 = grpp->ctrl2 | ctrl2;
 
   /* ADC start by writing ADC_CTRL2_ADCEN a second time.*/
diff --git a/os/hal/ports/AT32/LLD/ADCv2/hal_adc_lld.c b/os/hal/ports/AT32/LLD/ADCv2/hal_adc_lld.c
@@ -1,8 +1,8 @@
 /*
     ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
-    ChibiOS - Copyright (C) 2023..2025 HorrorTroll
-    ChibiOS - Copyright (C) 2023..2025 Zhaqian
-    ChibiOS - Copyright (C) 2024..2025 Maxjta
+    ChibiOS - Copyright (C) 2023..2026 HorrorTroll
+    ChibiOS - Copyright (C) 2023..2026 Zhaqian
+    ChibiOS - Copyright (C) 2024..2026 Maxjta
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -273,6 +273,7 @@ void adc_lld_start_conversion(ADCDriver *adcp) {
          is enabled in order to allow streaming processing.*/
       mode |= AT32_DMA_CCTRL_HDTIEN;
     }
+    ctrl2 = 0U;
   }
   dmaStreamSetMemory0(adcp->dmastp, adcp->samples);
   dmaStreamSetTransactionSize(adcp->dmastp, (uint32_t)grpp->num_channels *
@@ -294,10 +295,12 @@ void adc_lld_start_conversion(ADCDriver *adcp) {
   adcp->adc->CTRL1 = grpp->ctrl1 | ADC_CTRL1_SQEN;
 
   /* Enforcing the mandatory bits in CTRL2.*/
-  ctrl2 = grpp->ctrl2 | ADC_CTRL2_OCDMAEN | ADC_CTRL2_ADCEN;
+  ctrl2 |= grpp->ctrl2 | ADC_CTRL2_OCDMAEN | ADC_CTRL2_ADCEN;
 
-  if ((ctrl2 & (ADC_CTRL2_OCTEN | ADC_CTRL2_PCTEN)) == 0)
+  if ((ctrl2 & (ADC_CTRL2_OCTEN | ADC_CTRL2_PCTEN)) == 0) {
     ctrl2 |= ADC_CTRL2_RPEN;
+  }
+
   adcp->adc->CTRL2 = grpp->ctrl2 | ctrl2;
 
   /* ADC start by writing ADC_CTRL2_ADCEN a second time.*/
diff --git a/os/hal/ports/AT32/LLD/SDIOv1/hal_sdc_lld.c b/os/hal/ports/AT32/LLD/SDIOv1/hal_sdc_lld.c
@@ -1,7 +1,7 @@
 /*
     ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
-    ChibiOS - Copyright (C) 2023..2025 HorrorTroll
-    ChibiOS - Copyright (C) 2023..2025 Zhaqian
+    ChibiOS - Copyright (C) 2023..2026 HorrorTroll
+    ChibiOS - Copyright (C) 2023..2026 Zhaqian
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -278,22 +278,22 @@ static bool sdc_lld_wait_transaction_end(SDCDriver *sdcp, uint32_t n,
     osalThreadSuspendS(&sdcp->thread);
   }
 
-  /* Stopping operations, waiting for transfer completion at DMA level, then
-     the stream is disabled and cleared.*/
-  dmaWaitCompletion(sdcp->dma);
-  sdcp->sdio->INTEN  = 0U;
-  sdcp->sdio->DTCTRL = 0U;
+  /* Mask has now been set to zero by interrupt handler. */
+  osalSysUnlock();
 
+  /* Data transfer not complete, let error cleanup stop DMA.*/
   if ((sdcp->sdio->STS & SDIO_STS_DTCMPL) == 0) {
-    osalSysUnlock();
     return HAL_FAILED;
   }
 
+  /* Waiting for transfer completion at DMA level, then the stream is disabled
+     and cleared.*/
+  dmaWaitCompletion(sdcp->dma);
+  sdcp->sdio->DTCTRL = 0U;
+
   /* Clearing status.*/
   sdcp->sdio->INTCLR = SDIO_INTCLR_ALL_FLAGS;
 
-  osalSysUnlock();
-
   /* Finalize transaction.*/
   if (n > 1U)
     return sdc_lld_send_cmd_short_crc(sdcp, MMCSD_CMD_STOP_TRANSMISSION, 0, resp);
@@ -766,16 +766,16 @@ bool sdc_lld_read_aligned(SDCDriver *sdcp, uint32_t startblk,
                        SDIO_INTEN_DTCMPLIEN;
   sdcp->sdio->DTLEN  = blocks * MMCSD_BLOCK_SIZE;
 
+  if (sdc_lld_prepare_read(sdcp, startblk, blocks, resp) == true)
+    goto error;
+
   /* Transaction starts just after TFREN bit setting.*/
   sdcp->sdio->DTCTRL = SDIO_DTCTRL_TFRDIR |
                        SDIO_DTCTRL_BLKSIZE_3 |
                        SDIO_DTCTRL_BLKSIZE_0 |
                        SDIO_DTCTRL_DMAEN |
                        SDIO_DTCTRL_TFREN;
 
-  if (sdc_lld_prepare_read(sdcp, startblk, blocks, resp) == true)
-    goto error;
-
   if (sdc_lld_wait_transaction_end(sdcp, blocks, resp) == true)
     goto error;
 
diff --git a/os/hal/ports/AT32/LLD/SDIOv1/hal_sdc_lld.h b/os/hal/ports/AT32/LLD/SDIOv1/hal_sdc_lld.h
@@ -1,7 +1,7 @@
 /*
     ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
-    ChibiOS - Copyright (C) 2023..2025 HorrorTroll
-    ChibiOS - Copyright (C) 2023..2025 Zhaqian
+    ChibiOS - Copyright (C) 2023..2026 HorrorTroll
+    ChibiOS - Copyright (C) 2023..2026 Zhaqian
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -123,18 +123,6 @@
 #define AT32_DMA_REQUIRED
 #endif
 
-/*
- * SDIO clock divider.
- */
-#if AT32_HCLK > 48000000
-#define AT32_SDIO_DIV_HS                    1
-#define AT32_SDIO_DIV_LS                    178
-#else
-
-#define AT32_SDIO_DIV_HS                    0
-#define AT32_SDIO_DIV_LS                    118
-#endif
-
 /*===========================================================================*/
 /* Driver data structures and types.                                         */
 /*===========================================================================*/
diff --git a/os/hal/ports/AT32/LLD/USARTv2/hal_sio_lld.c b/os/hal/ports/AT32/LLD/USARTv2/hal_sio_lld.c
@@ -1,7 +1,7 @@
 /*
     ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
-    ChibiOS - Copyright (C) 2023..2025 HorrorTroll
-    ChibiOS - Copyright (C) 2023..2025 Zhaqian
+    ChibiOS - Copyright (C) 2023..2026 HorrorTroll
+    ChibiOS - Copyright (C) 2023..2026 Zhaqian
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -553,7 +553,7 @@ sioevents_t sio_lld_get_events(SIODriver *siop) {
  * @param[in] buffer        pointer to the buffer for read frames
  * @param[in] n             maximum number of frames to be read
  * @return                  The number of frames copied from the buffer.
- * @retval 0                if the TX FIFO is full.
+ * @retval 0                if the RX FIFO is empty.
  */
 size_t sio_lld_read(SIODriver *siop, uint8_t *buffer, size_t n) {
   size_t rd;
@@ -732,7 +732,7 @@ void sio_lld_serve_interrupt(SIODriver *siop) {
     /* If there are no errors then we check for the other RX-related
        status flags.*/
     else {
-      /* Idle RX flag.*/
+      /* Idle RX flag. Note: At start the USART will produce an IDLEF interrupt.*/
       if ((sts & USART_STS_IDLEF) != 0U) {
 
         /* Interrupt source disabled.*/
