diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-06-27 18:23:08 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-06-27 18:23:08 +0000 |
| commit | a40226ad685dbb60d0dd6f70f244be0edea4dfa9 (patch) | |
| tree | d708ff5142f0aa3632a07af61870f4a5195c27f3 | |
| parent | d2e24645e8fb436c24781c154d12ebeec6791b7a (diff) | |
| download | ChibiOS-a40226ad685dbb60d0dd6f70f244be0edea4dfa9.tar.gz ChibiOS-a40226ad685dbb60d0dd6f70f244be0edea4dfa9.tar.bz2 ChibiOS-a40226ad685dbb60d0dd6f70f244be0edea4dfa9.zip | |
Fixed bug 3538468.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4354 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | os/hal/platforms/STM32F2xx/stm32_dma.c | 2 | ||||
| -rw-r--r-- | os/hal/platforms/STM32F4xx/stm32_dma.c | 2 | ||||
| -rw-r--r-- | readme.txt | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/os/hal/platforms/STM32F2xx/stm32_dma.c b/os/hal/platforms/STM32F2xx/stm32_dma.c index 8e0226747..223ff692e 100644 --- a/os/hal/platforms/STM32F2xx/stm32_dma.c +++ b/os/hal/platforms/STM32F2xx/stm32_dma.c @@ -155,7 +155,7 @@ CH_IRQ_HANDLER(DMA1_Stream1_IRQHandler) { flags = (DMA1->LISR >> 6) & STM32_DMA_ISR_MASK;
DMA1->LIFCR = STM32_DMA_ISR_MASK << 6;
if (dma_isr_redir[1].dma_func)
- dma_isr_redir[1].dma_func(dma_isr_redir[0].dma_param, flags);
+ dma_isr_redir[1].dma_func(dma_isr_redir[1].dma_param, flags);
CH_IRQ_EPILOGUE();
}
diff --git a/os/hal/platforms/STM32F4xx/stm32_dma.c b/os/hal/platforms/STM32F4xx/stm32_dma.c index 32d7eafcf..283e02ca8 100644 --- a/os/hal/platforms/STM32F4xx/stm32_dma.c +++ b/os/hal/platforms/STM32F4xx/stm32_dma.c @@ -155,7 +155,7 @@ CH_IRQ_HANDLER(DMA1_Stream1_IRQHandler) { flags = (DMA1->LISR >> 6) & STM32_DMA_ISR_MASK;
DMA1->LIFCR = STM32_DMA_ISR_MASK << 6;
if (dma_isr_redir[1].dma_func)
- dma_isr_redir[1].dma_func(dma_isr_redir[0].dma_param, flags);
+ dma_isr_redir[1].dma_func(dma_isr_redir[1].dma_param, flags);
CH_IRQ_EPILOGUE();
}
diff --git a/readme.txt b/readme.txt index cd1963819..4c5b9d719 100644 --- a/readme.txt +++ b/readme.txt @@ -81,6 +81,9 @@ *****************************************************************************
*** 2.5.0 ***
+- FIX: Fixed problem in STM32 DMA1 stream1 IRQ handler (bug 3538468)
+ (backported to 2.4.2).
+- FIX: Fixed TIM8 not working in STM32 GPT driver (bug 3536523)(
- FIX: Fixed wrong priority assigned to TIM8 in STM32 ICU driver (bug 3536950)
(backported to 2.4.2).
- FIX: Fixed TIM8 not working in STM32 GPT driver (bug 3536523)(backported
|