Queues improvements.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9124 35acf78f-673a-0410-8e92-d51de3d6d3f4

6 files changed, 13 insertions, 13 deletions

diff --git a/os/hal/ports/AVR/serial_lld.c b/os/hal/ports/AVR/serial_lld.c
index c8967b381..dfb0a889e 100644
--- a/os/hal/ports/AVR/serial_lld.c
+++ b/os/hal/ports/AVR/serial_lld.c
@@ -252,7 +252,7 @@ OSAL_IRQ_HANDLER(AVR_SD1_TX_VECT) {
   osalSysLockFromISR();

   b = sdRequestDataI(&SD1);

   osalSysUnlockFromISR();

-  if (b < Q_OK)

+  if (b < MSG_OK)

     UCSR0B &= ~(1 << UDRIE0);

   else

     UDR0 = b;

@@ -295,7 +295,7 @@ OSAL_IRQ_HANDLER(AVR_SD2_TX_VECT) {
   osalSysLockFromISR();

   b = sdRequestDataI(&SD2);

   osalSysUnlockFromISR();

-  if (b < Q_OK)

+  if (b < MSG_OK)

     UCSR1B &= ~(1 << UDRIE1);

   else

     UDR1 = b;

diff --git a/os/hal/ports/KINETIS/K20x/serial_lld.c b/os/hal/ports/KINETIS/K20x/serial_lld.c
index 009274710..3b5f053f3 100644
--- a/os/hal/ports/KINETIS/K20x/serial_lld.c
+++ b/os/hal/ports/KINETIS/K20x/serial_lld.c
@@ -84,7 +84,7 @@ static void serve_interrupt(SerialDriver *sdp) {
     osalSysLockFromISR();

     if (iqIsEmptyI(&sdp->iqueue))

       chnAddFlagsI(sdp, CHN_INPUT_AVAILABLE);

-    if (iqPutI(&sdp->iqueue, u->D) < Q_OK)

+    if (iqPutI(&sdp->iqueue, u->D) < MSG_OK)

       chnAddFlagsI(sdp, SD_OVERRUN_ERROR);

     osalSysUnlockFromISR();

   }

@@ -96,7 +96,7 @@ static void serve_interrupt(SerialDriver *sdp) {
     b = oqGetI(&sdp->oqueue);

     osalSysUnlockFromISR();

 

-    if (b < Q_OK) {

+    if (b < MSG_OK) {

       osalSysLockFromISR();

       chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY);

       osalSysUnlockFromISR();

@@ -115,7 +115,7 @@ static void preload(SerialDriver *sdp) {
 

   if (u->S1 & UARTx_S1_TDRE) {

     msg_t b = oqGetI(&sdp->oqueue);

-    if (b < Q_OK) {

+    if (b < MSG_OK) {

       chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY);

       return;

     }

diff --git a/os/hal/ports/KINETIS/KL2x/serial_lld.c b/os/hal/ports/KINETIS/KL2x/serial_lld.c
index f0cbc46ac..981d8fbba 100644
--- a/os/hal/ports/KINETIS/KL2x/serial_lld.c
+++ b/os/hal/ports/KINETIS/KL2x/serial_lld.c
@@ -83,7 +83,7 @@ static void serve_interrupt(SerialDriver *sdp) {
     osalSysLockFromISR();

     if (iqIsEmptyI(&sdp->iqueue))

       chnAddFlagsI(sdp, CHN_INPUT_AVAILABLE);

-    if (iqPutI(&sdp->iqueue, u->D) < Q_OK)

+    if (iqPutI(&sdp->iqueue, u->D) < MSG_OK)

       chnAddFlagsI(sdp, SD_OVERRUN_ERROR);

     osalSysUnlockFromISR();

   }

@@ -95,7 +95,7 @@ static void serve_interrupt(SerialDriver *sdp) {
     b = oqGetI(&sdp->oqueue);

     osalSysUnlockFromISR();

 

-    if (b < Q_OK) {

+    if (b < MSG_OK) {

       osalSysLockFromISR();

       chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY);

       osalSysUnlockFromISR();

@@ -123,7 +123,7 @@ static void preload(SerialDriver *sdp) {
 

   if (u->S1 & UARTx_S1_TDRE) {

     msg_t b = oqGetI(&sdp->oqueue);

-    if (b < Q_OK) {

+    if (b < MSG_OK) {

       chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY);

       return;

     }

diff --git a/os/hal/ports/LPC/LPC214x/serial_lld.c b/os/hal/ports/LPC/LPC214x/serial_lld.c
index d8154396e..c5dc356c8 100644
--- a/os/hal/ports/LPC/LPC214x/serial_lld.c
+++ b/os/hal/ports/LPC/LPC214x/serial_lld.c
@@ -141,7 +141,7 @@ static void serve_interrupt(SerialDriver *sdp) {
       osalSysUnlockFromISR();

       while (u->UART_LSR & LSR_RBR_FULL) {

         osalSysLockFromISR();

-        if (chIQPutI(&sdp->iqueue, u->UART_RBR) < Q_OK)

+        if (chIQPutI(&sdp->iqueue, u->UART_RBR) < MSG_OK)

           chnAddFlagsI(sdp, SD_OVERRUN_ERROR);

         osalSysUnlockFromISR();

       }

@@ -155,7 +155,7 @@ static void serve_interrupt(SerialDriver *sdp) {
           osalSysLockFromISR();

           b = chOQGetI(&sdp->oqueue);

           osalSysUnlockFromISR();

-          if (b < Q_OK) {

+          if (b < MSG_OK) {

             u->UART_IER &= ~IER_THRE;

             osalSysLockFromISR();

             chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY);

@@ -183,7 +183,7 @@ static void preload(SerialDriver *sdp) {
     int i = LPC214x_UART_FIFO_PRELOAD;

     do {

       msg_t b = chOQGetI(&sdp->oqueue);

-      if (b < Q_OK) {

+      if (b < MSG_OK) {

         chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY);

         return;

       }

diff --git a/os/hal/ports/STM32/LLD/USARTv1/serial_lld.c b/os/hal/ports/STM32/LLD/USARTv1/serial_lld.c
index 801b4fa20..89baa94d0 100644
--- a/os/hal/ports/STM32/LLD/USARTv1/serial_lld.c
+++ b/os/hal/ports/STM32/LLD/USARTv1/serial_lld.c
@@ -194,7 +194,7 @@ static void serve_interrupt(SerialDriver *sdp) {
     msg_t b;

     osalSysLockFromISR();

     b = oqGetI(&sdp->oqueue);

-    if (b < Q_OK) {

+    if (b < MSG_OK) {

       chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY);

       u->CR1 = (cr1 & ~USART_CR1_TXEIE) | USART_CR1_TCIE;

     }

diff --git a/os/hal/ports/STM32/LLD/USARTv2/serial_lld.c b/os/hal/ports/STM32/LLD/USARTv2/serial_lld.c
index 88e05e26e..acfba3138 100644
--- a/os/hal/ports/STM32/LLD/USARTv2/serial_lld.c
+++ b/os/hal/ports/STM32/LLD/USARTv2/serial_lld.c
@@ -221,7 +221,7 @@ static void serve_interrupt(SerialDriver *sdp) {
     msg_t b;

     osalSysLockFromISR();

     b = oqGetI(&sdp->oqueue);

-    if (b < Q_OK) {

+    if (b < MSG_OK) {

       chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY);

       u->CR1 = (cr1 & ~USART_CR1_TXEIE) | USART_CR1_TCIE;

     }