Changeset 91173333 in mainline for uspace/drv/bus/usb/usbhub/usbhub.c

Timestamp:

2018-01-13T21:36:13Z (6 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

edc51615

Parents:

8a0c52a

Message:

usbdev: use centralized joining mechanism, move away from device_removed() callback

File:

• uspace/drv/bus/usb/usbhub/usbhub.c (modified) (7 diffs)

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

@@ -99 +99 @@
 
         /* Continue polling until the device is about to be removed. */
-        return hub->running && !hub->poll_stop;
+        return hub->running;
 }
 
@@ -123 +123 @@
         hub_dev->pending_ops_count = 0;
         hub_dev->running = false;
-        hub_dev->poll_stop = false;
         fibril_mutex_initialize(&hub_dev->pending_ops_mutex);
-        fibril_mutex_initialize(&hub_dev->poll_guard);
         fibril_condvar_initialize(&hub_dev->pending_ops_cv);
-        fibril_condvar_initialize(&hub_dev->poll_cv);
 
         /* Set hub's first configuration. (There should be only one) */
@@ -197 +194 @@
 }
 
-/**
- * Turn off power to all ports.
- *
- * @param usb_dev generic usb device information
- * @return error code
- */
-int usb_hub_device_remove(usb_device_t *usb_dev)
-{
-        assert(usb_dev);
-        usb_hub_dev_t *hub = usb_device_data_get(usb_dev);
-        assert(hub);
-
-        usb_log_info("(%p) USB hub will be removed.", hub);
-
-        /* Instruct the hub to stop once endpoints are unregistered. */
-        hub->poll_stop = true;
-        return EOK;
-}
-
 static int usb_hub_cleanup(usb_hub_dev_t *hub)
 {
@@ -241 +219 @@
 }
 
-int usb_hub_device_removed(usb_device_t *usb_dev)
+/**
+ * Turn off power to all ports.
+ *
+ * @param usb_dev generic usb device information
+ * @return error code
+ */
+int usb_hub_device_remove(usb_device_t *usb_dev)
 {
         assert(usb_dev);
@@ -247 +231 @@
         assert(hub);
 
-        usb_log_info("(%p) USB hub was removed, joining polling fibril.", hub);
+        usb_log_info("(%p) USB hub removed, joining polling fibril.", hub);
 
         /* Join polling fibril. */
-        fibril_mutex_lock(&hub->poll_guard);
-        while (hub->running)
-                fibril_condvar_wait(&hub->poll_cv, &hub->poll_guard);
-        fibril_mutex_unlock(&hub->poll_guard);
-
+        usb_device_poll_join(hub->polling);
         usb_log_info("(%p) USB hub polling stopped, freeing memory.", hub);
 
@@ -272 +252 @@
         assert(hub);
 
-        hub->poll_stop = true;
         usb_log_info("(%p) USB hub gone, joining polling fibril.", hub);
 
         /* Join polling fibril. */
-        fibril_mutex_lock(&hub->poll_guard);
-        while (hub->running)
-                fibril_condvar_wait(&hub->poll_cv, &hub->poll_guard);
-        fibril_mutex_unlock(&hub->poll_guard);
+        usb_device_poll_join(hub->polling);
+        usb_log_info("(%p) USB hub polling stopped, freeing memory.", hub);
 
         /* Destroy hub. */
@@ -592 +569 @@
         fibril_mutex_unlock(&hub->pending_ops_mutex);
         hub->running = false;
-
-        /* Signal polling end to joining thread. */
-        fibril_mutex_lock(&hub->poll_guard);
-        fibril_condvar_signal(&hub->poll_cv);
-        fibril_mutex_unlock(&hub->poll_guard);
-}
+}
+
 /**
  * @}