rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-30 15:52:12 +01:00
Code Issues Releases Activity

OP-203 PIOS_UART: Tweaked the way the interrupts are reenabled to get comms

Browse Source 
stable again

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2143 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
peabody124 2010-11-23 17:13:48 +00:00 committed by peabody124
parent 300a3bc8ad
commit a454f06bf8
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
flight/PiOS/STM32F10x/pios_usart.c
View File

@ -202,7 +202,7 @@ int32_t PIOS_USART_RxBufferGet(uint8_t usart)
return -2;
}
if (!fifoBuf_getUsed(&usart_dev->rx)) {
if (fifoBuf_getUsed(&usart_dev->rx) == 0) {
/* Nothing new in the buffer */
return -1;
}
@ -395,12 +395,11 @@ int32_t PIOS_USART_TxBufferPutMoreNonBlocking(uint8_t usart, const uint8_t * buf
/* Copy bytes to be transmitted into transmit buffer */
/* This operation should be atomic! */
PIOS_IRQ_Disable();
uint16_t used = fifoBuf_getUsed(&usart_dev->tx);
fifoBuf_putData(&usart_dev->tx,buffer,len);
if (fifoBuf_getUsed(&usart_dev->tx) == len) {
/* Buffer has just become non-empty, enable tx interrupt. */
if(used == 0) /* enable sending when was empty */
USART_ITConfig(usart_dev->cfg->regs, USART_IT_TXE, ENABLE);
}
PIOS_IRQ_Enable();
/* No error */