Changeset f37eb84 in mainline

Timestamp:

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

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

27736cf

Parents:

062165f

Message:

libusbhost, libusbdev: Fix releasing default address.

Location:

uspace/lib

Files:

• usbdev/src/hub.c (modified) (3 diffs)
• usbhost/src/iface.c (modified) (1 diff)
• usbhost/src/usb_device_manager.c (modified) (1 diff)

uspace/lib/usbdev/src/hub.c

@@ -265 +265 @@
         }
 
-        rc = usb_pipe_register_with_speed(&ctrl_pipe, dev_speed, 0, &hc_conn);
+        rc = usb_pipe_register(&ctrl_pipe, 0, &hc_conn);
         if (rc != EOK) {
                 rc = ENOTCONN;
@@ -320 +320 @@
          */
         unregister_control_endpoint_on_default_address(&hc_conn);
+        usb_hc_unregister_device(&hc_conn, USB_ADDRESS_DEFAULT);
 
         /*
@@ -381 +382 @@
                 usb_log_warning("%s: Failed to unregister default pipe.\n",
                     __FUNCTION__);
+        usb_hc_unregister_device(&hc_conn, USB_ADDRESS_DEFAULT);
 
 leave_release_free_address:

uspace/lib/usbhost/src/iface.c

@@ -104 +104 @@
         assert(address);
 
-        usb_log_debug("Address request speed: %s.\n", usb_str_speed(speed));
+        usb_log_debug("Address request: speed: %s, address: %d, strict: %s.\n",
+            usb_str_speed(speed), *address, strict ? "YES" : "NO");
         return usb_device_manager_request_address(
             &hcd->dev_manager, address, strict, speed);

uspace/lib/usbhost/src/usb_device_manager.c

@@ -166 +166 @@
     usb_device_manager_t *instance, usb_address_t address)
 {
-        if ((address <= 0) || (address >= USB_ADDRESS_COUNT)) {
+        if ((address < 0) || (address >= USB_ADDRESS_COUNT)) {
                 return EINVAL;
         }