Mass update of all drivers to use the new DMA API. What could possibly go wrong?

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12521 110e8d01-0319-4d1e-a829-52ad28d1bb01

1 files changed, 9 insertions, 9 deletions

diff --git a/os/hal/ports/STM32/LLD/ADCv1/hal_adc_lld.c b/os/hal/ports/STM32/LLD/ADCv1/hal_adc_lld.c
index 0f4397a98..862499ed4 100644
--- a/os/hal/ports/STM32/LLD/ADCv1/hal_adc_lld.c
+++ b/os/hal/ports/STM32/LLD/ADCv1/hal_adc_lld.c
@@ -136,8 +136,8 @@ void adc_lld_init(void) {
 #if STM32_ADC_USE_ADC1

   /* Driver initialization.*/

   adcObjectInit(&ADCD1);

-  ADCD1.adc = ADC1;

-  ADCD1.dmastp  = STM32_DMA_STREAM(STM32_ADC_ADC1_DMA_STREAM);

+  ADCD1.adc     = ADC1;

+  ADCD1.dmastp  = NULL;

   ADCD1.dmamode = STM32_DMA_CR_CHSEL(ADC1_DMA_CHANNEL) |

                   STM32_DMA_CR_PL(STM32_ADC_ADC1_DMA_PRIORITY) |

                   STM32_DMA_CR_DIR_P2M |

@@ -183,12 +183,11 @@ void adc_lld_start(ADCDriver *adcp) {
   if (adcp->state == ADC_STOP) {

 #if STM32_ADC_USE_ADC1

     if (&ADCD1 == adcp) {

-      bool b;

-      b = dmaStreamAllocate(adcp->dmastp,

-                            STM32_ADC_ADC1_DMA_IRQ_PRIORITY,

-                            (stm32_dmaisr_t)adc_lld_serve_rx_interrupt,

-                            (void *)adcp);

-      osalDbgAssert(!b, "stream already allocated");

+      adcp->dmastp = dmaStreamAllocI(STM32_ADC_ADC1_DMA_STREAM,

+                                     STM32_ADC_ADC1_DMA_IRQ_PRIORITY,

+                                     (stm32_dmaisr_t)adc_lld_serve_rx_interrupt,

+                                     (void *)adcp);

+      osalDbgAssert(adcp->dmastp != NULL, "unable to allocate stream");

       dmaStreamSetPeripheral(adcp->dmastp, &ADC1->DR);

       rccEnableADC1(true);

 

@@ -217,7 +216,8 @@ void adc_lld_stop(ADCDriver *adcp) {
   /* If in ready state then disables the ADC clock and analog part.*/

   if (adcp->state == ADC_READY) {

 

-    dmaStreamRelease(adcp->dmastp);

+    dmaStreamFreeI(adcp->dmastp);

+    adcp->dmastp = NULL;

 

     /* Restoring CCR default.*/

 #if STM32_ADC_SUPPORTS_PRESCALER