Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-17 13:25:30 +03:00
Code Issues Wiki Activity

Update serial port irq handlers so they avoid the % operator.

Browse source
This commit is contained in:
Dominic Clifton 2014-12-12 16:23:44 +00:00
parent d8127f65ad
commit ad9a2d2833
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/drivers/serial_uart_stm32f10x.c
View file

@ -59,13 +59,19 @@ void usartIrqCallback(uartPort_t *s)
s->port.callback(s->USARTx->DR); s->port.callback(s->USARTx->DR);
} else { } else {
s->port.rxBuffer[s->port.rxBufferHead] = s->USARTx->DR; s->port.rxBuffer[s->port.rxBufferHead] = s->USARTx->DR;
s->port.rxBufferHead = (s->port.rxBufferHead + 1) % s->port.rxBufferSize; s->port.rxBufferHead++;
if (s->port.rxBufferHead >= s->port.rxBufferSize) {
s->port.rxBufferHead = 0;
}
} }
} }
if (SR & USART_FLAG_TXE) { if (SR & USART_FLAG_TXE) {
if (s->port.txBufferTail != s->port.txBufferHead) { if (s->port.txBufferTail != s->port.txBufferHead) {
s->USARTx->DR = s->port.txBuffer[s->port.txBufferTail]; s->USARTx->DR = s->port.txBuffer[s->port.txBufferTail];
s->port.txBufferTail = (s->port.txBufferTail + 1) % s->port.txBufferSize; s->port.txBufferTail++;
if (s->port.txBufferTail >= s->port.txBufferSize) {
s->port.txBufferTail = 0;
}
} else { } else {
USART_ITConfig(s->USARTx, USART_IT_TXE, DISABLE); USART_ITConfig(s->USARTx, USART_IT_TXE, DISABLE);
} }

10
src/main/drivers/serial_uart_stm32f30x.c
View file

@ -353,14 +353,20 @@ void usartIrqHandler(uartPort_t *s)
s->port.callback(s->USARTx->RDR); s->port.callback(s->USARTx->RDR);
} else { } else {
s->port.rxBuffer[s->port.rxBufferHead] = s->USARTx->RDR; s->port.rxBuffer[s->port.rxBufferHead] = s->USARTx->RDR;
s->port.rxBufferHead = (s->port.rxBufferHead + 1) % s->port.rxBufferSize; s->port.rxBufferHead++;
if (s->port.rxBufferHead >= s->port.rxBufferSize) {
s->port.rxBufferHead = 0;
}
} }
} }
if (!s->txDMAChannel && (ISR & USART_FLAG_TXE)) { if (!s->txDMAChannel && (ISR & USART_FLAG_TXE)) {
if (s->port.txBufferTail != s->port.txBufferHead) { if (s->port.txBufferTail != s->port.txBufferHead) {
USART_SendData(s->USARTx, s->port.txBuffer[s->port.txBufferTail]); USART_SendData(s->USARTx, s->port.txBuffer[s->port.txBufferTail]);
s->port.txBufferTail = (s->port.txBufferTail + 1) % s->port.txBufferSize; s->port.txBufferTail++;
if (s->port.txBufferTail >= s->port.txBufferSize) {
s->port.txBufferTail = 0;
}
} else { } else {
USART_ITConfig(s->USARTx, USART_IT_TXE, DISABLE); USART_ITConfig(s->USARTx, USART_IT_TXE, DISABLE);
} }