Changeset 970f6e1 in mainline for uspace/drv/hid/usbhid/main.c

Timestamp:

2018-01-09T18:25:56Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

4793023

Parents:

c386d6d

Message:

usbhid: join polling fibrils in device_remove()

File:

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

uspace/drv/hid/usbhid/main.c

@@ -40 +40 @@
 #include <errno.h>
 #include <str_error.h>
+#include <fibril_synch.h>
 
 #include <usb/dev/driver.h>
@@ -98 +99 @@
            /* Delay */
            -1,
+           /* Callback when the polling fails. */
+           usb_hid_polling_error_callback,
            /* Callback when the polling ends. */
            usb_hid_polling_ended_callback,
@@ -128 +131 @@
         assert(hid_dev);
 
-        /* TODO: Stop device polling prior to deinit. Now it fails on endpoint error. */
-
+        usb_log_debug2("%s will be removed, setting remove flag.\n", usb_device_get_name(dev));
+        usb_hid_prepare_deinit(hid_dev);
+
+        return EOK;
+}
+
+/**
+ * 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);
+
+        /* Join polling fibril. */
+        fibril_mutex_lock(&hid_dev->guard);
+        while (hid_dev->running)
+                fibril_condvar_wait(&hid_dev->poll_end, &hid_dev->guard);
+        fibril_mutex_unlock(&hid_dev->guard);
+
+        /* Clean up. */
         usb_hid_deinit(hid_dev);
         usb_log_debug2("%s destruction complete.\n", usb_device_get_name(dev));
+
         return EOK;
 }
@@ -165 +192 @@
         .device_add = usb_hid_device_add,
         .device_remove = usb_hid_device_remove,
+        .device_removed = usb_hid_device_removed,
         .device_gone = usb_hid_device_gone,
 };