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

Remove the disable IRQ commands in PIOS_COM since they aren't needed.

Browse Source
This commit is contained in:
James Cotton 2012-05-23 00:15:28 -05:00
parent d150fd5331
commit 8d4e221412
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
flight/PiOS/Common/pios_com.c
View File

@ -197,9 +197,7 @@ static uint16_t PIOS_COM_RxInCallback(uint32_t context, uint8_t * buf, uint16_t
PIOS_Assert(valid); PIOS_Assert(valid);
PIOS_Assert(com_dev->has_rx); PIOS_Assert(com_dev->has_rx);
PIOS_IRQ_Disable();
uint16_t bytes_into_fifo = fifoBuf_putData(&com_dev->rx, buf, buf_len); uint16_t bytes_into_fifo = fifoBuf_putData(&com_dev->rx, buf, buf_len);
PIOS_IRQ_Enable();
if (bytes_into_fifo > 0) { if (bytes_into_fifo > 0) {
/* Data has been added to the buffer */ /* Data has been added to the buffer */
@ -223,9 +221,7 @@ static uint16_t PIOS_COM_TxOutCallback(uint32_t context, uint8_t * buf, uint16_t
PIOS_Assert(buf_len); PIOS_Assert(buf_len);
PIOS_Assert(com_dev->has_tx); PIOS_Assert(com_dev->has_tx);
PIOS_IRQ_Disable();
uint16_t bytes_from_fifo = fifoBuf_getData(&com_dev->tx, buf, buf_len); uint16_t bytes_from_fifo = fifoBuf_getData(&com_dev->tx, buf, buf_len);
PIOS_IRQ_Enable();
if (bytes_from_fifo > 0) { if (bytes_from_fifo > 0) {
/* More space has been made in the buffer */ /* More space has been made in the buffer */
@ -289,9 +285,7 @@ int32_t PIOS_COM_SendBufferNonBlocking(uint32_t com_id, const uint8_t *buffer, u
return -2; return -2;
} }
PIOS_IRQ_Disable();
uint16_t bytes_into_fifo = fifoBuf_putData(&com_dev->tx, buffer, len); uint16_t bytes_into_fifo = fifoBuf_putData(&com_dev->tx, buffer, len);
PIOS_IRQ_Enable();
if (bytes_into_fifo > 0) { if (bytes_into_fifo > 0) {
/* More data has been put in the tx buffer, make sure the tx is started */ /* More data has been put in the tx buffer, make sure the tx is started */
@ -469,6 +463,7 @@ uint16_t PIOS_COM_ReceiveBuffer(uint32_t com_id, uint8_t * buf, uint16_t buf_len
{ {
PIOS_Assert(buf); PIOS_Assert(buf);
PIOS_Assert(buf_len); PIOS_Assert(buf_len);
uint16_t bytes_from_fifo;
struct pios_com_dev * com_dev = (struct pios_com_dev *)com_id; struct pios_com_dev * com_dev = (struct pios_com_dev *)com_id;
@ -479,9 +474,7 @@ uint16_t PIOS_COM_ReceiveBuffer(uint32_t com_id, uint8_t * buf, uint16_t buf_len
PIOS_Assert(com_dev->has_rx); PIOS_Assert(com_dev->has_rx);
check_again: check_again:
PIOS_IRQ_Disable(); bytes_from_fifo = fifoBuf_getData(&com_dev->rx, buf, buf_len);
uint16_t bytes_from_fifo = fifoBuf_getData(&com_dev->rx, buf, buf_len);
PIOS_IRQ_Enable();
if (bytes_from_fifo == 0) { if (bytes_from_fifo == 0) {
/* No more bytes in receive buffer */ /* No more bytes in receive buffer */