kingkevin
/
stm32f1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

replace usart_get_interrupt_source with usart_get_flag to match libopencm3 update

This commit is contained in:
King Kévin 2017-06-27 15:38:00 +02:00
parent 30c2e473ee
commit b5001670e4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/usart.c
View File

@ -125,7 +125,7 @@ void usart_putchar_nonblocking(char c)
/** USART interrupt service routine called when data has been transmitted or received */ /** USART interrupt service routine called when data has been transmitted or received */
void USART_ISR(USART_ID)(void) void USART_ISR(USART_ID)(void)
{ {
if (usart_get_interrupt_source(USART(USART_ID), USART_SR_TXE)) { // data has been transmitted if (usart_get_flag(USART(USART_ID), USART_SR_TXE)) { // data has been transmitted
if (!tx_used) { // no data in the buffer to transmit if (!tx_used) { // no data in the buffer to transmit
usart_disable_tx_interrupt(USART(USART_ID)); // disable transmit interrupt usart_disable_tx_interrupt(USART(USART_ID)); // disable transmit interrupt
} else { } else {
@ -134,7 +134,7 @@ void USART_ISR(USART_ID)(void)
tx_used--; // update used size tx_used--; // update used size
} }
} }
if (usart_get_interrupt_source(USART(USART_ID), USART_SR_RXNE)) { // data has been received if (usart_get_flag(USART(USART_ID), USART_SR_RXNE)) { // data has been received
// only save data if there is space in the buffer // only save data if there is space in the buffer
while (rx_used>=LENGTH(rx_buffer)) { // if buffer is full while (rx_used>=LENGTH(rx_buffer)) { // if buffer is full
rx_i = (rx_i+1)%LENGTH(rx_buffer); // drop oldest data rx_i = (rx_i+1)%LENGTH(rx_buffer); // drop oldest data