Changeset af16ebe in mainline for uspace/lib

Timestamp:

2018-02-05T00:54:52Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

239eea41

Parents:

c21e6a5

git-author:

Ondřej Hlavatý <aearsis@…> (2018-02-05 00:49:07)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-02-05 00:54:52)

Message:

usb: redefine max_transfer_size

Location:

uspace/lib

Files:

• drv/include/usbhc_iface.h (modified) (1 diff)
• usbhost/src/endpoint.c (modified) (1 diff)

uspace/lib/drv/include/usbhc_iface.h

@@ -116 +116 @@
         usb_direction_t direction;
 
-        /** Maximum size of one transfer */
+        /**
+         * Maximum size of one transfer. Non-periodic endpoints may handle
+         * bigger transfers, but those can be split into multiple USB transfers.
+         */
         size_t max_transfer_size;
 

uspace/lib/usbhost/src/endpoint.c

@@ -244 +244 @@
         }
 
-        /** Limit transfers with reserved bandwidth to the amount reserved */
-        if (ep->direction == USB_DIRECTION_OUT && size > ep->max_transfer_size)
-                return ENOSPC;
+        /*
+         * Limit transfers with reserved bandwidth to the amount reserved.
+         * OUT transfers are rejected, IN can be just trimmed in advance.
+         */
+        if ((ep->transfer_type == USB_TRANSFER_INTERRUPT || ep->transfer_type == USB_TRANSFER_ISOCHRONOUS) && size > ep->max_transfer_size) {
+                if (direction == USB_DIRECTION_OUT)
+                        return ENOSPC;
+                else
+                        size = ep->max_transfer_size;
+
+        }
 
         /* Offline devices don't schedule transfers other than on EP0. */