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

Timestamp:

2018-01-09T18:25:56Z (6 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/usbhid.c (modified) (7 diffs)

uspace/drv/hid/usbhid/usbhid.c

@@ -332 +332 @@
  * During initialization, the keyboard is switched into boot protocol, the idle
  * rate is set to 0 (infinity), resulting in the keyboard only reporting event
- * when a key is pressed or released. Finally, the LED lights are turned on 
+ * when a key is pressed or released. Finally, the LED lights are turned on
  * according to the default setup of lock keys.
  *
- * @note By default, the keyboards is initialized with Num Lock turned on and 
+ * @note By default, the keyboards is initialized with Num Lock turned on and
  *       other locks turned off.
  *
@@ -354 +354 @@
         hid_dev->usb_dev = dev;
         hid_dev->poll_pipe_mapping = NULL;
+
+        hid_dev->will_deinit = false;
+        fibril_mutex_initialize(&hid_dev->guard);
+        fibril_condvar_initialize(&hid_dev->poll_end);
 
         int rc = usb_hid_check_pipes(hid_dev, dev);
@@ -492 +496 @@
 }
 
+bool usb_hid_polling_error_callback(usb_device_t *dev, int err_code, void *arg)
+{
+        assert(dev);
+        assert(arg);
+        usb_hid_dev_t *hid_dev = arg;
+
+        usb_log_error("Device %s polling error: %s", usb_device_get_name(dev),
+            str_error(err_code));
+
+        /* Continue polling until the device is about to be removed. */
+        return hid_dev->running && !hid_dev->will_deinit;
+}
+
 void usb_hid_polling_ended_callback(usb_device_t *dev, bool reason, void *arg)
 {
@@ -507 +524 @@
 
         hid_dev->running = false;
+
+        /* Signal polling end to joining thread. */
+        fibril_mutex_lock(&hid_dev->guard);
+        fibril_condvar_signal(&hid_dev->poll_end);
+        fibril_mutex_unlock(&hid_dev->guard);
 }
 
@@ -517 +539 @@
 {
         return hid_dev->report_nr;
+}
+
+void usb_hid_prepare_deinit(usb_hid_dev_t *hid_dev)
+{
+        assert(hid_dev);
+        hid_dev->will_deinit = true;
 }
 
@@ -524 +552 @@
         assert(hid_dev->subdrivers != NULL || hid_dev->subdriver_count == 0);
 
-
-        usb_log_debug("Subdrivers: %p, subdriver count: %d\n", 
+        usb_log_debug("Subdrivers: %p, subdriver count: %d\n",
             hid_dev->subdrivers, hid_dev->subdriver_count);
 
@@ -541 +568 @@
         /* Destroy the parser */
         usb_hid_report_deinit(&hid_dev->report);
-
 }