From 07351222e6d0b6b3dcd4f50ecb18bc09e7402d1c Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Tue, 21 Sep 2010 10:22:06 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2184
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/hal/platforms/LPC11xx/serial_lld.c | 2 +-
 os/hal/platforms/LPC13xx/serial_lld.c | 2 +-
 os/hal/platforms/LPC214x/serial_lld.c | 2 +-
 os/hal/src/serial.c                   | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'os/hal')

diff --git a/os/hal/platforms/LPC11xx/serial_lld.c b/os/hal/platforms/LPC11xx/serial_lld.c
index 2cff76cd6..881087bc6 100644
--- a/os/hal/platforms/LPC11xx/serial_lld.c
+++ b/os/hal/platforms/LPC11xx/serial_lld.c
@@ -137,7 +137,7 @@ static void serve_interrupt(SerialDriver *sdp) {
     case IIR_SRC_TIMEOUT:
     case IIR_SRC_RX:
       chSysLockFromIsr();
-      if (chIQIsEmpty(&sdp->iqueue))
+      if (chIQIsEmptyI(&sdp->iqueue))
         chEvtBroadcastI(&sdp->ievent);
       chSysUnlockFromIsr();
       while (u->LSR & LSR_RBR_FULL) {
diff --git a/os/hal/platforms/LPC13xx/serial_lld.c b/os/hal/platforms/LPC13xx/serial_lld.c
index 53fd7e11e..2c5b7f47e 100644
--- a/os/hal/platforms/LPC13xx/serial_lld.c
+++ b/os/hal/platforms/LPC13xx/serial_lld.c
@@ -137,7 +137,7 @@ static void serve_interrupt(SerialDriver *sdp) {
     case IIR_SRC_TIMEOUT:
     case IIR_SRC_RX:
       chSysLockFromIsr();
-      if (chIQIsEmpty(&sdp->iqueue))
+      if (chIQIsEmptyI(&sdp->iqueue))
         chEvtBroadcastI(&sdp->ievent);
       chSysUnlockFromIsr();
       while (u->LSR & LSR_RBR_FULL) {
diff --git a/os/hal/platforms/LPC214x/serial_lld.c b/os/hal/platforms/LPC214x/serial_lld.c
index 21c39f674..87699aeb1 100644
--- a/os/hal/platforms/LPC214x/serial_lld.c
+++ b/os/hal/platforms/LPC214x/serial_lld.c
@@ -144,7 +144,7 @@ static void serve_interrupt(SerialDriver *sdp) {
     case IIR_SRC_TIMEOUT:
     case IIR_SRC_RX:
       chSysLockFromIsr();
-      if (chIQIsEmpty(&sdp->iqueue))
+      if (chIQIsEmptyI(&sdp->iqueue))
         chEvtBroadcastI(&sdp->ievent);
       chSysUnlockFromIsr();
       while (u->UART_LSR & LSR_RBR_FULL) {
diff --git a/os/hal/src/serial.c b/os/hal/src/serial.c
index 94418e46c..48518e66c 100644
--- a/os/hal/src/serial.c
+++ b/os/hal/src/serial.c
@@ -61,12 +61,12 @@ static size_t reads(void *ip, uint8_t *bp, size_t n) {
 
 static bool_t putwouldblock(void *ip) {
 
-  return chOQIsFull(&((SerialDriver *)ip)->oqueue);
+  return chOQIsFullI(&((SerialDriver *)ip)->oqueue);
 }
 
 static bool_t getwouldblock(void *ip) {
 
-  return chIQIsEmpty(&((SerialDriver *)ip)->iqueue);
+  return chIQIsEmptyI(&((SerialDriver *)ip)->iqueue);
 }
 
 static msg_t putt(void *ip, uint8_t b, systime_t timeout) {
@@ -192,7 +192,7 @@ void sdIncomingDataI(SerialDriver *sdp, uint8_t b) {
 
   chDbgCheck(sdp != NULL, "sdIncomingDataI");
 
-  if (chIQIsEmpty(&sdp->iqueue))
+  if (chIQIsEmptyI(&sdp->iqueue))
     chEvtBroadcastI(&sdp->ievent);
   if (chIQPutI(&sdp->iqueue, b) < Q_OK)
     sdAddFlagsI(sdp, SD_OVERRUN_ERROR);
-- 
cgit v1.2.3