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

Fixed bug #958. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12142 110e8d01-0319-4d1e-a829-52ad28d1bb01
This commit is contained in:
Giovanni Di Sirio 2018-07-07 14:05:00 +00:00
parent 3d7b366fd0
commit 0424a747af
5 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/STM32/RT-STM32F401RE-NUCLEO64/Makefile
View File

@ -172,7 +172,7 @@ ULIBS =
# Common rules
#
RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/mk
RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/arm-none-eabi.mk
include $(RULESPATH)/rules.mk

2
demos/STM32/RT-STM32L476-DISCOVERY/Makefile
View File

@ -172,7 +172,7 @@ ULIBS =
# Common rules
#
RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/mk
RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
include $(RULESPATH)/arm-none-eabi.mk
include $(RULESPATH)/rules.mk

18
os/hal/ports/STM32/LLD/USARTv1/hal_serial_lld.c
View File

@ -215,7 +215,7 @@ static void serve_interrupt(SerialDriver *sdp) {
b = oqGetI(&sdp->oqueue);
if (b < MSG_OK) {
chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY);
u->CR1 = (cr1 & ~USART_CR1_TXEIE) | USART_CR1_TCIE;
u->CR1 = cr1 & ~USART_CR1_TXEIE;
}
else
u->DR = b;
@ -237,7 +237,7 @@ static void serve_interrupt(SerialDriver *sdp) {
static void notify1(io_queue_t *qp) {
(void)qp;
USART1->CR1 |= USART_CR1_TXEIE;
USART1->CR1 |= USART_CR1_TXEIE | USART_CR1_TCIE;
}
#endif
@ -245,7 +245,7 @@ static void notify1(io_queue_t *qp) {
static void notify2(io_queue_t *qp) {
(void)qp;
USART2->CR1 |= USART_CR1_TXEIE;
USART2->CR1 |= USART_CR1_TXEIE | USART_CR1_TCIE;
}
#endif
@ -253,7 +253,7 @@ static void notify2(io_queue_t *qp) {
static void notify3(io_queue_t *qp) {
(void)qp;
USART3->CR1 |= USART_CR1_TXEIE;
USART3->CR1 |= USART_CR1_TXEIE | USART_CR1_TCIE;
}
#endif
@ -261,7 +261,7 @@ static void notify3(io_queue_t *qp) {
static void notify4(io_queue_t *qp) {
(void)qp;
UART4->CR1 |= USART_CR1_TXEIE;
UART4->CR1 |= USART_CR1_TXEIE | USART_CR1_TCIE;
}
#endif
@ -269,7 +269,7 @@ static void notify4(io_queue_t *qp) {
static void notify5(io_queue_t *qp) {
(void)qp;
UART5->CR1 |= USART_CR1_TXEIE;
UART5->CR1 |= USART_CR1_TXEIE | USART_CR1_TCIE;
}
#endif
@ -277,7 +277,7 @@ static void notify5(io_queue_t *qp) {
static void notify6(io_queue_t *qp) {
(void)qp;
USART6->CR1 |= USART_CR1_TXEIE;
USART6->CR1 |= USART_CR1_TXEIE | USART_CR1_TCIE;
}
#endif
@ -285,7 +285,7 @@ static void notify6(io_queue_t *qp) {
static void notify7(io_queue_t *qp) {
(void)qp;
UART7->CR1 |= USART_CR1_TXEIE;
UART7->CR1 |= USART_CR1_TXEIE | USART_CR1_TCIE;
}
#endif
@ -293,7 +293,7 @@ static void notify7(io_queue_t *qp) {
static void notify8(io_queue_t *qp) {
(void)qp;
UART8->CR1 |= USART_CR1_TXEIE;
UART8->CR1 |= USART_CR1_TXEIE | USART_CR1_TCIE;
}
#endif

20
os/hal/ports/STM32/LLD/USARTv2/hal_serial_lld.c
View File

@ -335,7 +335,7 @@ static void serve_interrupt(SerialDriver *sdp) {
b = oqGetI(&sdp->oqueue);
if (b < MSG_OK) {
chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY);
u->CR1 = (cr1 & ~USART_CR1_TXEIE) | USART_CR1_TCIE;
u->CR1 = cr1 & ~USART_CR1_TXEIE;
}
else
u->TDR = b;
@ -357,7 +357,7 @@ static void serve_interrupt(SerialDriver *sdp) {
static void notify1(io_queue_t *qp) {
(void)qp;
USART1->CR1 |= USART_CR1_TXEIE;
USART1->CR1 |= USART_CR1_TXEIE | USART_CR1_TCIE;
}
#endif
@ -365,7 +365,7 @@ static void notify1(io_queue_t *qp) {
static void notify2(io_queue_t *qp) {
(void)qp;
USART2->CR1 |= USART_CR1_TXEIE;
USART2->CR1 |= USART_CR1_TXEIE | USART_CR1_TCIE;
}
#endif
@ -373,7 +373,7 @@ static void notify2(io_queue_t *qp) {
static void notify3(io_queue_t *qp) {
(void)qp;
USART3->CR1 |= USART_CR1_TXEIE;
USART3->CR1 |= USART_CR1_TXEIE | USART_CR1_TCIE;
}
#endif
@ -381,7 +381,7 @@ static void notify3(io_queue_t *qp) {
static void notify4(io_queue_t *qp) {
(void)qp;
UART4->CR1 |= USART_CR1_TXEIE;
UART4->CR1 |= USART_CR1_TXEIE | USART_CR1_TCIE;
}
#endif
@ -389,7 +389,7 @@ static void notify4(io_queue_t *qp) {
static void notify5(io_queue_t *qp) {
(void)qp;
UART5->CR1 |= USART_CR1_TXEIE;
UART5->CR1 |= USART_CR1_TXEIE | USART_CR1_TCIE;
}
#endif
@ -397,7 +397,7 @@ static void notify5(io_queue_t *qp) {
static void notify6(io_queue_t *qp) {
(void)qp;
USART6->CR1 |= USART_CR1_TXEIE;
USART6->CR1 |= USART_CR1_TXEIE | USART_CR1_TCIE;
}
#endif
@ -405,7 +405,7 @@ static void notify6(io_queue_t *qp) {
static void notify7(io_queue_t *qp) {
(void)qp;
UART7->CR1 |= USART_CR1_TXEIE;
UART7->CR1 |= USART_CR1_TXEIE | USART_CR1_TCIE;
}
#endif
@ -413,7 +413,7 @@ static void notify7(io_queue_t *qp) {
static void notify8(io_queue_t *qp) {
(void)qp;
UART8->CR1 |= USART_CR1_TXEIE;
UART8->CR1 |= USART_CR1_TXEIE | USART_CR1_TCIE;
}
#endif
@ -421,7 +421,7 @@ static void notify8(io_queue_t *qp) {
static void notifylp1(io_queue_t *qp) {
(void)qp;
LPUART1->CR1 |= USART_CR1_TXEIE;
LPUART1->CR1 |= USART_CR1_TXEIE | USART_CR1_TCIE;
}
#endif

2
readme.txt
View File

@ -138,6 +138,8 @@
- EX: Updated LIS302DL to 1.1.0 (backported to 18.2.1).
- EX: Updated LPS25H to 1.1.0 (backported to 18.2.1).
- EX: Updated LSM303DLHC to 1.1.0 (backported to 18.2.1).
- HAL: Fixed incorrect TCIE handling in STM32 serial drivers (bug #958)
(backported to 18.2.2 and 17.6.5).
- HAL: Fixed invalid period calculation in STM32 GPT driver (bug #957)
(backported to 18.2.2 and 17.6.5).
- HAL: Fixed missing USART7/8 definitions in STM32F0 HAL (bug #956)(backported