Changeset af6136d in mainline

Timestamp:

2011-05-28T14:54:20Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

dd143621

Parents:

3fb5a3e

Message:

Guard hub ports with mutex

Location:

uspace/drv/usbhub

Files:

• ports.c (modified) (4 diffs)
• usbhub.c (modified) (1 diff)
• usbhub.h (modified) (1 diff)

uspace/drv/usbhub/ports.c

@@ -202 +202 @@
 
         //close address
-        if(hub->ports[port].attached_device.address >= 0){
-                /*uncomment this code to use it when DDF allows device removal
-                opResult = usb_hc_unregister_device(
-                        &hub->connection,
-                        hub->attached_devs[port].address);
-                if(opResult != EOK) {
-                        dprintf(USB_LOG_LEVEL_WARNING, "could not release "
-                                "address of "
-                            "removed device: %d", opResult);
-                }
-                hub->attached_devs[port].address = 0;
-                hub->attached_devs[port].handle = 0;
-                 */
+
+        usb_hub_port_t *the_port = hub->ports + port;
+
+        fibril_mutex_lock(&hub->port_mutex);
+
+        if (the_port->attached_device.address >= 0) {
+                usb_log_warning("Device unplug on `%s' (port %zu): " \
+                    "not implemented.\n", hub->usb_device->ddf_dev->name,
+                    (size_t) port);
+                the_port->attached_device.address = -1;
+                the_port->attached_device.handle = 0;
         } else {
                 usb_log_warning("Device removed before being registered.\n");
@@ -223 +221 @@
                  * port reset callback from new device wrapper.
                  */
-                usb_hub_port_t *the_port = hub->ports + port;
                 fibril_mutex_lock(&the_port->reset_mutex);
                 the_port->reset_completed = true;
@@ -230 +227 @@
                 fibril_mutex_unlock(&the_port->reset_mutex);
         }
+
+        fibril_mutex_unlock(&hub->port_mutex);
 }
 
@@ -396 +395 @@
         }
 
+        fibril_mutex_lock(&data->hub->port_mutex);
         data->hub->ports[data->port].attached_device.handle = child_handle;
         data->hub->ports[data->port].attached_device.address = new_address;
+        fibril_mutex_unlock(&data->hub->port_mutex);
 
         usb_log_info("Detected new device on `%s' (port %zu), "

uspace/drv/usbhub/usbhub.c

@@ -200 +200 @@
         result->control_pipe = &usb_dev->ctrl_pipe;
         result->is_default_address_used = false;
+
+        result->ports = NULL;
+        result->port_count = (size_t) -1;
+        fibril_mutex_initialize(&result->port_mutex);
 
         fibril_mutex_initialize(&result->pending_ops_mutex);

uspace/drv/usbhub/usbhub.h

@@ -61 +61 @@
         usb_hub_port_t *ports;
 
+        fibril_mutex_t port_mutex;
+
         /** connection to hcd */
         usb_hc_connection_t connection;