Changeset fcdab1e in mainline

Timestamp:

2018-01-12T11:42:00Z (6 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

0fcccd9

Parents:

b233821

Message:

usbhid: join without defuncting the DDF node

File:

• uspace/drv/hid/usbhid/main.c (modified) (3 diffs)

uspace/drv/hid/usbhid/main.c

@@ -137 +137 @@
 }
 
-/**
- * Callback for when a device has just been from the driver.
- *
- * @param dev Structure representing the device.
- * @return Error code.
- */
-static int usb_hid_device_removed(usb_device_t *dev)
-{
-        assert(dev);
-        usb_hid_dev_t *hid_dev = usb_device_data_get(dev);
-        assert(hid_dev);
-
-        usb_log_info("%s endpoints unregistered, joining polling fibril.\n", usb_device_get_name(dev));
+static int join_and_clean(usb_device_t *dev)
+{
+        assert(dev);
+        usb_hid_dev_t *hid_dev = usb_device_data_get(dev);
+        assert(hid_dev);
 
         /* Join polling fibril. */
@@ -165 +157 @@
 
 /**
+ * Callback for when a device has just been from the driver.
+ *
+ * @param dev Structure representing the device.
+ * @return Error code.
+ */
+static int usb_hid_device_removed(usb_device_t *dev)
+{
+        assert(dev);
+        usb_hid_dev_t *hid_dev = usb_device_data_get(dev);
+        assert(hid_dev);
+
+        usb_log_info("%s endpoints unregistered, joining polling fibril.\n", usb_device_get_name(dev));
+        return join_and_clean(dev);
+}
+
+/**
  * Callback for removing a device from the driver.
  *
@@ -178 +186 @@
         usb_log_info("Device %s gone, joining the polling fibril.\n", usb_device_get_name(dev));
         usb_hid_prepare_deinit(hid_dev);
-
-        unsigned tries = 100;
-        /* Wait for fail. */
-        while (hid_dev->running && tries--) {
-                async_usleep(100000);
-        }
-        if (hid_dev->running) {
-                usb_log_error("Can't remove hid, still running.\n");
-                return EBUSY;
-        }
-
-        usb_hid_deinit(hid_dev);
-        usb_log_info("%s destruction complete.\n", usb_device_get_name(dev));
-
-        return EOK;
+        return join_and_clean(dev);
 }