rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

USART fixes based on feedback from @ledvinap.

This commit is contained in:
Dominic Clifton 2014-12-13 11:38:01 +00:00
parent ce6582b88a
commit 6d1b0cec40
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/drivers/serial_uart.c
View File

@ -206,17 +206,18 @@ uint8_t uartTotalBytesWaiting(serialPort_t *instance)
{
uartPort_t *s = (uartPort_t*)instance;
if (s->rxDMAChannel) {
if (s->rxDMAChannel->CNDTR > s->rxDMAPos) {
return s->rxDMAChannel->CNDTR - s->rxDMAPos;
uint32_t rxDMAHead = s->rxDMAChannel->CNDTR;
if (s->port.rxBufferSize + rxDMAHead - s->rxDMAPos >= s->port.rxBufferSize) {
return rxDMAHead - s->rxDMAPos;
} else {
return s->rxDMAPos - s->rxDMAChannel->CNDTR;
return s->port.rxBufferSize + rxDMAHead - s->rxDMAPos;
}
}
if (s->port.rxBufferHead > s->port.rxBufferTail) {
if (s->port.rxBufferSize + s->port.rxBufferHead - s->port.rxBufferTail >= s->port.rxBufferSize) {
return s->port.rxBufferHead - s->port.rxBufferTail;
} else {
return s->port.rxBufferTail - s->port.rxBufferHead;
return s->port.rxBufferSize + s->port.rxBufferHead - s->port.rxBufferTail;
}
}
@ -239,9 +240,11 @@ uint8_t uartRead(serialPort_t *instance)
if (--s->rxDMAPos == 0)
s->rxDMAPos = s->port.rxBufferSize;
} else {
ch = s->port.rxBuffer[s->port.rxBufferTail++];
if (s->port.rxBufferTail >= s->port.rxBufferSize) {
ch = s->port.rxBuffer[s->port.rxBufferTail];
if (s->port.rxBufferTail + 1 >= s->port.rxBufferSize) {
s->port.rxBufferTail = 0;
} else {
s->port.rxBufferTail++;
}
}