From f9a52f29e05620f3ba4a849072f861faefd028eb Mon Sep 17 00:00:00 2001 From: gdisirio Date: Mon, 4 Mar 2013 08:28:44 +0000 Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5352 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/platforms/SPC563Mxx/hal_lld.h | 2 ++ os/hal/platforms/SPC563Mxx/platform.mk | 2 ++ os/hal/platforms/SPC5xx/EDMA_v1/spc5_edma.h | 2 +- os/hal/platforms/STM32F0xx/stm32_dma.c | 6 +++--- os/hal/platforms/STM32F1xx/stm32_dma.c | 6 +++--- os/hal/platforms/STM32F30x/stm32_dma.c | 6 +++--- os/hal/platforms/STM32F37x/stm32_dma.c | 6 +++--- os/hal/platforms/STM32F4xx/stm32_dma.c | 6 +++--- os/hal/platforms/STM32L1xx/stm32_dma.c | 6 +++--- 9 files changed, 23 insertions(+), 19 deletions(-) diff --git a/os/hal/platforms/SPC563Mxx/hal_lld.h b/os/hal/platforms/SPC563Mxx/hal_lld.h index 0cec2b0ac..44a4ef527 100644 --- a/os/hal/platforms/SPC563Mxx/hal_lld.h +++ b/os/hal/platforms/SPC563Mxx/hal_lld.h @@ -243,6 +243,8 @@ /* External declarations. */ /*===========================================================================*/ +#include "spc5_edma.h" + #ifdef __cplusplus extern "C" { #endif diff --git a/os/hal/platforms/SPC563Mxx/platform.mk b/os/hal/platforms/SPC563Mxx/platform.mk index 989cfb09b..c7f80badc 100644 --- a/os/hal/platforms/SPC563Mxx/platform.mk +++ b/os/hal/platforms/SPC563Mxx/platform.mk @@ -1,11 +1,13 @@ # List of all the SPC56x platform files. PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/SPC563Mxx/hal_lld.c \ + ${CHIBIOS}/os/hal/platforms/SPC5xx/EDMA_v1/spc5_edma.c \ ${CHIBIOS}/os/hal/platforms/SPC5xx/EQADC_v1/adc_lld.c \ ${CHIBIOS}/os/hal/platforms/SPC5xx/SIU_v1/pal_lld.c \ ${CHIBIOS}/os/hal/platforms/SPC5xx/ESCI_v1/serial_lld.c # Required include directories PLATFORMINC = ${CHIBIOS}/os/hal/platforms/SPC563Mxx \ + ${CHIBIOS}/os/hal/platforms/SPC5xx/EDMA_v1 \ ${CHIBIOS}/os/hal/platforms/SPC5xx/EQADC_v1 \ ${CHIBIOS}/os/hal/platforms/SPC5xx/ESCI_v1 \ ${CHIBIOS}/os/hal/platforms/SPC5xx/SIU_v1 diff --git a/os/hal/platforms/SPC5xx/EDMA_v1/spc5_edma.h b/os/hal/platforms/SPC5xx/EDMA_v1/spc5_edma.h index b0506e7b5..ab13fc610 100644 --- a/os/hal/platforms/SPC5xx/EDMA_v1/spc5_edma.h +++ b/os/hal/platforms/SPC5xx/EDMA_v1/spc5_edma.h @@ -93,7 +93,7 @@ extern "C" { #endif void edmaInit(void); edma_channel_t edmaAllocChannel(const edma_channel_config_t *ccfg); - void edmaReleaseChannel(edma_channel_t *channel); + void edmaReleaseChannel(edma_channel_t channel); #ifdef __cplusplus } #endif diff --git a/os/hal/platforms/STM32F0xx/stm32_dma.c b/os/hal/platforms/STM32F0xx/stm32_dma.c index 3ddcdb3fd..ae8bda30a 100644 --- a/os/hal/platforms/STM32F0xx/stm32_dma.c +++ b/os/hal/platforms/STM32F0xx/stm32_dma.c @@ -233,7 +233,7 @@ bool_t dmaStreamAllocate(const stm32_dma_stream_t *dmastp, stm32_dmaisr_t func, void *param) { - chDbgCheck(dmastp != NULL, "dmaAllocate"); + chDbgCheck(dmastp != NULL, "dmaStreamAllocate"); /* Checks if the stream is already taken.*/ if ((dma_streams_mask & (1 << dmastp->selfindex)) != 0) @@ -274,11 +274,11 @@ bool_t dmaStreamAllocate(const stm32_dma_stream_t *dmastp, */ void dmaStreamRelease(const stm32_dma_stream_t *dmastp) { - chDbgCheck(dmastp != NULL, "dmaRelease"); + chDbgCheck(dmastp != NULL, "dmaStreamRelease"); /* Check if the streams is not taken.*/ chDbgAssert((dma_streams_mask & (1 << dmastp->selfindex)) != 0, - "dmaRelease(), #1", "not allocated"); + "dmaStreamRelease(), #1", "not allocated"); /* Disables the associated IRQ vector.*/ nvicDisableVector(dmastp->vector); diff --git a/os/hal/platforms/STM32F1xx/stm32_dma.c b/os/hal/platforms/STM32F1xx/stm32_dma.c index 2517b5763..86a597d20 100644 --- a/os/hal/platforms/STM32F1xx/stm32_dma.c +++ b/os/hal/platforms/STM32F1xx/stm32_dma.c @@ -425,7 +425,7 @@ bool_t dmaStreamAllocate(const stm32_dma_stream_t *dmastp, stm32_dmaisr_t func, void *param) { - chDbgCheck(dmastp != NULL, "dmaAllocate"); + chDbgCheck(dmastp != NULL, "dmaStreamAllocate"); /* Checks if the stream is already taken.*/ if ((dma_streams_mask & (1 << dmastp->selfindex)) != 0) @@ -470,11 +470,11 @@ bool_t dmaStreamAllocate(const stm32_dma_stream_t *dmastp, */ void dmaStreamRelease(const stm32_dma_stream_t *dmastp) { - chDbgCheck(dmastp != NULL, "dmaRelease"); + chDbgCheck(dmastp != NULL, "dmaStreamRelease"); /* Check if the streams is not taken.*/ chDbgAssert((dma_streams_mask & (1 << dmastp->selfindex)) != 0, - "dmaRelease(), #1", "not allocated"); + "dmaStreamRelease(), #1", "not allocated"); /* Disables the associated IRQ vector.*/ nvicDisableVector(dmastp->vector); diff --git a/os/hal/platforms/STM32F30x/stm32_dma.c b/os/hal/platforms/STM32F30x/stm32_dma.c index 2fffadf6d..ae29bae8f 100644 --- a/os/hal/platforms/STM32F30x/stm32_dma.c +++ b/os/hal/platforms/STM32F30x/stm32_dma.c @@ -383,7 +383,7 @@ bool_t dmaStreamAllocate(const stm32_dma_stream_t *dmastp, stm32_dmaisr_t func, void *param) { - chDbgCheck(dmastp != NULL, "dmaAllocate"); + chDbgCheck(dmastp != NULL, "dmaStreamAllocate"); /* Checks if the stream is already taken.*/ if ((dma_streams_mask & (1 << dmastp->selfindex)) != 0) @@ -428,11 +428,11 @@ bool_t dmaStreamAllocate(const stm32_dma_stream_t *dmastp, */ void dmaStreamRelease(const stm32_dma_stream_t *dmastp) { - chDbgCheck(dmastp != NULL, "dmaRelease"); + chDbgCheck(dmastp != NULL, "dmaStreamRelease"); /* Check if the streams is not taken.*/ chDbgAssert((dma_streams_mask & (1 << dmastp->selfindex)) != 0, - "dmaRelease(), #1", "not allocated"); + "dmaStreamRelease(), #1", "not allocated"); /* Disables the associated IRQ vector.*/ nvicDisableVector(dmastp->vector); diff --git a/os/hal/platforms/STM32F37x/stm32_dma.c b/os/hal/platforms/STM32F37x/stm32_dma.c index 1a686554b..7678292f0 100644 --- a/os/hal/platforms/STM32F37x/stm32_dma.c +++ b/os/hal/platforms/STM32F37x/stm32_dma.c @@ -383,7 +383,7 @@ bool_t dmaStreamAllocate(const stm32_dma_stream_t *dmastp, stm32_dmaisr_t func, void *param) { - chDbgCheck(dmastp != NULL, "dmaAllocate"); + chDbgCheck(dmastp != NULL, "dmaStreamAllocate"); /* Checks if the stream is already taken.*/ if ((dma_streams_mask & (1 << dmastp->selfindex)) != 0) @@ -428,11 +428,11 @@ bool_t dmaStreamAllocate(const stm32_dma_stream_t *dmastp, */ void dmaStreamRelease(const stm32_dma_stream_t *dmastp) { - chDbgCheck(dmastp != NULL, "dmaRelease"); + chDbgCheck(dmastp != NULL, "dmaStreamRelease"); /* Check if the streams is not taken.*/ chDbgAssert((dma_streams_mask & (1 << dmastp->selfindex)) != 0, - "dmaRelease(), #1", "not allocated"); + "dmaStreamRelease(), #1", "not allocated"); /* Disables the associated IRQ vector.*/ nvicDisableVector(dmastp->vector); diff --git a/os/hal/platforms/STM32F4xx/stm32_dma.c b/os/hal/platforms/STM32F4xx/stm32_dma.c index 3f442a08f..5a73ac5f1 100644 --- a/os/hal/platforms/STM32F4xx/stm32_dma.c +++ b/os/hal/platforms/STM32F4xx/stm32_dma.c @@ -464,7 +464,7 @@ bool_t dmaStreamAllocate(const stm32_dma_stream_t *dmastp, stm32_dmaisr_t func, void *param) { - chDbgCheck(dmastp != NULL, "dmaAllocate"); + chDbgCheck(dmastp != NULL, "dmaStreamAllocate"); /* Checks if the stream is already taken.*/ if ((dma_streams_mask & (1 << dmastp->selfindex)) != 0) @@ -508,11 +508,11 @@ bool_t dmaStreamAllocate(const stm32_dma_stream_t *dmastp, */ void dmaStreamRelease(const stm32_dma_stream_t *dmastp) { - chDbgCheck(dmastp != NULL, "dmaRelease"); + chDbgCheck(dmastp != NULL, "dmaStreamRelease"); /* Check if the streams is not taken.*/ chDbgAssert((dma_streams_mask & (1 << dmastp->selfindex)) != 0, - "dmaRelease(), #1", "not allocated"); + "dmaStreamRelease(), #1", "not allocated"); /* Disables the associated IRQ vector.*/ nvicDisableVector(dmastp->vector); diff --git a/os/hal/platforms/STM32L1xx/stm32_dma.c b/os/hal/platforms/STM32L1xx/stm32_dma.c index 79b779ece..9bebea7d5 100644 --- a/os/hal/platforms/STM32L1xx/stm32_dma.c +++ b/os/hal/platforms/STM32L1xx/stm32_dma.c @@ -285,7 +285,7 @@ bool_t dmaStreamAllocate(const stm32_dma_stream_t *dmastp, stm32_dmaisr_t func, void *param) { - chDbgCheck(dmastp != NULL, "dmaAllocate"); + chDbgCheck(dmastp != NULL, "dmaStreamAllocate"); /* Checks if the stream is already taken.*/ if ((dma_streams_mask & (1 << dmastp->selfindex)) != 0) @@ -326,11 +326,11 @@ bool_t dmaStreamAllocate(const stm32_dma_stream_t *dmastp, */ void dmaStreamRelease(const stm32_dma_stream_t *dmastp) { - chDbgCheck(dmastp != NULL, "dmaRelease"); + chDbgCheck(dmastp != NULL, "dmaStreamRelease"); /* Check if the streams is not taken.*/ chDbgAssert((dma_streams_mask & (1 << dmastp->selfindex)) != 0, - "dmaRelease(), #1", "not allocated"); + "dmaStreamRelease(), #1", "not allocated"); /* Disables the associated IRQ vector.*/ nvicDisableVector(dmastp->vector);