From de877486efb49378065f769ff423eef19ceb12e6 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 9 Apr 2011 15:10:15 +0000
Subject: Fixed bug 3276379.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2872 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/hal/src/serial_usb.c | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

(limited to 'os/hal/src')

diff --git a/os/hal/src/serial_usb.c b/os/hal/src/serial_usb.c
index b6ad10c13..bc2c39426 100644
--- a/os/hal/src/serial_usb.c
+++ b/os/hal/src/serial_usb.c
@@ -59,44 +59,44 @@ static cdc_linecoding_t linecoding = {
 
 static size_t writes(void *ip, const uint8_t *bp, size_t n) {
 
-  return chOQWriteTimeout(&((SerialDriver *)ip)->oqueue, bp,
+  return chOQWriteTimeout(&((SerialUSBDriver *)ip)->oqueue, bp,
                           n, TIME_INFINITE);
 }
 
 static size_t reads(void *ip, uint8_t *bp, size_t n) {
 
-  return chIQReadTimeout(&((SerialDriver *)ip)->iqueue, bp,
+  return chIQReadTimeout(&((SerialUSBDriver *)ip)->iqueue, bp,
                          n, TIME_INFINITE);
 }
 
 static bool_t putwouldblock(void *ip) {
 
-  return chOQIsFullI(&((SerialDriver *)ip)->oqueue);
+  return chOQIsFullI(&((SerialUSBDriver *)ip)->oqueue);
 }
 
 static bool_t getwouldblock(void *ip) {
 
-  return chIQIsEmptyI(&((SerialDriver *)ip)->iqueue);
+  return chIQIsEmptyI(&((SerialUSBDriver *)ip)->iqueue);
 }
 
 static msg_t putt(void *ip, uint8_t b, systime_t timeout) {
 
-  return chOQPutTimeout(&((SerialDriver *)ip)->oqueue, b, timeout);
+  return chOQPutTimeout(&((SerialUSBDriver *)ip)->oqueue, b, timeout);
 }
 
 static msg_t gett(void *ip, systime_t timeout) {
 
-  return chIQGetTimeout(&((SerialDriver *)ip)->iqueue, timeout);
+  return chIQGetTimeout(&((SerialUSBDriver *)ip)->iqueue, timeout);
 }
 
 static size_t writet(void *ip, const uint8_t *bp, size_t n, systime_t time) {
 
-  return chOQWriteTimeout(&((SerialDriver *)ip)->oqueue, bp, n, time);
+  return chOQWriteTimeout(&((SerialUSBDriver *)ip)->oqueue, bp, n, time);
 }
 
 static size_t readt(void *ip, uint8_t *bp, size_t n, systime_t time) {
 
-  return chIQReadTimeout(&((SerialDriver *)ip)->iqueue, bp, n, time);
+  return chIQReadTimeout(&((SerialUSBDriver *)ip)->iqueue, bp, n, time);
 }
 
 static ioflags_t getflags(void *ip) {
@@ -124,7 +124,7 @@ static void inotify(GenericQueue *qp) {
                        sdup->iqueue.q_buffer, SERIAL_USB_BUFFERS_SIZE);
     if (n != USB_ENDPOINT_BUSY) {
       sdup->iqueue.q_rdptr = sdup->iqueue.q_buffer;
-      chSemSetCounterI(&sdup->iqueue.q_sem, n);
+      chSemAddCounterI(&sdup->iqueue.q_sem, n);
       chIOAddFlagsI(sdup, IO_INPUT_AVAILABLE);
     }
   }
@@ -135,15 +135,16 @@ static void inotify(GenericQueue *qp) {
  */
 static void onotify(GenericQueue *qp) {
   SerialUSBDriver *sdup = (SerialUSBDriver *)qp->q_rdptr;
-  size_t n;
+  size_t w, n;
 
   /* If there is any data in the output queue then it is sent within a
      single packet and the queue is emptied.*/
-  n = usbWritePacketI(sdup->config->usbp, DATA_REQUEST_EP,
-                      sdup->oqueue.q_buffer, chOQGetFullI(&sdup->oqueue));
-  if (n != USB_ENDPOINT_BUSY) {
+  n = chOQGetFullI(&sdup->oqueue);
+  w = usbWritePacketI(sdup->config->usbp, DATA_REQUEST_EP,
+                      sdup->oqueue.q_buffer, n);
+  if (w != USB_ENDPOINT_BUSY) {
     sdup->oqueue.q_wrptr = sdup->oqueue.q_buffer;
-    chSemSetCounterI(&sdup->oqueue.q_sem, SERIAL_USB_BUFFERS_SIZE);
+    chSemAddCounterI(&sdup->oqueue.q_sem, n);
     chIOAddFlagsI(sdup, IO_OUTPUT_EMPTY);
   }
 }
@@ -276,17 +277,17 @@ bool_t sduRequestsHook(USBDriver *usbp) {
  */
 void sduDataTransmitted(USBDriver *usbp, usbep_t ep) {
   SerialUSBDriver *sdup = usbp->param;
-  size_t n;
+  size_t n, w;
 
   chSysLockFromIsr();
   /* If there is any data in the output queue then it is sent within a
      single packet and the queue is emptied.*/
   n = chOQGetFullI(&sdup->oqueue);
   if (n > 0) {
-    n = usbWritePacketI(usbp, ep, sdup->oqueue.q_buffer, n);
-    if (n != USB_ENDPOINT_BUSY) {
+    w = usbWritePacketI(usbp, ep, sdup->oqueue.q_buffer, n);
+    if (w != USB_ENDPOINT_BUSY) {
       sdup->oqueue.q_wrptr = sdup->oqueue.q_buffer;
-      chSemSetCounterI(&sdup->oqueue.q_sem, SERIAL_USB_BUFFERS_SIZE);
+      chSemAddCounterI(&sdup->oqueue.q_sem, n);
       chIOAddFlagsI(sdup, IO_OUTPUT_EMPTY);
     }
   }
@@ -314,7 +315,7 @@ void sduDataReceived(USBDriver *usbp, usbep_t ep) {
                        SERIAL_USB_BUFFERS_SIZE);
     if (n != USB_ENDPOINT_BUSY) {
       sdup->iqueue.q_rdptr = sdup->iqueue.q_buffer;
-      chSemSetCounterI(&sdup->iqueue.q_sem, n);
+      chSemAddCounterI(&sdup->iqueue.q_sem, n);
       chIOAddFlagsI(sdup, IO_INPUT_AVAILABLE);
     }
   }
-- 
cgit v1.2.3