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

2 files changed, 12 insertions, 12 deletions

diff --git a/os/hal/src/serial.c b/os/hal/src/serial.c
index d0ea89297..aaeb5e6ee 100644
--- a/os/hal/src/serial.c
+++ b/os/hal/src/serial.c
@@ -94,8 +94,8 @@ static size_t readt(void *ip, uint8_t *bp, size_t n, systime_t time) {
   return chIQReadTimeout(&((SerialDriver *)ip)->iqueue, bp, n, time);

 }

 

-static ioflags_t getflags(void *ip) {

-  _ch_get_and_clear_flags_impl(ip);

+static chnflags_t getflags(void *ip) {

+  _chn_get_and_clear_flags_impl(ip);

 }

 

 static const struct SerialDriverVMT vmt = {

@@ -139,7 +139,7 @@ void sdObjectInit(SerialDriver *sdp, qnotify_t inotify, qnotify_t onotify) {
 

   sdp->vmt = &vmt;

   chEvtInit(&sdp->event);

-  sdp->flags = IO_NO_ERROR;

+  sdp->flags = CHN_NO_ERROR;

   sdp->state = SD_STOP;

   chIQInit(&sdp->iqueue, sdp->ib, SERIAL_BUFFERS_SIZE, inotify);

   chOQInit(&sdp->oqueue, sdp->ob, SERIAL_BUFFERS_SIZE, onotify);

@@ -215,9 +215,9 @@ void sdIncomingDataI(SerialDriver *sdp, uint8_t b) {
   chDbgCheck(sdp != NULL, "sdIncomingDataI");

 

   if (chIQIsEmptyI(&sdp->iqueue))

-    chIOAddFlagsI(sdp, IO_INPUT_AVAILABLE);

+    chnAddFlagsI(sdp, CHN_INPUT_AVAILABLE);

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

-    chIOAddFlagsI(sdp, SD_OVERRUN_ERROR);

+    chnAddFlagsI(sdp, SD_OVERRUN_ERROR);

 }

 

 /**

@@ -243,7 +243,7 @@ msg_t sdRequestDataI(SerialDriver *sdp) {
 

   b = chOQGetI(&sdp->oqueue);

   if (b < Q_OK)

-    chIOAddFlagsI(sdp, IO_OUTPUT_EMPTY);

+    chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY);

   return b;

 }

 

diff --git a/os/hal/src/serial_usb.c b/os/hal/src/serial_usb.c
index f007e7bdd..52c57c800 100644
--- a/os/hal/src/serial_usb.c
+++ b/os/hal/src/serial_usb.c
@@ -103,7 +103,7 @@ static size_t readt(void *ip, uint8_t *bp, size_t n, systime_t time) {
   return chIQReadTimeout(&((SerialUSBDriver *)ip)->iqueue, bp, n, time);

 }

 

-static ioflags_t getflags(void *ip) {

+static chnflags_t getflags(void *ip) {

   _ch_get_and_clear_flags_impl(ip);

 }

 

@@ -133,7 +133,7 @@ static void inotify(GenericQueue *qp) {
 

     chSysLock();

     usbStartReceiveI(sdup->config->usbp, USB_CDC_DATA_AVAILABLE_EP);

-    chIOAddFlagsI(sdup, IO_INPUT_AVAILABLE);

+    chnAddFlagsI(sdup, CHN_INPUT_AVAILABLE);

     sdup->iqueue.q_rdptr = sdup->iqueue.q_buffer;

     sdup->iqueue.q_counter = n;

     while (notempty(&sdup->iqueue.q_waiting))

@@ -160,7 +160,7 @@ static void onotify(GenericQueue *qp) {
 

     chSysLock();

     usbStartTransmitI(sdup->config->usbp, USB_CDC_DATA_REQUEST_EP);

-    chIOAddFlagsI(sdup, IO_OUTPUT_EMPTY);

+    chnAddFlagsI(sdup, CHN_OUTPUT_EMPTY);

     sdup->oqueue.q_wrptr = sdup->oqueue.q_buffer;

     sdup->oqueue.q_counter = chQSizeI(&sdup->oqueue);

     while (notempty(&sdup->oqueue.q_waiting))

@@ -195,7 +195,7 @@ void sduObjectInit(SerialUSBDriver *sdup) {
 

   sdup->vmt = &vmt;

   chEvtInit(&sdup->event);

-  sdup->flags = IO_NO_ERROR;

+  sdup->flags = CHN_NO_ERROR;

   sdup->state = SDU_STOP;

   chIQInit(&sdup->iqueue, sdup->ib, SERIAL_USB_BUFFERS_SIZE, inotify);

   chOQInit(&sdup->oqueue, sdup->ob, SERIAL_USB_BUFFERS_SIZE, onotify);

@@ -312,7 +312,7 @@ void sduDataTransmitted(USBDriver *usbp, usbep_t ep) {
 

     chSysLockFromIsr();

     usbStartTransmitI(usbp, ep);

-    chIOAddFlagsI(sdup, IO_OUTPUT_EMPTY);

+    chnAddFlagsI(sdup, CHN_OUTPUT_EMPTY);

     sdup->oqueue.q_wrptr = sdup->oqueue.q_buffer;

     sdup->oqueue.q_counter = chQSizeI(&sdup->oqueue);

     while (notempty(&sdup->oqueue.q_waiting))

@@ -348,7 +348,7 @@ void sduDataReceived(USBDriver *usbp, usbep_t ep) {
 

     chSysLockFromIsr();

     usbStartReceiveI(usbp, ep);

-    chIOAddFlagsI(sdup, IO_INPUT_AVAILABLE);

+    chnAddFlagsI(sdup, CHN_INPUT_AVAILABLE);

     sdup->iqueue.q_rdptr = sdup->iqueue.q_buffer;

     sdup->iqueue.q_counter = n;

     while (notempty(&sdup->iqueue.q_waiting))