Changeset 4793023 in mainline

Timestamp:

2018-01-09T18:31:35Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

708d8fcd

Parents:

970f6e1

Message:

usbhid: mark polling end for keyboard and multimedia device

Location:

uspace/drv/hid/usbhid

Files:

• kbd/kbddev.c (modified) (2 diffs)
• multimedia/multimedia.c (modified) (3 diffs)

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

@@ -328 +328 @@
  * An event is created only when key is pressed or released. Besides handling
  * the events (usb_kbd_push_ev()), the auto-repeat fibril is notified about
- * key presses and releases (see usb_kbd_repeat_start() and 
+ * key presses and releases (see usb_kbd_repeat_start() and
  * usb_kbd_repeat_stop()).
  *
  * @param kbd_dev Keyboard device structure.
- * @param key_codes Parsed keyboard report - codes of currently pressed keys 
+ * @param key_codes Parsed keyboard report - codes of currently pressed keys
  *                  according to HID Usage Tables.
  * @param count Number of key codes in report (size of the report).
@@ -709 +709 @@
         usb_kbd_process_data(hid_dev, kbd_dev);
 
-        return true;
+        /* Continue polling until the device is about to be removed. */
+        return !hid_dev->will_deinit;
 }
 

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

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