Removed flags handling in BaseAsynchronousChannel. Modified serial drivers to use the new event flags.

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

2 files changed, 2 insertions, 15 deletions

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

 }

 

-static chnflags_t getflags(void *ip) {

-  _chn_get_and_clear_flags_impl(ip);

-}

-

 static const struct SerialDriverVMT vmt = {

   write, read, put, get,

-  putt, gett, writet, readt,

-  getflags

+  putt, gett, writet, readt

 };

 

 /*===========================================================================*/

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

   sdp->vmt = &vmt;

   chEvtInit(&sdp->event);

-  sdp->flags = CHN_NO_ERROR;

   sdp->state = SD_STOP;

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

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

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

 }

 

-static chnflags_t getflags(void *ip) {

-  _chn_get_and_clear_flags_impl(ip);

-}

-

 static const struct SerialUSBDriverVMT vmt = {

   write, read, put, get,

-  putt, gett, writet, readt,

-  getflags

+  putt, gett, writet, readt

 };

 

 /**

@@ -197,7 +192,6 @@ void sduObjectInit(SerialUSBDriver *sdup) {
 

   sdup->vmt = &vmt;

   chEvtInit(&sdup->event);

-  sdup->flags = CHN_NO_ERROR;

   sdup->state = SDU_STOP;

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

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

@@ -256,7 +250,6 @@ void sduStop(SerialUSBDriver *sdup) {
 void sduConfigureHookI(USBDriver *usbp) {

   SerialUSBDriver *sdup = usbp->param;

 

-  sdup->flags = CHN_NO_ERROR;

   chIQResetI(&sdup->iqueue);

   chOQResetI(&sdup->oqueue);

   chnAddFlagsI(sdup, CHN_CONNECTED);