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 #908. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11209 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Giovanni Di Sirio 2017-12-29 09:47:19 +00:00
parent 1417f92116
commit 19ede34bed
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/hal/ports/STM32/LLD/USARTv1/hal_uart_lld.c
View File

@ -733,7 +733,11 @@ void uart_lld_start_send(UARTDriver *uartp, size_t n, const void *txbuf) {
/* Only enable TC interrupt if there's a callback attached to it or /* Only enable TC interrupt if there's a callback attached to it or
if called from uartSendFullTimeout(). Also we need to clear TC flag if called from uartSendFullTimeout(). Also we need to clear TC flag
which could be set before.*/ which could be set before.*/
#if UART_USE_WAIT == TRUE
if ((uartp->config->txend2_cb != NULL) || (uartp->early == false)) { if ((uartp->config->txend2_cb != NULL) || (uartp->early == false)) {
#else
if (uartp->config->txend2_cb != NULL) {
#endif
uartp->usart->SR = ~USART_SR_TC; uartp->usart->SR = ~USART_SR_TC;
uartp->usart->CR1 |= USART_CR1_TCIE; uartp->usart->CR1 |= USART_CR1_TCIE;
} }

4
os/hal/ports/STM32/LLD/USARTv2/hal_uart_lld.c
View File

@ -956,7 +956,11 @@ void uart_lld_start_send(UARTDriver *uartp, size_t n, const void *txbuf) {
/* Only enable TC interrupt if there's a callback attached to it or /* Only enable TC interrupt if there's a callback attached to it or
if called from uartSendFullTimeout(). Also we need to clear TC flag if called from uartSendFullTimeout(). Also we need to clear TC flag
which could be set before.*/ which could be set before.*/
#if UART_USE_WAIT == TRUE
if ((uartp->config->txend2_cb != NULL) || (uartp->early == false)) { if ((uartp->config->txend2_cb != NULL) || (uartp->early == false)) {
#else
if (uartp->config->txend2_cb != NULL) {
#endif
uartp->usart->ICR = USART_ICR_TCCF; uartp->usart->ICR = USART_ICR_TCCF;
uartp->usart->CR1 |= USART_CR1_TCIE; uartp->usart->CR1 |= USART_CR1_TCIE;
} }

2
readme.txt
View File

@ -165,6 +165,8 @@
Updated the various platform.mk implementing "smart build" mode. Updated the various platform.mk implementing "smart build" mode.
- RT: Fixed compile error with assertions enabled and dynamic extensions - RT: Fixed compile error with assertions enabled and dynamic extensions
disabled (bug #909)(backported to 17.6.4). disabled (bug #909)(backported to 17.6.4).
- HAL: Fixed compile error HAL UART without WAIT (bug #908)(backported to
17.6.4 and 16.1.10).
- RT: Fixed gcc7 implicit-fallthrough (bug #906)(backported to 17.6.4 - RT: Fixed gcc7 implicit-fallthrough (bug #906)(backported to 17.6.4
and 16.1.10). and 16.1.10).
- HAL: Fixed gcc7 implicit-fallthrough (bug #906)(backported to 17.6.4 - HAL: Fixed gcc7 implicit-fallthrough (bug #906)(backported to 17.6.4