Fixed bugs #445 and #446.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6560 35acf78f-673a-0410-8e92-d51de3d6d3f4

1 files changed, 9 insertions, 9 deletions

diff --git a/os/hal/platforms/STM32F37x/adc_lld.c b/os/hal/platforms/STM32F37x/adc_lld.c
index 9e8162933..cd8467f21 100644
--- a/os/hal/platforms/STM32F37x/adc_lld.c
+++ b/os/hal/platforms/STM32F37x/adc_lld.c
@@ -157,14 +157,14 @@ static void adc_lld_serve_dma_interrupt(ADCDriver *adcp, uint32_t flags) {
     /* It is possible that the conversion group has already be reset by the

        ADC error handler, in this case this interrupt is spurious.*/

     if (adcp->grpp != NULL) {

-      if ((flags & STM32_DMA_ISR_HTIF) != 0) {

-        /* Half transfer processing.*/

-        _adc_isr_half_code(adcp);

-      }

       if ((flags & STM32_DMA_ISR_TCIF) != 0) {

         /* Transfer complete processing.*/

         _adc_isr_full_code(adcp);

       }

+      else if ((flags & STM32_DMA_ISR_HTIF) != 0) {

+        /* Half transfer processing.*/

+        _adc_isr_half_code(adcp);

+      }

     }

   }

 }

@@ -528,11 +528,11 @@ void adc_lld_start_conversion(ADCDriver *adcp) {
   mode = adcp->dmamode;

   if (grpp->circular) {

     mode |= STM32_DMA_CR_CIRC;

-  }

-  if (adcp->depth > 1) {

-    /* If the buffer depth is greater than one then the half transfer interrupt

-       interrupt is enabled in order to allows streaming processing.*/

-    mode |= STM32_DMA_CR_HTIE;

+    if (adcp->depth > 1) {

+      /* If circular buffer depth > 1, then the half transfer interrupt

+         is enabled in order to allow streaming processing.*/

+      mode |= STM32_DMA_CR_HTIE;

+    }

   }

   dmaStreamSetMemory0(adcp->dmastp, adcp->samples);

   dmaStreamSetTransactionSize(adcp->dmastp,