Changeset 1b17e37 in mainline

Timestamp:

2011-10-31T16:15:01Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

062165f

Parents:

67f55e7b

Message:

libusbhost: Require all EP to have their address occupied before registering.

Including 0:0

Location:

uspace/lib/usbhost/src

Files:

• iface.c (modified) (1 diff)
• usb_device_manager.c (modified) (1 diff)

uspace/lib/usbhost/src/iface.c

@@ -190 +190 @@
         assert(hcd);
         const size_t size = max_packet_size;
-        /* Default address is not bound or registered,
-         * thus it does not provide speed info. */
-        usb_speed_t speed = ep_speed;
-        /* NOTE The function will return EINVAL and won't
-         * touch speed variable for default address */
-        usb_device_manager_get_info_by_address(
+        usb_speed_t speed = USB_SPEED_MAX;
+        const int ret = usb_device_manager_get_info_by_address(
             &hcd->dev_manager, address, NULL, &speed);
+        if (ret != EOK) {
+                return ret;
+        }
 
         usb_log_debug("Register endpoint %d:%d %s-%s %s %zuB %ums.\n",

uspace/lib/usbhost/src/usb_device_manager.c

@@ -219 +219 @@
 {
         assert(instance);
-        if ((address <= 0) || (address >= USB_ADDRESS_COUNT)) {
+        if ((address < 0) || (address >= USB_ADDRESS_COUNT)) {
                 return EINVAL;
         }