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

2 files changed, 80 insertions, 17 deletions

diff --git a/os/hal/src/serial_usb.c b/os/hal/src/serial_usb.c
index 60976eca2..29aec2650 100644
--- a/os/hal/src/serial_usb.c
+++ b/os/hal/src/serial_usb.c
@@ -119,9 +119,9 @@ static void inotify(GenericQueue *qp) {
      emptied, then a whole packet is loaded in the queue.*/

   if (chIQIsEmptyI(&sdup->iqueue)) {

 

-    n = usbReadI(sdup->config->usbp, sdup->config->data_available_ep,

-                 sdup->iqueue.q_buffer, SERIAL_USB_BUFFERS_SIZE);

-    if (n > 0) {

+    n = usbReadPacketI(sdup->config->usbp, sdup->config->data_available_ep,

+                       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);

     }

@@ -137,9 +137,9 @@ static void onotify(GenericQueue *qp) {
 

   /* If there is any data in the output queue then it is sent within a

      single packet and the queue is emptied.*/

-  n = usbWriteI(sdup->config->usbp, sdup->config->data_request_ep,

-                sdup->oqueue.q_buffer, chOQGetFullI(&sdup->oqueue));

-  if (n > 0) {

+  n = usbWritePacketI(sdup->config->usbp, sdup->config->data_request_ep,

+                      sdup->oqueue.q_buffer, chOQGetFullI(&sdup->oqueue));

+  if (n != USB_ENDPOINT_BUSY) {

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

     chSemSetCounterI(&sdup->oqueue.q_sem, SERIAL_USB_BUFFERS_SIZE);

   }

@@ -278,8 +278,8 @@ void sduDataTransmitted(USBDriver *usbp, usbep_t ep) {
      single packet and the queue is emptied.*/

   n = chOQGetFullI(&sdup->oqueue);

   if (n > 0) {

-    n = usbWriteI(usbp, ep, sdup->oqueue.q_buffer, n);

-    if (n > 0) {

+    n = usbWritePacketI(usbp, ep, sdup->oqueue.q_buffer, n);

+    if (n != USB_ENDPOINT_BUSY) {

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

       chSemSetCounterI(&sdup->oqueue.q_sem, SERIAL_USB_BUFFERS_SIZE);

       chIOAddFlagsI(sdup, IO_OUTPUT_EMPTY);

@@ -302,8 +302,9 @@ void sduDataReceived(USBDriver *usbp, usbep_t ep) {
   if (chIQIsEmptyI(&sdup->iqueue)) {

     size_t n;

 

-    n = usbReadI(usbp, ep, sdup->iqueue.q_buffer, SERIAL_USB_BUFFERS_SIZE);

-    if (n > 0) {

+    n = usbReadPacketI(usbp, ep, 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);

       chIOAddFlagsI(sdup, IO_INPUT_AVAILABLE);

diff --git a/os/hal/src/usb.c b/os/hal/src/usb.c
index d0db0ed5c..afec3c645 100644
--- a/os/hal/src/usb.c
+++ b/os/hal/src/usb.c
@@ -338,15 +338,73 @@ void usbDisableEndpointsI(USBDriver *usbp) {
 }

 

 /**

+ * @brief   Reads a packet from the dedicated packet buffer.

+ * @pre     In order to use this function he endpoint must have been

+ *          initialized in packet mode.

+ * @post    The endpoint is ready to accept another packet.

+ *

+ * @param[in] usbp      pointer to the @p USBDriver object

+ * @param[in] ep        endpoint number

+ * @param[out] buf      buffer where to copy the packet data

+ * @param[in] n         maximum number of bytes to copy. This value must

+ *                      not exceed the maximum packet size for this endpoint.

+ * @return              The received packet size regardless the specified

+ *                      @p n parameter.

+ * @retval USB_ENDPOINT_BUSY Endpoint busy receiving.

+ * @retval 0            Zero size packet received.

+ *

+ * @iclass

+ */

+size_t usbReadPacketI(USBDriver *usbp, usbep_t ep,

+                      uint8_t *buf, size_t n) {

+

+  if (usbp->ep[ep]->receiving)

+    return USB_ENDPOINT_BUSY;

+

+  return usb_lld_read_packet(usbp, ep, buf, n);;

+}

+

+/**

+ * @brief   Writes a packet to the dedicated packet buffer.

+ * @pre     In order to use this function he endpoint must have been

+ *          initialized in packet mode.

+ * @post    The endpoint is ready to transmit the packet.

+ *

+ * @param[in] usbp      pointer to the @p USBDriver object

+ * @param[in] ep        endpoint number

+ * @param[in] buf       buffer where to fetch the packet data

+ * @param[in] n         maximum number of bytes to copy. This value must

+ *                      not exceed the maximum packet size for this endpoint.

+ * @return              The operation status.

+ * @retval USB_ENDPOINT_BUSY Endpoint busy transmitting.

+ * @retval 0            Operation complete.

+ *

+ * @iclass

+ */

+size_t usbWritePacketI(USBDriver *usbp, usbep_t ep,

+                       const uint8_t *buf, size_t n) {

+

+  if (usbp->ep[ep]->transmitting)

+    return USB_ENDPOINT_BUSY;

+

+  usb_lld_write_packet(usbp, ep, buf, n);

+  return 0;

+}

+

+/**

  * @brief   Starts a receive operation on an OUT endpoint.

+ * @pre     In order to use this function he endpoint must have been

+ *          initialized in transaction mode.

+ * @post    The endpoint callback is invoked when the transfer has been

+ *          completed.

  *

  * @param[in] usbp      pointer to the @p USBDriver object

  * @param[in] ep        endpoint number

- * @param[out] buf      buffer where to copy the endpoint data

- * @param[in] n         maximum number of bytes to copy in the buffer

+ * @param[out] buf      buffer where to copy the received data

+ * @param[in] n         maximum number of bytes to copy

  * @return              The operation status.

- * @retval FALSE        Receive operation started.

- * @retval TRUE         Endpoint already receiving.

+ * @retval FALSE        Operation complete.

+ * @retval TRUE         Endpoint busy receiving.

  *

  * @iclass

  */

@@ -362,14 +420,18 @@ bool_t usbStartReceiveI(USBDriver *usbp, usbep_t ep,
 

 /**

  * @brief   Starts a transmit operation on an IN endpoint.

+ * @pre     In order to use this function he endpoint must have been

+ *          initialized in transaction mode.

+ * @post    The endpoint callback is invoked when the transfer has been

+ *          completed.

  *

  * @param[in] usbp      pointer to the @p USBDriver object

  * @param[in] ep        endpoint number

- * @param[in] buf       buffer where to fetch the endpoint data

+ * @param[in] buf       buffer where to fetch the data to be transmitted

  * @param[in] n         maximum number of bytes to copy

  * @return              The operation status.

- * @retval FALSE        Transmit operation started.

- * @retval TRUE         Endpoint already transmitting.

+ * @retval FALSE        Operation complete.

+ * @retval TRUE         Endpoint busy transmitting.

  *

  * @iclass

  */