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

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2096 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
gdisirio 2010-07-29 13:35:17 +00:00
parent 8249123228
commit a88c4972cf
1 changed files with 52 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
os/hal/platforms/STM32/uart_lld.c
View File

@ -116,6 +116,7 @@ static void usart_stop(UARTDriver *uartp) {
* @param[in] uartp pointer to the @p UARTDriver object * @param[in] uartp pointer to the @p UARTDriver object
*/ */
static void usart_start(UARTDriver *uartp) { static void usart_start(UARTDriver *uartp) {
uint16_t cr1;
USART_TypeDef *u = uartp->ud_usart; USART_TypeDef *u = uartp->ud_usart;
/* Defensive programming, starting from a clean state.*/ /* Defensive programming, starting from a clean state.*/
@ -127,16 +128,21 @@ static void usart_start(UARTDriver *uartp) {
else else
u->BRR = STM32_PCLK1 / uartp->ud_config->uc_speed; u->BRR = STM32_PCLK1 / uartp->ud_config->uc_speed;
/* Note that some bits are enforced because required for correct driver
operations.*/
u->CR1 = uartp->ud_config->uc_cr1 | USART_CR1_UE | USART_CR1_PEIE |
USART_CR1_TE | USART_CR1_RE;
u->CR2 = uartp->ud_config->uc_cr2 | USART_CR2_LBDIE;
u->CR3 = uartp->ud_config->uc_cr3 | USART_CR3_EIE;
/* Resetting eventual pending status flags.*/ /* Resetting eventual pending status flags.*/
(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.*/
u->SR = 0;
/* Note that some bits are enforced because required for correct driver
operations.*/
if (uartp->ud_config->uc_txend2 == NULL)
cr1 = USART_CR1_UE | USART_CR1_PEIE | USART_CR1_TE | USART_CR1_RE;
else
cr1 = USART_CR1_UE | USART_CR1_PEIE | USART_CR1_TE | USART_CR1_RE |
USART_CR1_TCIE;
u->CR1 = uartp->ud_config->uc_cr1 | cr1;
u->CR2 = uartp->ud_config->uc_cr2 | USART_CR2_LBDIE;
u->CR3 = uartp->ud_config->uc_cr3 | USART_CR3_EIE;
/* Starting the receiver idle loop.*/ /* Starting the receiver idle loop.*/
set_rx_idle_loop(uartp); set_rx_idle_loop(uartp);
@ -152,7 +158,7 @@ static void serve_rx_end_irq(UARTDriver *uartp) {
uartp->ud_rxstate = UART_RX_COMPLETE; uartp->ud_rxstate = UART_RX_COMPLETE;
if (uartp->ud_config->uc_rxend != NULL) if (uartp->ud_config->uc_rxend != NULL)
uartp->ud_config->uc_rxend(); uartp->ud_config->uc_rxend();
/* If the callback didn't explicitely change state then the receiver /* If the callback didn't explicitly change state then the receiver
automatically returns to the idle state.*/ automatically returns to the idle state.*/
if (uartp->ud_rxstate == UART_RX_COMPLETE) { if (uartp->ud_rxstate == UART_RX_COMPLETE) {
uartp->ud_rxstate = UART_RX_IDLE; uartp->ud_rxstate = UART_RX_IDLE;
@ -171,7 +177,7 @@ static void serve_tx_end_irq(UARTDriver *uartp) {
uartp->ud_txstate = UART_TX_COMPLETE; uartp->ud_txstate = UART_TX_COMPLETE;
if (uartp->ud_config->uc_txend1 != NULL) if (uartp->ud_config->uc_txend1 != NULL)
uartp->ud_config->uc_txend1(); uartp->ud_config->uc_txend1();
/* If the callback didn't explicitely change state then the transmitter /* If the callback didn't explicitly change state then the transmitter
automatically returns to the idle state.*/ automatically returns to the idle state.*/
if (uartp->ud_txstate == UART_TX_COMPLETE) if (uartp->ud_txstate == UART_TX_COMPLETE)
uartp->ud_txstate = UART_TX_IDLE; uartp->ud_txstate = UART_TX_IDLE;
@ -187,7 +193,9 @@ static void serve_usart_irq(UARTDriver *uartp) {
sr = u->SR; /* SR reset step 1.*/ sr = u->SR; /* SR reset step 1.*/
(void)u->DR; /* SR reset step 2.*/ (void)u->DR; /* SR reset step 2.*/
///////////////// u->SR = 0; /* Clears the LBD bit in the SR.*/ if (sr & (USART_SR_LBD | USART_SR_ORE | USART_SR_NE |
USART_SR_FE | USART_SR_PE)) {
u->SR = ~USART_SR_LBD;
if (uartp->ud_rxstate == UART_RX_IDLE) { if (uartp->ud_rxstate == UART_RX_IDLE) {
/* Receiver in idle state, a callback is generated, if enabled, for each /* Receiver in idle state, a callback is generated, if enabled, for each
receive error and then the driver stays in the same state.*/ receive error and then the driver stays in the same state.*/
@ -202,7 +210,7 @@ static void serve_usart_irq(UARTDriver *uartp) {
uartp->ud_rxstate = UART_RX_ERROR; uartp->ud_rxstate = UART_RX_ERROR;
if (uartp->ud_config->uc_rxerr != NULL) if (uartp->ud_config->uc_rxerr != NULL)
uartp->ud_config->uc_rxerr(translate_errors(sr)); uartp->ud_config->uc_rxerr(translate_errors(sr));
/* If the callback didn't explicitely change state then the receiver /* If the callback didn't explicitly change state then the receiver
automatically returns to the idle state.*/ automatically returns to the idle state.*/
if (uartp->ud_rxstate == UART_RX_ERROR) { if (uartp->ud_rxstate == UART_RX_ERROR) {
uartp->ud_rxstate = UART_RX_IDLE; uartp->ud_rxstate = UART_RX_IDLE;
@ -210,6 +218,13 @@ static void serve_usart_irq(UARTDriver *uartp) {
} }
} }
} }
if (sr & USART_SR_TC) {
u->SR = ~USART_SR_TC;
/* End of transmission, a callback is generated.*/
if (uartp->ud_config->uc_txend2 != NULL)
uartp->ud_config->uc_txend2();
}
}
/*===========================================================================*/ /*===========================================================================*/
/* Driver interrupt handlers. */ /* Driver interrupt handlers. */
@ -356,6 +371,9 @@ void uart_lld_stop(UARTDriver *uartp) {
*/ */
void uart_lld_start_send(UARTDriver *uartp, size_t n, const void *txbuf) { void uart_lld_start_send(UARTDriver *uartp, size_t n, const void *txbuf) {
(void)uartp;
(void)n;
(void)txbuf;
} }
/** /**
@ -366,6 +384,7 @@ void uart_lld_start_send(UARTDriver *uartp, size_t n, const void *txbuf) {
*/ */
void uart_lld_stop_send(UARTDriver *uartp) { void uart_lld_stop_send(UARTDriver *uartp) {
(void)uartp;
} }
/** /**
@ -379,6 +398,9 @@ void uart_lld_stop_send(UARTDriver *uartp) {
*/ */
void uart_lld_start_receive(UARTDriver *uartp, size_t n, void *rxbuf) { void uart_lld_start_receive(UARTDriver *uartp, size_t n, void *rxbuf) {
(void)uartp;
(void)n;
(void)rxbuf;
} }
/** /**
@ -389,6 +411,7 @@ void uart_lld_start_receive(UARTDriver *uartp, size_t n, void *rxbuf) {
*/ */
void uart_lld_stop_receive(UARTDriver *uartp) { void uart_lld_stop_receive(UARTDriver *uartp) {
(void)uartp;
} }
#endif /* CH_HAL_USE_UART */ #endif /* CH_HAL_USE_UART */