andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug 3153437. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2623 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2011-01-08 20:10:20 +00:00
parent 7f73cde984
commit ab5dc4cae1
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
os/hal/platforms/STM32/uart_lld.c
View File

@ -243,7 +243,7 @@ CH_IRQ_HANDLER(DMA1_Ch5_IRQHandler) {
/* Receiver in idle state, a callback is generated, if enabled, for each /* Receiver in idle state, a callback is generated, if enabled, for each
received character and then the driver stays in the same state.*/ received character and then the driver stays in the same state.*/
if (uartp->ud_config->uc_rxchar != NULL) if (uartp->ud_config->uc_rxchar != NULL)
uartp->ud_config->uc_rxchar(uartp->ud_rxbuf); uartp->ud_config->uc_rxchar(uartp, uartp->ud_rxbuf);
} }
else { else {
/* Receiver in active state, a callback is generated, if enabled, after /* Receiver in active state, a callback is generated, if enabled, after
@ -379,7 +379,7 @@ CH_IRQ_HANDLER(DMA1_Ch3_IRQHandler) {
/* Receiver in idle state, a callback is generated, if enabled, for each /* Receiver in idle state, a callback is generated, if enabled, for each
received character and then the driver stays in the same state.*/ received character and then the driver stays in the same state.*/
if (uartp->ud_config->uc_rxchar != NULL) if (uartp->ud_config->uc_rxchar != NULL)
uartp->ud_config->uc_rxchar(uartp->ud_rxbuf); uartp->ud_config->uc_rxchar(uartp, uartp->ud_rxbuf);
} }
else { else {
/* Receiver in active state, a callback is generated, if enabled, after /* Receiver in active state, a callback is generated, if enabled, after
@ -463,11 +463,11 @@ void uart_lld_init(void) {
RCC->APB1RSTR = RCC_APB1RSTR_USART3RST; RCC->APB1RSTR = RCC_APB1RSTR_USART3RST;
RCC->APB1RSTR = 0; RCC->APB1RSTR = 0;
uartObjectInit(&UARTD3); uartObjectInit(&UARTD3);
UARTD2.ud_usart = USART3; UARTD3.ud_usart = USART3;
UARTD2.ud_dmap = STM32_DMA1; UARTD3.ud_dmap = STM32_DMA1;
UARTD2.ud_dmarx = STM32_DMA_CHANNEL_3; UARTD3.ud_dmarx = STM32_DMA_CHANNEL_3;
UARTD2.ud_dmatx = STM32_DMA_CHANNEL_2; UARTD3.ud_dmatx = STM32_DMA_CHANNEL_2;
UARTD2.ud_dmaccr = 0; UARTD3.ud_dmaccr = 0;
#endif #endif
} }

1
readme.txt
View File

@ -65,6 +65,7 @@
***************************************************************************** *****************************************************************************
*** 2.1.7 *** *** 2.1.7 ***
- FIX: Fixed error in STM32 unbuffered UART driver (bug 3153437).
- FIX: Fixed wrong macro check in LPC214x driver (bug 3152510). - FIX: Fixed wrong macro check in LPC214x driver (bug 3152510).
- FIX: Fixed switch condition error in STM32 PWM driver (bug 3152482) - FIX: Fixed switch condition error in STM32 PWM driver (bug 3152482)
(backported to 2.0.10). (backported to 2.0.10).