Changeset 91173333 in mainline for uspace/drv/hid

Timestamp:

2018-01-13T21:36:13Z (8 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

Location:

uspace/drv/hid/usbhid

Files:

• generic/hiddev.c (modified) (1 diff)
• kbd/kbddev.c (modified) (1 diff)
• main.c (modified) (5 diffs)
• mouse/mousedev.c (modified) (1 diff)
• multimedia/multimedia.c (modified) (3 diffs)
• usbhid.c (modified) (4 diffs)
• usbhid.h (modified) (3 diffs)

uspace/drv/hid/usbhid/generic/hiddev.c

@@ -220 +220 @@
 {
         /* Continue polling until the device is about to be removed. */
-        return !hid_dev->poll_stop;
+        return true;
 }
 

uspace/drv/hid/usbhid/kbd/kbddev.c

@@ -710 +710 @@
 
         /* Continue polling until the device is about to be removed. */
-        return !hid_dev->poll_stop;
+        return true;
 }
 

uspace/drv/hid/usbhid/main.c

@@ -40 +40 @@
 #include <errno.h>
 #include <str_error.h>
-#include <fibril_synch.h>
 
 #include <usb/dev/driver.h>
@@ -117 +116 @@
 }
 
+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. */
+        usb_device_poll_join(hid_dev->polling);
+
+        /* Clean up. */
+        usb_hid_deinit(hid_dev);
+        usb_log_info("%s destruction complete.\n", usb_device_get_name(dev));
+
+        return EOK;
+}
+
 /**
  * Callback for a device about to be removed from the driver.
@@ -129 +144 @@
         assert(hid_dev);
 
-        usb_log_info("%s will be removed, setting remove flag.\n", usb_device_get_name(dev));
-        usb_hid_prepare_deinit(hid_dev);
-
-        return EOK;
-}
-
-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. */
-        fibril_mutex_lock(&hid_dev->poll_guard);
-        while (hid_dev->running)
-                fibril_condvar_wait(&hid_dev->poll_cv, &hid_dev->poll_guard);
-        fibril_mutex_unlock(&hid_dev->poll_guard);
-
-        /* Clean up. */
-        usb_hid_deinit(hid_dev);
-        usb_log_info("%s destruction complete.\n", usb_device_get_name(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);
-
-        usb_log_info("%s endpoints unregistered, joining polling fibril.\n", usb_device_get_name(dev));
+        usb_log_info("Device %s removed.\n", usb_device_get_name(dev));
         return join_and_clean(dev);
 }
@@ -182 +160 @@
         assert(hid_dev);
 
-        usb_log_info("Device %s gone, joining the polling fibril.\n", usb_device_get_name(dev));
-        usb_hid_prepare_deinit(hid_dev);
+        usb_log_info("Device %s gone.\n", usb_device_get_name(dev));
         return join_and_clean(dev);
 }
@@ -191 +168 @@
         .device_add = usb_hid_device_add,
         .device_remove = usb_hid_device_remove,
-        .device_removed = usb_hid_device_removed,
         .device_gone = usb_hid_device_gone,
 };

uspace/drv/hid/usbhid/mouse/mousedev.c

@@ -415 +415 @@
 
         /* Continue polling until the device is about to be removed. */
-        return !hid_dev->poll_stop;
+        return true;
 }
 

uspace/drv/hid/usbhid/multimedia/multimedia.c

@@ -246 +246 @@
         usb_hid_report_path_t *path = usb_hid_report_path();
         if (path == NULL)
-                return !hid_dev->poll_stop; /* This might be a temporary failure. */
+                return true; /* This might be a temporary failure. */
 
         int ret =
@@ -252 +252 @@
         if (ret != EOK) {
                 usb_hid_report_path_free(path);
-                return !hid_dev->poll_stop; /* This might be a temporary failure. */
+                return true; /* This might be a temporary failure. */
         }
 
@@ -284 +284 @@
         usb_hid_report_path_free(path);
 
-        return !hid_dev->poll_stop;
+        return true;
 }
 /**

uspace/drv/hid/usbhid/usbhid.c

@@ -355 +355 @@
         hid_dev->poll_pipe_mapping = NULL;
 
-        hid_dev->poll_stop = false;
-        fibril_mutex_initialize(&hid_dev->poll_guard);
-        fibril_condvar_initialize(&hid_dev->poll_cv);
-
         int rc = usb_hid_check_pipes(hid_dev, dev);
         if (rc != EOK) {
@@ -506 +502 @@
 
         /* Continue polling until the device is about to be removed. */
-        return hid_dev->running && !hid_dev->poll_stop;
+        return hid_dev->running;
 }
 
@@ -524 +520 @@
 
         hid_dev->running = false;
-
-        /* Signal polling end to joining thread. */
-        fibril_mutex_lock(&hid_dev->poll_guard);
-        fibril_condvar_signal(&hid_dev->poll_cv);
-        fibril_mutex_unlock(&hid_dev->poll_guard);
 }
 
@@ -539 +530 @@
 {
         return hid_dev->report_nr;
-}
-
-void usb_hid_prepare_deinit(usb_hid_dev_t *hid_dev)
-{
-        assert(hid_dev);
-        hid_dev->poll_stop = true;
 }
 

uspace/drv/hid/usbhid/usbhid.h

@@ -46 +46 @@
 #include <usb/hid/hid.h>
 #include <stdbool.h>
-#include <fibril_synch.h>
 
 typedef struct usb_hid_dev usb_hid_dev_t;
@@ -135 +134 @@
         int report_nr;
         volatile bool running;
-
-        /** True if polling should stop as soon as possible */
-        volatile bool poll_stop;
-
-        /** Synchronization primitives for joining polling end. */
-        fibril_mutex_t poll_guard;
-        fibril_condvar_t poll_cv;
 };
 
@@ -147 +139 @@
 
 int usb_hid_init(usb_hid_dev_t *hid_dev, usb_device_t *dev);
-
-void usb_hid_prepare_deinit(usb_hid_dev_t *hid_dev);
 
 void usb_hid_deinit(usb_hid_dev_t *hid_dev);