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, 22 insertions, 34 deletions

diff --git a/os/hal/ports/STM32/LLD/CRYPv1/hal_crypto_lld.c b/os/hal/ports/STM32/LLD/CRYPv1/hal_crypto_lld.c
index 6fa067332..e4ea48940 100644
--- a/os/hal/ports/STM32/LLD/CRYPv1/hal_crypto_lld.c
+++ b/os/hal/ports/STM32/LLD/CRYPv1/hal_crypto_lld.c
@@ -157,11 +157,7 @@ void cry_lld_init(void) {
 #if STM32_CRY_USE_HASH1

 #if STM32_CRY_HASH_SIZE_THRESHOLD != 0

   CRYD1.hash_tr     = NULL;

-#if STM32_DMA_SUPPORTS_DMAMUX

-  CRYD1.dma_hash    = STM32_DMA_STREAM(STM32_CRY_HASH1_DMA_CHANNEL);

-#else

-  CRYD1.dma_hash    = STM32_DMA_STREAM(STM32_CRY_HASH1_DMA_STREAM);

-#endif

+  CRYD1.dma_hash    = NULL;

 #endif /* STM32_CRY_HASH_SIZE_THRESHOLD != 0 */

 #endif /* STM32_CRY_USE_HASH1 */

 

@@ -187,12 +183,11 @@ void cry_lld_start(CRYDriver *cryp) {
 

 #if STM32_CRY_USE_HASH1

 #if STM32_CRY_HASH_SIZE_THRESHOLD != 0

-      bool b;

-      b = dmaStreamAllocate(cryp->dma_hash,

-                            STM32_CRY_HASH1_IRQ_PRIORITY,

-                            (stm32_dmaisr_t)cry_lld_serve_hash_interrupt,

-                            (void *)cryp);

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

+      cryp->dma_hash = dmaStreamAllocI(STM32_CRY_HASH1_DMA_STREAM,

+                                       STM32_CRY_HASH1_IRQ_PRIORITY,

+                                       (stm32_dmaisr_t)cry_lld_serve_hash_interrupt,

+                                       (void *)cryp);

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

 

       /* Preparing the DMA channel.*/

       dmaStreamSetMode(cryp->dma_hash,

@@ -241,7 +236,8 @@ void cry_lld_stop(CRYDriver *cryp) {
 

 #if STM32_CRY_USE_HASH1

 #if STM32_CRY_HASH_SIZE_THRESHOLD != 0

-      dmaStreamRelease(cryp->dma_hash);

+      dmaStreamFreeI(cryp->dma_hash);

+      cryp->dma_hash = NULL;

 #endif

       rccDisableHASH();

 #endif

diff --git a/os/hal/ports/STM32/LLD/CRYPv1/hal_crypto_lld.h b/os/hal/ports/STM32/LLD/CRYPv1/hal_crypto_lld.h
index bde137f73..b4e436326 100644
--- a/os/hal/ports/STM32/LLD/CRYPv1/hal_crypto_lld.h
+++ b/os/hal/ports/STM32/LLD/CRYPv1/hal_crypto_lld.h
@@ -138,37 +138,29 @@
 #error "Invalid IRQ priority assigned to CRYP1"

 #endif

 

-/* Devices with DMAMUX require a different kind of check.*/

-#if STM32_DMA_SUPPORTS_DMAMUX

-

-#if STM32_CRY_USE_HASH1

-#if !defined(STM32_CRY_HASH1_DMA_CHANNEL)

-#error "HASH1 DMA channel not defined"

-#endif

-#if !STM32_DMA_IS_VALID_CHANNEL(STM32_CRY_HASH1_DMA_CHANNEL)

-#error "Invalid DMA channel assigned to HASH1"

-#endif

-#if !STM32_DMA_IS_VALID_PRIORITY(STM32_CRY_HASH1_DMA_PRIORITY)

-#error "Invalid DMA priority assigned to HASH1"

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

+#if !defined(STM32_CRY_HASH1_DMA_STREAM)

+#error "HASH1 DMA streams not defined"

 #endif

-#endif /* !STM32_CRY_USE_HASH1 */

-

-#else /* !STM32_DMA_SUPPORTS_DMAMUX */

 

 /* Sanity checks on DMA streams settings in mcuconf.h.*/

-#if STM32_CRY_USE_HASH1

-#if !defined(STM32_CRY_HASH1_DMA_STREAM)

-#error "HASH1 DMA streams not defined"

+#if STM32_CRY_USE_HASH1 &&                                                  \

+    !STM32_DMA_IS_VALID_STREAM(STM32_CRY_HASH1_DMA_STREAM)

+#error "Invalid DMA stream assigned to HASH1"

 #endif

-#if !STM32_DMA_IS_VALID_ID(STM32_CRY_HASH1_DMA_STREAM, STM32_HASH1_DMA_MSK)

+

+/* Devices without DMAMUX require an additional check.*/

+#if !STM32_DMA_SUPPORTS_DMAMUX

+#if STM32_CRY_USE_HASH1 &&                                                  \

+    !STM32_DMA_IS_VALID_ID(STM32_CRY_HASH1_DMA_STREAM, STM32_HASH1_DMA_MSK)

 #error "invalid DMA stream associated to HASH1"

 #endif

+#endif /* !STM32_DMA_SUPPORTS_DMAMUX */

+

+/* DMA priority check.*/

 #if !STM32_DMA_IS_VALID_PRIORITY(STM32_CRY_HASH1_DMA_PRIORITY)

 #error "Invalid DMA priority assigned to HASH1"

 #endif

-#endif /* !STM32_CRY_USE_HASH1 */

-

-#endif /* !STM32_DMA_SUPPORTS_DMAMUX */

 

 #if !defined(STM32_DMA_REQUIRED)

 #define STM32_DMA_REQUIRED