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

7 files changed, 13 insertions, 1 deletions

diff --git a/os/hal/platforms/STM32/sdc_lld.c b/os/hal/platforms/STM32/sdc_lld.c
index 119a2e23d..3d6d6bfd3 100644
--- a/os/hal/platforms/STM32/sdc_lld.c
+++ b/os/hal/platforms/STM32/sdc_lld.c
@@ -339,7 +339,7 @@ void sdc_lld_start(SDCDriver *sdcp) {
     /* Note, the DMA must be enabled before the IRQs.*/

     bool_t b;

     b = dmaStreamAllocate(sdcp->dma, STM32_SDC_SDIO_IRQ_PRIORITY, NULL, NULL);

-    chDbgAssert(!b, "i2c_lld_start(), #3", "stream already allocated");

+    chDbgAssert(!b, "sdc_lld_start(), #1", "stream already allocated");

     dmaStreamSetPeripheral(sdcp->dma, &SDIO->FIFO);

 #if (defined(STM32F4XX) || defined(STM32F2XX))

     dmaStreamSetFIFO(sdcp->dma, STM32_DMA_FCR_DMDIS | STM32_DMA_FCR_FTH_FULL);

diff --git a/os/hal/platforms/STM32F0xx/stm32_dma.h b/os/hal/platforms/STM32F0xx/stm32_dma.h
index b7a07d6ea..61838a2c9 100644
--- a/os/hal/platforms/STM32F0xx/stm32_dma.h
+++ b/os/hal/platforms/STM32F0xx/stm32_dma.h
@@ -301,6 +301,8 @@ typedef void (*stm32_dmaisr_t)(void *p, uint32_t flags);
  * @details The function disables the specified stream and then clears any

  *          pending interrupt.

  * @note    This function can be invoked in both ISR or thread context.

+ * @note    Interrupts enabling flags are set to zero after this call, see

+ *          bug 3607518.

  * @pre     The stream must have been allocated using @p dmaStreamAllocate().

  * @post    After use the stream can be released using @p dmaStreamRelease().

  *

diff --git a/os/hal/platforms/STM32F1xx/stm32_dma.h b/os/hal/platforms/STM32F1xx/stm32_dma.h
index a0766ab06..046155bbb 100644
--- a/os/hal/platforms/STM32F1xx/stm32_dma.h
+++ b/os/hal/platforms/STM32F1xx/stm32_dma.h
@@ -312,6 +312,8 @@ typedef void (*stm32_dmaisr_t)(void *p, uint32_t flags);
  * @details The function disables the specified stream and then clears any

  *          pending interrupt.

  * @note    This function can be invoked in both ISR or thread context.

+ * @note    Interrupts enabling flags are set to zero after this call, see

+ *          bug 3607518.

  * @pre     The stream must have been allocated using @p dmaStreamAllocate().

  * @post    After use the stream can be released using @p dmaStreamRelease().

  *

diff --git a/os/hal/platforms/STM32F30x/stm32_dma.h b/os/hal/platforms/STM32F30x/stm32_dma.h
index 6d82dd4b9..1f60ba0cf 100644
--- a/os/hal/platforms/STM32F30x/stm32_dma.h
+++ b/os/hal/platforms/STM32F30x/stm32_dma.h
@@ -312,6 +312,8 @@ typedef void (*stm32_dmaisr_t)(void *p, uint32_t flags);
  * @details The function disables the specified stream and then clears any

  *          pending interrupt.

  * @note    This function can be invoked in both ISR or thread context.

+ * @note    Interrupts enabling flags are set to zero after this call, see

+ *          bug 3607518.

  * @pre     The stream must have been allocated using @p dmaStreamAllocate().

  * @post    After use the stream can be released using @p dmaStreamRelease().

  *

diff --git a/os/hal/platforms/STM32F37x/stm32_dma.h b/os/hal/platforms/STM32F37x/stm32_dma.h
index 257ed6054..3f5e561ae 100644
--- a/os/hal/platforms/STM32F37x/stm32_dma.h
+++ b/os/hal/platforms/STM32F37x/stm32_dma.h
@@ -312,6 +312,8 @@ typedef void (*stm32_dmaisr_t)(void *p, uint32_t flags);
  * @details The function disables the specified stream and then clears any

  *          pending interrupt.

  * @note    This function can be invoked in both ISR or thread context.

+ * @note    Interrupts enabling flags are set to zero after this call, see

+ *          bug 3607518.

  * @pre     The stream must have been allocated using @p dmaStreamAllocate().

  * @post    After use the stream can be released using @p dmaStreamRelease().

  *

diff --git a/os/hal/platforms/STM32F4xx/stm32_dma.h b/os/hal/platforms/STM32F4xx/stm32_dma.h
index 9b745a917..9fb73e8de 100644
--- a/os/hal/platforms/STM32F4xx/stm32_dma.h
+++ b/os/hal/platforms/STM32F4xx/stm32_dma.h
@@ -365,6 +365,8 @@ typedef void (*stm32_dmaisr_t)(void *p, uint32_t flags);
  * @details The function disables the specified stream, waits for the disable

  *          operation to complete and then clears any pending interrupt.

  * @note    This function can be invoked in both ISR or thread context.

+ * @note    Interrupts enabling flags are set to zero after this call, see

+ *          bug 3607518.

  * @pre     The stream must have been allocated using @p dmaStreamAllocate().

  * @post    After use the stream can be released using @p dmaStreamRelease().

  *

diff --git a/os/hal/platforms/STM32L1xx/stm32_dma.h b/os/hal/platforms/STM32L1xx/stm32_dma.h
index 3de9d4980..800f5fc22 100644
--- a/os/hal/platforms/STM32L1xx/stm32_dma.h
+++ b/os/hal/platforms/STM32L1xx/stm32_dma.h
@@ -303,6 +303,8 @@ typedef void (*stm32_dmaisr_t)(void *p, uint32_t flags);
  * @details The function disables the specified stream and then clears any

  *          pending interrupt.

  * @note    This function can be invoked in both ISR or thread context.

+ * @note    Interrupts enabling flags are set to zero after this call, see

+ *          bug 3607518.

  * @pre     The stream must have been allocated using @p dmaStreamAllocate().

  * @post    After use the stream can be released using @p dmaStreamRelease().

  *