Fixed bug 3163851.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2664 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
parent
1664a6573e
commit
f0e2c8c324
|
@ -98,10 +98,10 @@ static void usart_init(SerialDriver *sdp, const SerialConfig *config) {
|
||||||
* Note that some bits are enforced.
|
* Note that some bits are enforced.
|
||||||
*/
|
*/
|
||||||
u->CR1 = config->sc_cr1 | USART_CR1_UE | USART_CR1_PEIE |
|
u->CR1 = config->sc_cr1 | USART_CR1_UE | USART_CR1_PEIE |
|
||||||
USART_CR1_RXNEIE | USART_CR1_TE |
|
USART_CR1_RXNEIE | USART_CR1_RE;
|
||||||
USART_CR1_RE;
|
|
||||||
u->CR2 = config->sc_cr2 | USART_CR2_LBDIE;
|
u->CR2 = config->sc_cr2 | USART_CR2_LBDIE;
|
||||||
u->CR3 = config->sc_cr3 | USART_CR3_EIE;
|
u->CR3 = config->sc_cr3 | USART_CR3_EIE;
|
||||||
|
u->SR = 0;
|
||||||
(void)u->SR; /* SR reset step 1.*/
|
(void)u->SR; /* SR reset step 1.*/
|
||||||
(void)u->DR; /* SR reset step 2.*/
|
(void)u->DR; /* SR reset step 2.*/
|
||||||
}
|
}
|
||||||
|
@ -175,8 +175,10 @@ static void serve_interrupt(SerialDriver *sdp) {
|
||||||
chIOAddFlagsI(sdp, IO_OUTPUT_EMPTY);
|
chIOAddFlagsI(sdp, IO_OUTPUT_EMPTY);
|
||||||
u->CR1 = cr1 & ~USART_CR1_TXEIE;
|
u->CR1 = cr1 & ~USART_CR1_TXEIE;
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
u->DR = b;
|
u->DR = b;
|
||||||
|
u->CR1 = cr1 | USART_CR1_TE;
|
||||||
|
}
|
||||||
chSysUnlockFromIsr();
|
chSysUnlockFromIsr();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -69,6 +69,8 @@
|
||||||
*****************************************************************************
|
*****************************************************************************
|
||||||
|
|
||||||
*** 2.1.8 ***
|
*** 2.1.8 ***
|
||||||
|
- FIX: Fixed spurious character transmission in STM32 serial driver after
|
||||||
|
reset (bug 3163851)(backported to 2.0.11).
|
||||||
- FIX: Fixed error in STM32 ADC driver macro names (bug 3160306)(backported
|
- FIX: Fixed error in STM32 ADC driver macro names (bug 3160306)(backported
|
||||||
to 2.0.11).
|
to 2.0.11).
|
||||||
- FIX: Fixed IAR Cortex-Mx port memory organization problem (bug 3158776).
|
- FIX: Fixed IAR Cortex-Mx port memory organization problem (bug 3158776).
|
||||||
|
|
Loading…
Reference in New Issue