Changeset c9467b0 in mainline

Timestamp:

2013-01-07T17:30:03Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

a5a470c

Parents:

e6becb9

Message:

usbhub: Fix after porting to new usb ops.

Check attached handle instead of attached device function.
Release default address after successful enumeration.
Decrease pending ops count after device enumeration.

Remove attached_device member.
usb_hub_port_fini is safe to call on ports withou attached devices.

Location:

uspace/drv/bus/usb/usbhub

Files:

• port.c (modified) (3 diffs)
• port.h (modified) (2 diffs)
• usbhub.c (modified) (1 diff)

uspace/drv/bus/usb/usbhub/port.c

@@ -66 +66 @@
 {
         assert(port);
-        if (port->attached_device.fun)
+        if (port->attached_handle != USB_DEVICE_HANDLE_INVALID)
                 return usb_hub_port_device_gone(port, hub);
         return EOK;
@@ -471 +471 @@
         }
 
-        usb_log_fatal("reserving default address\n");
-
         /* Reserve default address */
         int ret;
         while ((ret = usb_reserve_default_address(exch, speed)) == ENOENT) {
-                usb_log_fatal("reserving default address %d\n", ret);
                 async_usleep(1000000);
         }
@@ -507 +504 @@
                                     "Failed to release default address\n");
                 }
+        } else {
+                if (usb_release_default_address(exch) != EOK)
+                        usb_log_warning("Failed to release default address\n");
         }
         async_exchange_end(exch);
+
+        fibril_mutex_lock(&hub->pending_ops_mutex);
+        assert(hub->pending_ops_count > 0);
+        --hub->pending_ops_count;
+        fibril_condvar_signal(&hub->pending_ops_cv);
+        fibril_mutex_unlock(&hub->pending_ops_mutex);
+
         return ret;
 #if 0

uspace/drv/bus/usb/usbhub/port.h

@@ -61 +61 @@
         usb_device_handle_t attached_handle;
 
-        /** Information about attached device. */
-        usb_hub_attached_device_t attached_device;
 } usb_hub_port_t;
 
@@ -73 +71 @@
 {
         assert(port);
-        port->attached_device.address = -1;
-        port->attached_device.fun = NULL;
         port->port_number = port_number;
         port->control_pipe = control_pipe;

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -200 +200 @@
 
         for (size_t port = 0; port < hub->port_count; ++port) {
-                if (hub->ports[port].attached_device.fun) {
-                        const int ret =
-                            usb_hub_port_fini(&hub->ports[port], hub);
-                        if (ret != EOK)
-                                return ret;
-                }
+                const int ret = usb_hub_port_fini(&hub->ports[port], hub);
+                if (ret != EOK)
+                        return ret;
         }
         free(hub->ports);