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, 25 insertions, 25 deletions

diff --git a/os/hal/ports/STM32/LLD/ADCv2/hal_adc_lld.c b/os/hal/ports/STM32/LLD/ADCv2/hal_adc_lld.c
index ab3fbf462..c983ee372 100644
--- a/os/hal/ports/STM32/LLD/ADCv2/hal_adc_lld.c
+++ b/os/hal/ports/STM32/LLD/ADCv2/hal_adc_lld.c
@@ -194,8 +194,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 |

@@ -207,8 +207,8 @@ void adc_lld_init(void) {
 #if STM32_ADC_USE_ADC2

   /* Driver initialization.*/

   adcObjectInit(&ADCD2);

-  ADCD2.adc = ADC2;

-  ADCD2.dmastp  = STM32_DMA_STREAM(STM32_ADC_ADC2_DMA_STREAM);

+  ADCD2.adc     = ADC2;

+  ADCD2.dmastp  = NULL;

   ADCD2.dmamode = STM32_DMA_CR_CHSEL(ADC2_DMA_CHANNEL) |

                   STM32_DMA_CR_PL(STM32_ADC_ADC2_DMA_PRIORITY) |

                   STM32_DMA_CR_DIR_P2M |

@@ -220,8 +220,8 @@ void adc_lld_init(void) {
 #if STM32_ADC_USE_ADC3

   /* Driver initialization.*/

   adcObjectInit(&ADCD3);

-  ADCD3.adc = ADC3;

-  ADCD3.dmastp  = STM32_DMA_STREAM(STM32_ADC_ADC3_DMA_STREAM);

+  ADCD3.adc     = ADC3;

+  ADCD3.dmastp  = NULL;

   ADCD3.dmamode = STM32_DMA_CR_CHSEL(ADC3_DMA_CHANNEL) |

                   STM32_DMA_CR_PL(STM32_ADC_ADC3_DMA_PRIORITY) |

                   STM32_DMA_CR_DIR_P2M |

@@ -248,12 +248,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);

     }

@@ -261,12 +260,11 @@ void adc_lld_start(ADCDriver *adcp) {
 

 #if STM32_ADC_USE_ADC2

     if (&ADCD2 == adcp) {

-      bool b;

-      b = dmaStreamAllocate(adcp->dmastp,

-                            STM32_ADC_ADC2_DMA_IRQ_PRIORITY,

-                            (stm32_dmaisr_t)adc_lld_serve_rx_interrupt,

-                            (void *)adcp);

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

+      adcp->dmastp = dmaStreamAllocI(STM32_ADC_ADC2_DMA_STREAM,

+                                     STM32_ADC_ADC2_DMA_IRQ_PRIORITY,

+                                     (stm32_dmaisr_t)adc_lld_serve_rx_interrupt,

+                                     (void *)adcp);

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

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

       rccEnableADC2(true);

     }

@@ -274,12 +272,11 @@ void adc_lld_start(ADCDriver *adcp) {
 

 #if STM32_ADC_USE_ADC3

     if (&ADCD3 == adcp) {

-      bool b;

-      b = dmaStreamAllocate(adcp->dmastp,

-                            STM32_ADC_ADC3_DMA_IRQ_PRIORITY,

-                            (stm32_dmaisr_t)adc_lld_serve_rx_interrupt,

-                            (void *)adcp);

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

+      adcp->dmastp = dmaStreamAllocI(STM32_ADC_ADC3_DMA_STREAM,

+                                     STM32_ADC_ADC3_DMA_IRQ_PRIORITY,

+                                     (stm32_dmaisr_t)adc_lld_serve_rx_interrupt,

+                                     (void *)adcp);

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

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

       rccEnableADC3(true);

     }

@@ -309,7 +306,10 @@ void adc_lld_stop(ADCDriver *adcp) {
 

   /* If in ready state then disables the ADC clock.*/

   if (adcp->state == ADC_READY) {

-    dmaStreamRelease(adcp->dmastp);

+

+    dmaStreamFreeI(adcp->dmastp);

+    adcp->dmastp = NULL;

+

     adcp->adc->CR1 = 0;

     adcp->adc->CR2 = 0;