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

2 files changed, 13 insertions, 38 deletions

diff --git a/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.c b/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.c
index 67758ff73..d633999ed 100644
--- a/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.c
+++ b/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.c
@@ -87,11 +87,9 @@ static const dacparams_t dma1_ch1_params = {
   .dataoffset   = 0U,

   .regshift     = 0U,

   .regmask      = 0xFFFF0000U,

+  .dmastream    = STM32_DAC_DAC1_CH1_DMA_STREAM,

 #if STM32_DMA_SUPPORTS_DMAMUX

-  .dmachannel   = STM32_DAC_DAC1_CH1_DMA_CHANNEL,

   .peripheral   = STM32_DMAMUX1_DAC1_CH1,

-#else

-  .dmachannel   = STM32_DAC_DAC1_CH1_DMA_STREAM,

 #endif

   .dmamode      = STM32_DMA_CR_CHSEL(DAC1_CH1_DMA_CHANNEL) |

                   STM32_DMA_CR_PL(STM32_DAC_DAC1_CH1_DMA_PRIORITY) |

@@ -108,11 +106,9 @@ static const dacparams_t dma1_ch2_params = {
   .dataoffset   = CHANNEL_DATA_OFFSET,

   .regshift     = 16U,

   .regmask      = 0x0000FFFFU,

+  .dmastream    = STM32_DAC_DAC1_CH2_DMA_STREAM,

 #if STM32_DMA_SUPPORTS_DMAMUX

-  .dmachannel   = STM32_DAC_DAC1_CH2_DMA_CHANNEL,

   .peripheral   = STM32_DMAMUX1_DAC1_CH2,

-#else

-  .dmachannel   = STM32_DAC_DAC1_CH2_DMA_STREAM,

 #endif

   .dmamode      = STM32_DMA_CR_CHSEL(DAC1_CH2_DMA_CHANNEL) |

                   STM32_DMA_CR_PL(STM32_DAC_DAC1_CH2_DMA_PRIORITY) |

@@ -129,11 +125,9 @@ static const dacparams_t dma2_ch1_params = {
   .dataoffset   = 0U,

   .regshift     = 0U,

   .regmask      = 0xFFFF0000U,

+  .dmastream    = STM32_DAC_DAC2_CH1_DMA_STREAM,

 #if STM32_DMA_SUPPORTS_DMAMUX

-  .dmachannel   = STM32_DAC_DAC2_CH1_DMA_CHANNEL,

   .peripheral   = STM32_DMAMUX1_DAC2_CH1,

-#else

-  .dmachannel   = STM32_DAC_DAC2_CH1_DMA_STREAM,

 #endif

   .dmamode      = STM32_DMA_CR_CHSEL(DAC2_CH1_DMA_CHANNEL) |

                   STM32_DMA_CR_PL(STM32_DAC_DAC2_CH1_DMA_PRIORITY) |

@@ -150,11 +144,9 @@ static const dacparams_t dma1_ch2_params = {
   .dataoffset   = CHANNEL_DATA_OFFSET,

   .regshift     = 16U,

   .regmask      = 0x0000FFFFU,

+  .dmastream    = STM32_DAC_DAC2_CH2_DMA_STREAM,

 #if STM32_DMA_SUPPORTS_DMAMUX

-  .dmachannel   = STM32_DAC_DAC2_CH2_DMA_CHANNEL,

   .peripheral   = STM32_DMAMUX1_DAC2_CH2,

-#else

-  .dmachannel   = STM32_DAC_DAC2_CH2_DMA_STREAM,

 #endif

   .dmamode      = STM32_DMA_CR_CHSEL(DAC2_CH2_DMA_CHANNEL) |

                   STM32_DMA_CR_PL(STM32_DAC_DAC2_CH2_DMA_PRIORITY) |

@@ -437,7 +429,7 @@ void dac_lld_start_conversion(DACDriver *dacp) {
   n = dacp->depth * dacp->grpp->num_channels;

 

   /* Allocating the DMA channel.*/

-  dacp->dma = dmaStreamAllocI(dacp->params->dmachannel,

+  dacp->dma = dmaStreamAllocI(dacp->params->dmastream,

                               dacp->params->dmairqprio,

                               (stm32_dmaisr_t)dac_lld_serve_tx_interrupt,

                               (void *)dacp);

@@ -542,7 +534,7 @@ void dac_lld_stop_conversion(DACDriver *dacp) {
 

   /* DMA channel disabled and released.*/

   dmaStreamDisable(dacp->dma);

-  dmaStreamRelease(dacp->dma);

+  dmaStreamFreeI(dacp->dma);

   dacp->dma = NULL;

 

 #if STM32_DAC_DUAL_MODE == FALSE

diff --git a/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.h b/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.h
index e84a250e9..4774c6eef 100644
--- a/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.h
+++ b/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.h
@@ -201,27 +201,6 @@
    reassign streams to different channels.*/

 #if STM32_ADVANCED_DMA

 

-#if STM32_DMA_SUPPORTS_DMAMUX

-

-/* Check on the presence of the DMA channel settings in mcuconf.h.*/

-#if STM32_DAC_USE_DAC1_CH1 && !defined(STM32_DAC_DAC1_CH1_DMA_CHANNEL)

-#error "DAC1 CH1 DMA channel not defined"

-#endif

-

-#if STM32_DAC_USE_DAC1_CH2 && !defined(STM32_DAC_DAC1_CH2_DMA_CHANNEL)

-#error "DAC1 CH2 DMA channel not defined"

-#endif

-

-#if STM32_DAC_USE_DAC2_CH1 && !defined(STM32_DAC_DAC2_CH1_DMA_CHANNEL)

-#error "DAC2 CH1 DMA channel not defined"

-#endif

-

-#if STM32_DAC_USE_DAC2_CH2 && !defined(STM32_DAC_DAC2_CH2_DMA_CHANNEL)

-#error "DAC2 CH2 DMA channel not defined"

-#endif

-

-#else /* !STM32_DMA_SUPPORTS_DMAMUX */

-

 /* Check on the presence of the DMA streams settings in mcuconf.h.*/

 #if STM32_DAC_USE_DAC1_CH1 && !defined(STM32_DAC_DAC1_CH1_DMA_STREAM)

 #error "DAC1 CH1 DMA stream not defined"

@@ -239,7 +218,11 @@
 #error "DAC2 CH2 DMA stream not defined"

 #endif

 

-/* Check on the validity of the assigned DMA channels.*/

+#if STM32_DMA_SUPPORTS_DMAMUX

+

+#else /* !STM32_DMA_SUPPORTS_DMAMUX */

+

+/* Check on the validity of the assigned DMA streams.*/

 #if STM32_DAC_USE_DAC1_CH1 &&                                               \

     !STM32_DMA_IS_VALID_ID(STM32_DAC_DAC1_CH1_DMA_STREAM, STM32_DAC1_CH1_DMA_MSK)

 #error "invalid DMA stream associated to DAC1 CH1"

@@ -332,9 +315,9 @@ typedef struct {
    */

   uint32_t                  regmask;

   /**

-   * @brief   Associated DMA channel.

+   * @brief   Associated DMA stream.

    */

-  uint32_t                  dmachannel;

+  uint32_t                  dmastream;

   /**

    * @brief   Mode bits for the DMA.

    */