Changes in uspace/drv/usbhub/ports.c [192ba25:af6136d] in mainline

File:

• uspace/drv/usbhub/ports.c (modified) (6 diffs)

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), "
@@ -406 +407 @@
 leave:
         free(arg);
+
+        fibril_mutex_lock(&data->hub->pending_ops_mutex);
+        assert(data->hub->pending_ops_count > 0);
+        data->hub->pending_ops_count--;
+        fibril_condvar_signal(&data->hub->pending_ops_cv);
+        fibril_mutex_unlock(&data->hub->pending_ops_mutex);
+
 
         return EOK;
@@ -452 +460 @@
                 return ENOMEM;
         }
+        fibril_mutex_lock(&hub->pending_ops_mutex);
+        hub->pending_ops_count++;
+        fibril_mutex_unlock(&hub->pending_ops_mutex);
         fibril_add_ready(fibril);