zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bub 3519202. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4115 35acf78f-673a-0410-8e92-d51de3d6d3f4
master
gdisirio 2012-04-18 17:34:17 +00:00
parent 1d0b686ceb
commit 2446f558db
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os/hal/platforms/STM32F1xx/stm32_dma.h
View File

@ -363,7 +363,7 @@ typedef void (*stm32_dmaisr_t)(void *p, uint32_t flags);
* *
* @param[in] dmastp pointer to a stm32_dma_stream_t structure * @param[in] dmastp pointer to a stm32_dma_stream_t structure
*/ */
#define dmaWaitCompletion(dmastp) \ #define dmaWaitCompletion(dmastp) { \
while ((dmastp)->channel->CNDTR > 0) \ while ((dmastp)->channel->CNDTR > 0) \
; \ ; \
dmaStreamDisable(dmastp); \ dmaStreamDisable(dmastp); \

2
os/hal/platforms/STM32L1xx/stm32_dma.h
View File

@ -354,7 +354,7 @@ typedef void (*stm32_dmaisr_t)(void *p, uint32_t flags);
* *
* @param[in] dmastp pointer to a stm32_dma_stream_t structure * @param[in] dmastp pointer to a stm32_dma_stream_t structure
*/ */
#define dmaWaitCompletion(dmastp) \ #define dmaWaitCompletion(dmastp) { \
while ((dmastp)->channel->CNDTR > 0) \ while ((dmastp)->channel->CNDTR > 0) \
; \ ; \
dmaStreamDisable(dmastp); \ dmaStreamDisable(dmastp); \

2
readme.txt
View File

@ -79,6 +79,8 @@
***************************************************************************** *****************************************************************************
*** 2.5.0 *** *** 2.5.0 ***
- FIX: Fixed macro dmaWaitCompletion() fails to compile in STM32 HAL (bug
3519202)(backported to 2.4.1).
- FIX: Fixed ARM addresses generated in vectors table (bug 3519037)(backported - FIX: Fixed ARM addresses generated in vectors table (bug 3519037)(backported
to 2.2.10 and 2.4.1). to 2.2.10 and 2.4.1).
- FIX: Fixed missing serial driver functionality for SAM7S64, SAM7S128 and - FIX: Fixed missing serial driver functionality for SAM7S64, SAM7S128 and