Changeset 970f6e1 in mainline for uspace/drv/hid/usbhid/mouse/mousedev.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/mouse/mousedev.c (modified) (7 diffs)

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

@@ -165 +165 @@
 }
 
-static bool usb_mouse_process_report(usb_hid_dev_t *hid_dev,
+static void usb_mouse_process_report(usb_hid_dev_t *hid_dev,
     usb_mouse_t *mouse_dev)
 {
@@ -172 +172 @@
         if (mouse_dev->mouse_sess == NULL) {
                 usb_log_warning(NAME " No console session.\n");
-                return true;
+                return;
         }
 
@@ -191 +191 @@
         if (absolute_x != absolute_y) {
                 usb_log_error(NAME " cannot handle mix of absolute and relative mouse move.");
-                return true;
+                return;
         }
 
@@ -226 +226 @@
         if (path == NULL) {
                 usb_log_warning("Failed to create USB HID report path.\n");
-                return true;
+                return;
         }
         int ret =
@@ -233 +233 @@
                 usb_hid_report_path_free(path);
                 usb_log_warning("Failed to add buttons to report path.\n");
-                return true;
+                return;
         }
         usb_hid_report_path_set_report_id(path, hid_dev->report_id);
@@ -266 +266 @@
 
         usb_hid_report_path_free(path);
-
-        return true;
 }
 
@@ -414 +412 @@
 
         usb_mouse_t *mouse_dev = data;
-
-        return usb_mouse_process_report(hid_dev, mouse_dev);
+        usb_mouse_process_report(hid_dev, mouse_dev);
+
+        /* Continue polling until the device is about to be removed. */
+        return !hid_dev->will_deinit;
 }