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 introduced by bug #951 fix. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12084 110e8d01-0319-4d1e-a829-52ad28d1bb01
This commit is contained in:
Giovanni Di Sirio 2018-06-09 17:26:56 +00:00
parent 0f05bc3491
commit c2477148f0
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,8 +115,10 @@ static void usart_init(SerialDriver *sdp, const SerialConfig *config) {
/* Correcting USARTDIV when oversampling by 8 instead of 16. /* Correcting USARTDIV when oversampling by 8 instead of 16.
Fraction is still 4 bits wide, but only lower 3 bits used. Fraction is still 4 bits wide, but only lower 3 bits used.
Mantissa is doubled, but Fraction is left the same.*/ Mantissa is doubled, but Fraction is left the same.*/
#if defined(USART_CR1_OVER8)
if (config->cr1 & USART_CR1_OVER8) if (config->cr1 & USART_CR1_OVER8)
fck = ((fck & ~7) * 2) | (fck & 7); fck = ((fck & ~7) * 2) | (fck & 7);
#endif
u->BRR = fck; u->BRR = fck;
/* Note that some bits are enforced.*/ /* Note that some bits are enforced.*/

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

@ -216,8 +216,10 @@ static void usart_start(UARTDriver *uartp) {
/* Correcting USARTDIV when oversampling by 8 instead of 16. /* Correcting USARTDIV when oversampling by 8 instead of 16.
Fraction is still 4 bits wide, but only lower 3 bits used. Fraction is still 4 bits wide, but only lower 3 bits used.
Mantissa is doubled, but Fraction is left the same.*/ Mantissa is doubled, but Fraction is left the same.*/
if (uartp->config->cr1 & USART_CR1_OVER8) #if defined(USART_CR1_OVER8)
if (config->cr1 & USART_CR1_OVER8)
fck = ((fck & ~7) * 2) | (fck & 7); fck = ((fck & ~7) * 2) | (fck & 7);
#endif
u->BRR = fck; u->BRR = fck;
/* Resetting eventual pending status flags.*/ /* Resetting eventual pending status flags.*/