Reverted bug 3163851.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_2.0.x@2675 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2011-01-22 14:43:24 +00:00
parent 594bb0b097
commit e324eb668a
2 changed files with 3 additions and 6 deletions

View File

@ -107,7 +107,8 @@ 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_RE; USART_CR1_RXNEIE | USART_CR1_TE |
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; u->SR = 0;
@ -181,10 +182,8 @@ static void serve_interrupt(SerialDriver *sdp) {
chEvtBroadcastI(&sdp->oevent); chEvtBroadcastI(&sdp->oevent);
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();
} }
} }

View File

@ -59,8 +59,6 @@
***************************************************************************** *****************************************************************************
*** 2.0.11 *** *** 2.0.11 ***
- FIX: Fixed spurious character transmission in STM32 serial driver after
reset (bug 3163851).
- FIX: Fixed error in STM32 ADC driver macro names (bug 3160306). - FIX: Fixed error in STM32 ADC driver macro names (bug 3160306).
*** 2.0.10 *** *** 2.0.10 ***