Changeset df6ded8 in mainline for uspace/drv/hid/usbhid

Timestamp:

2018-02-28T16:37:50Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1b20da0

Parents:

f5e5f73 (diff), b2dca8de (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jakub Jermar <jakub@…> (2018-02-28 16:06:42)

git-committer:

Jakub Jermar <jakub@…> (2018-02-28 16:37:50)

Message:

Merge github.com:helenos-xhci-team/helenos

This commit merges support for USB 3 and generally refactors, fixes,
extends and cleans up the existing USB framework.

Notable additions and features:

• new host controller driver has been implemented to control various xHC models (among others, NEC Renesas uPD720200)
• isochronous data transfer mode
• support for explicit USB device removal
• USB tablet driver

Location:

uspace/drv/hid/usbhid

Files:

• blink1/blink1.c (modified) (4 diffs)
• generic/hiddev.c (modified) (13 diffs)
• kbd/kbddev.c (modified) (32 diffs)
• kbd/kbdrepeat.c (modified) (5 diffs)
• main.c (modified) (8 diffs)
• mouse/mousedev.c (modified) (19 diffs)
• multimedia/multimedia.c (modified) (14 diffs)
• usbhid.c (modified) (22 diffs)
• usbhid.h (modified) (4 diffs)

uspace/drv/hid/usbhid/blink1/blink1.c

@@ -64 +64 @@
         usb_blink1_t *blink1_dev = (usb_blink1_t *) ddf_fun_data_get(fun);
         if (blink1_dev == NULL) {
-                usb_log_debug("Missing parameters.\n");
+                usb_log_debug("Missing parameters.");
                 return EINVAL;
         }
@@ -105 +105 @@
             fun_exposed, HID_BLINK1_FUN_NAME);
         if (fun == NULL) {
-                usb_log_error("Could not create DDF function node `%s'.\n",
+                usb_log_error("Could not create DDF function node `%s'.",
                     HID_BLINK1_FUN_NAME);
                 return ENOMEM;
@@ -123 +123 @@
         errno_t rc = ddf_fun_bind(fun);
         if (rc != EOK) {
-                usb_log_error("Could not bind DDF function `%s': %s.\n",
+                usb_log_error("Could not bind DDF function `%s': %s.",
                     ddf_fun_get_name(fun), str_error(rc));
                 ddf_fun_destroy(fun);
@@ -131 +131 @@
         rc = ddf_fun_add_to_category(fun, HID_BLINK1_CATEGORY);
         if (rc != EOK) {
-                usb_log_error("Could not add DDF function to category %s: %s.\n",
+                usb_log_error("Could not add DDF function to category %s: %s.",
                     HID_BLINK1_CATEGORY, str_error(rc));
                 

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Lubos Slovak
+ * Copyright (c) 2018 Ondrej Hlavaty
  * All rights reserved.
  *
@@ -96 +97 @@
         const usb_hid_dev_t *hid_dev = fun_hid_dev(fun);
 
-        usb_log_debug2("hid_dev: %p, Max input report size (%zu).\n",
+        usb_log_debug2("hid_dev: %p, Max input report size (%zu).",
             hid_dev, hid_dev->max_input_report_size);
 
@@ -105 +106 @@
     size_t size, size_t *act_size, int *event_nr, unsigned int flags)
 {
-        usb_log_debug2("Generic HID: Get event.\n");
+        usb_log_debug2("Generic HID: Get event.");
 
         if (buffer == NULL || act_size == NULL || event_nr == NULL) {
@@ -115 +116 @@
 
         if (hid_dev->input_report_size > size) {
-                usb_log_debug("input_report_size > size (%zu, %zu)\n",
+                usb_log_debug("input_report_size > size (%zu, %zu)",
                     hid_dev->input_report_size, size);
                 return EINVAL;  // TODO: other error code
@@ -126 +127 @@
         *event_nr = usb_hid_report_number(hid_dev);
 
-        usb_log_debug2("OK\n");
+        usb_log_debug2("OK");
 
         return EOK;
@@ -133 +134 @@
 static size_t usb_generic_get_report_descriptor_length(ddf_fun_t *fun)
 {
-        usb_log_debug("Generic HID: Get report descriptor length.\n");
-
-        const usb_hid_dev_t *hid_dev = fun_hid_dev(fun);
-
-        usb_log_debug2("hid_dev->report_desc_size = %zu\n",
+        usb_log_debug("Generic HID: Get report descriptor length.");
+
+        const usb_hid_dev_t *hid_dev = fun_hid_dev(fun);
+
+        usb_log_debug2("hid_dev->report_desc_size = %zu",
             hid_dev->report_desc_size);
 
@@ -146 +147 @@
     size_t size, size_t *actual_size)
 {
-        usb_log_debug2("Generic HID: Get report descriptor.\n");
+        usb_log_debug2("Generic HID: Get report descriptor.");
 
         const usb_hid_dev_t *hid_dev = fun_hid_dev(fun);
@@ -162 +163 @@
 static errno_t usb_generic_hid_client_connected(ddf_fun_t *fun)
 {
-        usb_log_debug("Generic HID: Client connected.\n");
+        usb_log_debug("Generic HID: Client connected.");
         return EOK;
 }
@@ -173 +174 @@
 
         if (ddf_fun_unbind(fun) != EOK) {
-                usb_log_error("Failed to unbind generic hid fun.\n");
+                usb_log_error("Failed to unbind generic hid fun.");
                 return;
         }
-        usb_log_debug2("%s unbound.\n", ddf_fun_get_name(fun));
+        usb_log_debug2("%s unbound.", ddf_fun_get_name(fun));
         ddf_fun_destroy(fun);
 }
@@ -189 +190 @@
 
         /* Create the exposed function. */
-        usb_log_debug("Creating DDF function %s...\n", HID_GENERIC_FUN_NAME);
+        usb_log_debug("Creating DDF function %s...", HID_GENERIC_FUN_NAME);
         ddf_fun_t *fun = usb_device_ddf_fun_create(hid_dev->usb_dev,
             fun_exposed, HID_GENERIC_FUN_NAME);
         if (fun == NULL) {
-                usb_log_error("Could not create DDF function node.\n");
+                usb_log_error("Could not create DDF function node.");
                 return ENOMEM;
         }
@@ -204 +205 @@
         errno_t rc = ddf_fun_bind(fun);
         if (rc != EOK) {
-                usb_log_error("Could not bind DDF function: %s.\n",
+                usb_log_error("Could not bind DDF function: %s.",
                     str_error(rc));
                 ddf_fun_destroy(fun);
@@ -210 +211 @@
         }
 
-        usb_log_debug("HID function created. Handle: %" PRIun "\n",
+        usb_log_debug("HID function created. Handle: %" PRIun "",
             ddf_fun_get_handle(fun));
         *data = fun;
@@ -219 +220 @@
 bool usb_generic_hid_polling_callback(usb_hid_dev_t *hid_dev, void *data)
 {
+        /* Continue polling until the device is about to be removed. */
         return true;
 }

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Lubos Slovak
+ * Copyright (c) 2018 Ondrej Hlavaty
  * All rights reserved.
  *
@@ -185 +186 @@
                 if (kbd_dev->client_sess == NULL) {
                         kbd_dev->client_sess = sess;
-                        usb_log_debug("%s: OK\n", __FUNCTION__);
+                        usb_log_debug("%s: OK", __FUNCTION__);
                         async_answer_0(icallid, EOK);
                 } else {
-                        usb_log_error("%s: console session already set\n",
+                        usb_log_error("%s: console session already set",
                            __FUNCTION__);
                         async_answer_0(icallid, ELIMIT);
@@ -195 +196 @@
         }
         default:
-                        usb_log_error("%s: Unknown method: %d.\n",
+                        usb_log_error("%s: Unknown method: %d.",
                             __FUNCTION__, (int) method);
                         async_answer_0(icallid, EINVAL);
@@ -226 +227 @@
         /* Reset the LED data. */
         memset(kbd_dev->led_data, 0, kbd_dev->led_output_size * sizeof(int32_t));
-        usb_log_debug("Creating output report:\n");
+        usb_log_debug("Creating output report:");
 
         usb_hid_report_field_t *field = usb_hid_report_get_sibling(
@@ -266 +267 @@
         }
 
-        usb_log_debug("Output report buffer: %s\n",
+        usb_log_debug("Output report buffer: %s",
             usb_debug_str_buffer(kbd_dev->output_buffer, kbd_dev->output_size,
                 0));
@@ -276 +277 @@
             kbd_dev->output_buffer, kbd_dev->output_size);
         if (rc != EOK) {
-                usb_log_warning("Failed to set kbd indicators.\n");
+                usb_log_warning("Failed to set kbd indicators.");
         }
 }
@@ -289 +290 @@
 void usb_kbd_push_ev(usb_kbd_t *kbd_dev, int type, unsigned key)
 {
-        usb_log_debug2("Sending kbdev event %d/%d to the console\n", type, key);
+        usb_log_debug2("Sending kbdev event %d/%d to the console", type, key);
         if (kbd_dev->client_sess == NULL) {
                 usb_log_warning(
@@ -301 +302 @@
                 async_exchange_end(exch);
         } else {
-                usb_log_warning("Failed to send key to console.\n");
+                usb_log_warning("Failed to send key to console.");
         }
 }
@@ -328 +329 @@
  * 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).
@@ -353 +354 @@
             kbd_dev->key_count);
         if (i != (size_t) -1) {
-                usb_log_error("Detected phantom state.\n");
+                usb_log_error("Detected phantom state.");
                 return;
         }
@@ -403 +404 @@
         ddf_dump_buffer(key_buffer, 512,
             kbd_dev->keys_old, 4, kbd_dev->key_count, 0);
-        usb_log_debug2("Stored keys %s.\n", key_buffer);
+        usb_log_debug2("Stored keys %s.", key_buffer);
 }
 
@@ -431 +432 @@
         usb_hid_report_path_t *path = usb_hid_report_path();
         if (path == NULL) {
-                usb_log_error("Failed to create hid/kbd report path.\n");
+                usb_log_error("Failed to create hid/kbd report path.");
                 return;
         }
@@ -438 +439 @@
            usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
         if (ret != EOK) {
-                usb_log_error("Failed to append to hid/kbd report path.\n");
+                usb_log_error("Failed to append to hid/kbd report path.");
                 return;
         }
@@ -452 +453 @@
 
         while (field != NULL) {
-                usb_log_debug2("FIELD (%p) - VALUE(%d) USAGE(%u)\n",
+                usb_log_debug2("FIELD (%p) - VALUE(%d) USAGE(%u)",
                     field, field->value, field->usage);
 
@@ -464 +465 @@
                         kbd_dev->keys[i] = 0;
                 }
-                usb_log_debug2("Saved %u. key usage %d\n", i, kbd_dev->keys[i]);
+                usb_log_debug2("Saved %u. key usage %d", i, kbd_dev->keys[i]);
 
                 ++i;
@@ -502 +503 @@
         usb_hid_report_path_t *path = usb_hid_report_path();
         if (path == NULL) {
-                usb_log_error("Failed to create kbd report path.\n");
+                usb_log_error("Failed to create kbd report path.");
                 usb_kbd_destroy(kbd_dev);
                 return ENOMEM;
@@ -510 +511 @@
             usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
         if (ret != EOK) {
-                usb_log_error("Failed to append item to kbd report path.\n");
+                usb_log_error("Failed to append item to kbd report path.");
                 usb_hid_report_path_free(path);
                 usb_kbd_destroy(kbd_dev);
@@ -523 +524 @@
         usb_hid_report_path_free(path);
 
-        usb_log_debug("Size of the input report: %zu\n", kbd_dev->key_count);
+        usb_log_debug("Size of the input report: %zu", kbd_dev->key_count);
 
         kbd_dev->keys = calloc(kbd_dev->key_count, sizeof(int32_t));
         if (kbd_dev->keys == NULL) {
-                usb_log_error("Failed to allocate key buffer.\n");
+                usb_log_error("Failed to allocate key buffer.");
                 usb_kbd_destroy(kbd_dev);
                 return ENOMEM;
@@ -534 +535 @@
         kbd_dev->keys_old = calloc(kbd_dev->key_count, sizeof(int32_t));
         if (kbd_dev->keys_old == NULL) {
-                usb_log_error("Failed to allocate old_key buffer.\n");
+                usb_log_error("Failed to allocate old_key buffer.");
                 usb_kbd_destroy(kbd_dev);
                 return ENOMEM;
@@ -544 +545 @@
             &kbd_dev->output_size, 0);
         if (kbd_dev->output_buffer == NULL) {
-                usb_log_error("Error creating output report buffer.\n");
+                usb_log_error("Error creating output report buffer.");
                 usb_kbd_destroy(kbd_dev);
                 return ENOMEM;
         }
 
-        usb_log_debug("Output buffer size: %zu\n", kbd_dev->output_size);
+        usb_log_debug("Output buffer size: %zu", kbd_dev->output_size);
 
         kbd_dev->led_path = usb_hid_report_path();
         if (kbd_dev->led_path == NULL) {
-                usb_log_error("Failed to create kbd led report path.\n");
+                usb_log_error("Failed to create kbd led report path.");
                 usb_kbd_destroy(kbd_dev);
                 return ENOMEM;
@@ -561 +562 @@
             kbd_dev->led_path, USB_HIDUT_PAGE_LED, 0);
         if (ret != EOK) {
-                usb_log_error("Failed to append to kbd/led report path.\n");
+                usb_log_error("Failed to append to kbd/led report path.");
                 usb_kbd_destroy(kbd_dev);
                 return ret;
@@ -569 +570 @@
             &hid_dev->report, 0, USB_HID_REPORT_TYPE_OUTPUT);
 
-        usb_log_debug("Output report size (in items): %zu\n",
+        usb_log_debug("Output report size (in items): %zu",
             kbd_dev->led_output_size);
 
         kbd_dev->led_data = calloc(kbd_dev->led_output_size, sizeof(int32_t));
         if (kbd_dev->led_data == NULL) {
-                usb_log_error("Error creating buffer for LED output report.\n");
+                usb_log_error("Error creating buffer for LED output report.");
                 usb_kbd_destroy(kbd_dev);
                 return ENOMEM;
@@ -588 +589 @@
 
         kbd_dev->initialized = USB_KBD_STATUS_INITIALIZED;
-        usb_log_debug("HID/KBD device structure initialized.\n");
+        usb_log_debug("HID/KBD device structure initialized.");
 
         return EOK;
@@ -618 +619 @@
 errno_t usb_kbd_init(usb_hid_dev_t *hid_dev, void **data)
 {
-        usb_log_debug("Initializing HID/KBD structure...\n");
+        usb_log_debug("Initializing HID/KBD structure...");
 
         if (hid_dev == NULL) {
@@ -627 +628 @@
 
         /* Create the exposed function. */
-        usb_log_debug("Creating DDF function %s...\n", HID_KBD_FUN_NAME);
+        usb_log_debug("Creating DDF function %s...", HID_KBD_FUN_NAME);
         ddf_fun_t *fun = usb_device_ddf_fun_create(hid_dev->usb_dev,
             fun_exposed, HID_KBD_FUN_NAME);
         if (fun == NULL) {
-                usb_log_error("Could not create DDF function node.\n");
+                usb_log_error("Could not create DDF function node.");
                 return ENOMEM;
         }
@@ -637 +638 @@
         usb_kbd_t *kbd_dev = ddf_fun_data_alloc(fun, sizeof(usb_kbd_t));
         if (kbd_dev == NULL) {
-                usb_log_error("Failed to allocate KBD device structure.\n");
+                usb_log_error("Failed to allocate KBD device structure.");
                 ddf_fun_destroy(fun);
                 return ENOMEM;
@@ -644 +645 @@
         errno_t ret = kbd_dev_init(kbd_dev, hid_dev);
         if (ret != EOK) {
-                usb_log_error("Failed to initialize KBD device  structure.\n");
+                usb_log_error("Failed to initialize KBD device  structure.");
                 ddf_fun_destroy(fun);
                 return ret;
@@ -655 +656 @@
         ret = ddf_fun_bind(fun);
         if (ret != EOK) {
-                usb_log_error("Could not bind DDF function: %s.\n",
+                usb_log_error("Could not bind DDF function: %s.",
                     str_error(ret));
                 usb_kbd_destroy(kbd_dev);
@@ -662 +663 @@
         }
 
-        usb_log_debug("%s function created. Handle: %" PRIun "\n",
+        usb_log_debug("%s function created. Handle: %" PRIun "",
             HID_KBD_FUN_NAME, ddf_fun_get_handle(fun));
 
-        usb_log_debug("Adding DDF function to category %s...\n",
+        usb_log_debug("Adding DDF function to category %s...",
             HID_KBD_CATEGORY_NAME);
         ret = ddf_fun_add_to_category(fun, HID_KBD_CATEGORY_NAME);
@@ -709 +710 @@
         usb_kbd_process_data(hid_dev, kbd_dev);
 
+        /* Continue polling until the device is about to be removed. */
         return true;
 }
@@ -752 +754 @@
         if (kbd_dev->fun) {
                 if (ddf_fun_unbind(kbd_dev->fun) != EOK) {
-                        usb_log_warning("Failed to unbind %s.\n",
+                        usb_log_warning("Failed to unbind %s.",
                             ddf_fun_get_name(kbd_dev->fun));
                 } else {
-                        usb_log_debug2("%s unbound.\n",
+                        usb_log_debug2("%s unbound.",
                             ddf_fun_get_name(kbd_dev->fun));
                         ddf_fun_destroy(kbd_dev->fun);
@@ -783 +785 @@
 
         if (rc != EOK) {
-                usb_log_error("Failed to parse boot report descriptor: %s\n",
+                usb_log_error("Failed to parse boot report descriptor: %s",
                     str_error(rc));
                 return rc;

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

@@ -69 +69 @@
         unsigned int delay = 0;
 
-        usb_log_debug("Starting autorepeat loop.\n");
+        usb_log_debug("Starting autorepeat loop.");
 
         while (true) {
                 /* Check if the kbd structure is usable. */
                 if (!usb_kbd_is_initialized(kbd)) {
-                        usb_log_warning("kbd not ready, exiting autorepeat.\n");
+                        usb_log_warning("kbd not ready, exiting autorepeat.");
                         return;
                 }
@@ -82 +82 @@
                 if (kbd->repeat.key_new > 0) {
                         if (kbd->repeat.key_new == kbd->repeat.key_repeated) {
-                                usb_log_debug2("Repeating key: %u.\n",
+                                usb_log_debug2("Repeating key: %u.",
                                     kbd->repeat.key_repeated);
                                 usb_kbd_push_ev(kbd, KEY_PRESS,
@@ -88 +88 @@
                                 delay = kbd->repeat.delay_between;
                         } else {
-                                usb_log_debug2("New key to repeat: %u.\n",
+                                usb_log_debug2("New key to repeat: %u.",
                                     kbd->repeat.key_new);
                                 kbd->repeat.key_repeated = kbd->repeat.key_new;
@@ -95 +95 @@
                 } else {
                         if (kbd->repeat.key_repeated > 0) {
-                                usb_log_debug2("Stopping to repeat key: %u.\n",
+                                usb_log_debug2("Stopping to repeat key: %u.",
                                     kbd->repeat.key_repeated);
                                 kbd->repeat.key_repeated = 0;
@@ -119 +119 @@
 errno_t usb_kbd_repeat_fibril(void *arg)
 {
-        usb_log_debug("Autorepeat fibril spawned.\n");
+        usb_log_debug("Autorepeat fibril spawned.");
 
         if (arg == NULL) {
-                usb_log_error("No device!\n");
+                usb_log_error("No device!");
                 return EINVAL;
         }

uspace/drv/hid/usbhid/main.c

@@ -2 +2 @@
  * Copyright (c) 2010 Vojtech Horky
  * Copyright (c) 2011 Lubos Slovak
+ * Copyright (c) 2018 Petr Manek, Ondrej Hlavaty
  * All rights reserved.
  *
@@ -58 +59 @@
 static errno_t usb_hid_device_add(usb_device_t *dev)
 {
-        usb_log_debug("%s\n", __FUNCTION__);
+        usb_log_debug("%s", __FUNCTION__);
 
         if (dev == NULL) {
-                usb_log_error("Wrong parameter given for add_device().\n");
+                usb_log_error("Wrong parameter given for add_device().");
                 return EINVAL;
         }
@@ -73 +74 @@
             usb_device_data_alloc(dev, sizeof(usb_hid_dev_t));
         if (hid_dev == NULL) {
-                usb_log_error("Failed to create USB/HID device structure.\n");
+                usb_log_error("Failed to create USB/HID device structure.");
                 return ENOMEM;
         }
@@ -79 +80 @@
         errno_t rc = usb_hid_init(hid_dev, dev);
         if (rc != EOK) {
-                usb_log_error("Failed to initialize USB/HID device.\n");
+                usb_log_error("Failed to initialize USB/HID device.");
                 usb_hid_deinit(hid_dev);
                 return rc;
         }
 
-        usb_log_debug("USB/HID device structure initialized.\n");
+        usb_log_debug("USB/HID device structure initialized.");
 
         /* Start automated polling function.
          * This will create a separate fibril that will query the device
          * for the data continuously. */
-        rc = usb_device_auto_poll_desc(dev,
-           /* Index of the polling pipe. */
-           hid_dev->poll_pipe_mapping->description,
-           /* Callback when data arrives. */
-           usb_hid_polling_callback,
-           /* How much data to request. */
-           hid_dev->poll_pipe_mapping->pipe.max_packet_size,
-           /* Delay */
-           -1,
-           /* Callback when the polling ends. */
-           usb_hid_polling_ended_callback,
-           /* Custom argument. */
-           hid_dev);
+        rc = usb_polling_start(&hid_dev->polling);
 
         if (rc != EOK) {
-                usb_log_error("Failed to start polling fibril for `%s'.\n",
+                usb_log_error("Failed to start polling fibril for `%s'.",
                     usb_device_get_name(dev));
                 usb_hid_deinit(hid_dev);
@@ -111 +100 @@
         hid_dev->running = true;
 
-        usb_log_info("HID device `%s' ready.\n", usb_device_get_name(dev));
+        usb_log_info("HID device `%s' ready.", usb_device_get_name(dev));
+
+        return EOK;
+}
+
+static errno_t 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 (ignoring error code). */
+        usb_polling_join(&hid_dev->polling);
+
+        /* Clean up. */
+        usb_hid_deinit(hid_dev);
+        usb_log_info("%s destruction complete.", usb_device_get_name(dev));
 
         return EOK;
@@ -122 +127 @@
  * @return Error code.
  */
-static errno_t usb_hid_device_rem(usb_device_t *dev)
+static errno_t usb_hid_device_remove(usb_device_t *dev)
 {
-        // TODO: Stop device polling
-        // TODO: Call deinit (stops autorepeat too)
-        return ENOTSUP;
+        assert(dev);
+        usb_hid_dev_t *hid_dev = usb_device_data_get(dev);
+        assert(hid_dev);
+
+        usb_log_info("Device %s removed.", usb_device_get_name(dev));
+        return join_and_clean(dev);
 }
 
@@ -140 +148 @@
         usb_hid_dev_t *hid_dev = usb_device_data_get(dev);
         assert(hid_dev);
-        unsigned tries = 100;
-        /* Wait for fail. */
-        while (hid_dev->running && tries--) {
-                async_usleep(100000);
-        }
-        if (hid_dev->running) {
-                usb_log_error("Can't remove hid, still running.\n");
-                return EBUSY;
-        }
 
-        usb_hid_deinit(hid_dev);
-        usb_log_debug2("%s destruction complete.\n", usb_device_get_name(dev));
-        return EOK;
+        usb_log_info("Device %s gone.", usb_device_get_name(dev));
+        return join_and_clean(dev);
 }
 
@@ -158 +156 @@
 static const usb_driver_ops_t usb_hid_driver_ops = {
         .device_add = usb_hid_device_add,
-        .device_rem = usb_hid_device_rem,
+        .device_remove = usb_hid_device_remove,
         .device_gone = usb_hid_device_gone,
 };

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Lubos Slovak, Vojtech Horky
+ * Copyright (c) 2018 Ondrej Hlavaty
  * All rights reserved.
  *
@@ -118 +119 @@
 
         if (mouse_dev == NULL) {
-                usb_log_debug("%s: Missing parameters.\n", __FUNCTION__);
+                usb_log_debug("%s: Missing parameters.", __FUNCTION__);
                 async_answer_0(icallid, EINVAL);
                 return;
         }
 
-        usb_log_debug("%s: fun->name: %s\n", __FUNCTION__, ddf_fun_get_name(fun));
-        usb_log_debug("%s: mouse_sess: %p\n",
+        usb_log_debug("%s: fun->name: %s", __FUNCTION__, ddf_fun_get_name(fun));
+        usb_log_debug("%s: mouse_sess: %p",
             __FUNCTION__, mouse_dev->mouse_sess);
 
@@ -132 +133 @@
                 if (mouse_dev->mouse_sess == NULL) {
                         mouse_dev->mouse_sess = sess;
-                        usb_log_debug("Console session to %s set ok (%p).\n",
+                        usb_log_debug("Console session to %s set ok (%p).",
                             ddf_fun_get_name(fun), sess);
                         async_answer_0(icallid, EOK);
                 } else {
-                        usb_log_error("Console session to %s already set.\n",
+                        usb_log_error("Console session to %s already set.",
                             ddf_fun_get_name(fun));
                         async_answer_0(icallid, ELIMIT);
@@ -142 +143 @@
                 }
         } else {
-                usb_log_debug("%s: Invalid function.\n", __FUNCTION__);
+                usb_log_debug("%s: Invalid function.", __FUNCTION__);
                 async_answer_0(icallid, EINVAL);
         }
 }
 
-static int get_mouse_axis_move_value(uint8_t rid, usb_hid_report_t *report,
+static const usb_hid_report_field_t *get_mouse_axis_move_field(uint8_t rid, usb_hid_report_t *report,
     int32_t usage)
 {
-        int result = 0;
-
         usb_hid_report_path_t *path = usb_hid_report_path();
         usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_GENERIC_DESKTOP,
@@ -158 +157 @@
         usb_hid_report_path_set_report_id(path, rid);
 
-        usb_hid_report_field_t *field = usb_hid_report_get_sibling(
+        const usb_hid_report_field_t *field = usb_hid_report_get_sibling(
             report, NULL, path, USB_HID_PATH_COMPARE_END,
             USB_HID_REPORT_TYPE_INPUT);
 
-        if (field != NULL) {
-                result = field->value;
-        }
-
         usb_hid_report_path_free(path);
 
-        return result;
-}
-
-static bool usb_mouse_process_report(usb_hid_dev_t *hid_dev,
+        return field;
+}
+
+static void usb_mouse_process_report(usb_hid_dev_t *hid_dev,
     usb_mouse_t *mouse_dev)
 {
@@ -177 +172 @@
 
         if (mouse_dev->mouse_sess == NULL) {
-                usb_log_warning(NAME " No console session.\n");
-                return true;
-        }
-
-        const int shift_x = get_mouse_axis_move_value(hid_dev->report_id,
-            &hid_dev->report, USB_HIDUT_USAGE_GENERIC_DESKTOP_X);
-        const int shift_y = get_mouse_axis_move_value(hid_dev->report_id,
-            &hid_dev->report, USB_HIDUT_USAGE_GENERIC_DESKTOP_Y);
-        const int wheel = get_mouse_axis_move_value(hid_dev->report_id,
-            &hid_dev->report, USB_HIDUT_USAGE_GENERIC_DESKTOP_WHEEL);
-
-        if (shift_x || shift_y || wheel) {
+                usb_log_warning(NAME " No console session.");
+                return;
+        }
+
+        const usb_hid_report_field_t *move_x = get_mouse_axis_move_field(
+            hid_dev->report_id, &hid_dev->report,
+            USB_HIDUT_USAGE_GENERIC_DESKTOP_X);
+        const usb_hid_report_field_t *move_y = get_mouse_axis_move_field(
+            hid_dev->report_id, &hid_dev->report,
+            USB_HIDUT_USAGE_GENERIC_DESKTOP_Y);
+        const usb_hid_report_field_t *wheel= get_mouse_axis_move_field(
+            hid_dev->report_id, &hid_dev->report,
+            USB_HIDUT_USAGE_GENERIC_DESKTOP_WHEEL);
+
+        bool absolute_x = move_x && !USB_HID_ITEM_FLAG_RELATIVE(move_x->item_flags);
+        bool absolute_y = move_y && !USB_HID_ITEM_FLAG_RELATIVE(move_y->item_flags);
+
+        /* Tablet shall always report both X and Y */
+        if (absolute_x != absolute_y) {
+                usb_log_error(NAME " cannot handle mix of absolute and relative mouse move.");
+                return;
+        }
+
+        int shift_x = move_x ? move_x->value : 0;
+        int shift_y = move_y ? move_y->value : 0;
+        int shift_z =  wheel ?  wheel->value : 0;
+
+        if (absolute_x && absolute_y) {
+                async_exch_t *exch =
+                    async_exchange_begin(mouse_dev->mouse_sess);
+                if (exch != NULL) {
+                        async_msg_4(exch, MOUSEEV_ABS_MOVE_EVENT,
+                            shift_x, shift_y, move_x->logical_maximum, move_y->logical_maximum);
+                        async_exchange_end(exch);
+                }
+
+                // Even if we move the mouse absolutely, we need to resolve wheel
+                shift_x = shift_y = 0;
+        }
+
+
+        if (shift_x || shift_y || shift_z) {
                 async_exch_t *exch =
                     async_exchange_begin(mouse_dev->mouse_sess);
                 if (exch != NULL) {
                         async_msg_3(exch, MOUSEEV_MOVE_EVENT,
-                            shift_x, shift_y, wheel);
+                            shift_x, shift_y, shift_z);
                         async_exchange_end(exch);
                 }
@@ -201 +226 @@
         usb_hid_report_path_t *path = usb_hid_report_path();
         if (path == NULL) {
-                usb_log_warning("Failed to create USB HID report path.\n");
-                return true;
+                usb_log_warning("Failed to create USB HID report path.");
+                return;
         }
         errno_t ret =
@@ -208 +233 @@
         if (ret != EOK) {
                 usb_hid_report_path_free(path);
-                usb_log_warning("Failed to add buttons to report path.\n");
-                return true;
+                usb_log_warning("Failed to add buttons to report path.");
+                return;
         }
         usb_hid_report_path_set_report_id(path, hid_dev->report_id);
@@ -218 +243 @@
 
         while (field != NULL) {
-                usb_log_debug2(NAME " VALUE(%X) USAGE(%X)\n", field->value,
+                usb_log_debug2(NAME " VALUE(%X) USAGE(%X)", field->value,
                     field->usage);
                 assert(field->usage > field->usage_minimum);
@@ -242 +267 @@
 
         usb_hid_report_path_free(path);
-
-        return true;
 }
 
@@ -309 +332 @@
 
         if (mouse_dev->buttons == NULL) {
-                usb_log_error(NAME ": out of memory, giving up on device!\n");
+                usb_log_error(NAME ": out of memory, giving up on device!");
                 free(mouse_dev);
                 return ENOMEM;
@@ -322 +345 @@
 errno_t usb_mouse_init(usb_hid_dev_t *hid_dev, void **data)
 {
-        usb_log_debug("Initializing HID/Mouse structure...\n");
+        usb_log_debug("Initializing HID/Mouse structure...");
 
         if (hid_dev == NULL) {
@@ -331 +354 @@
 
         /* Create the exposed function. */
-        usb_log_debug("Creating DDF function %s...\n", HID_MOUSE_FUN_NAME);
+        usb_log_debug("Creating DDF function %s...", HID_MOUSE_FUN_NAME);
         ddf_fun_t *fun = usb_device_ddf_fun_create(hid_dev->usb_dev,
             fun_exposed, HID_MOUSE_FUN_NAME);
         if (fun == NULL) {
-                usb_log_error("Could not create DDF function node `%s'.\n",
+                usb_log_error("Could not create DDF function node `%s'.",
                     HID_MOUSE_FUN_NAME);
                 return ENOMEM;
@@ -342 +365 @@
         usb_mouse_t *mouse_dev = ddf_fun_data_alloc(fun, sizeof(usb_mouse_t));
         if (mouse_dev == NULL) {
-                usb_log_error("Failed to alloc HID mouse device structure.\n");
+                usb_log_error("Failed to alloc HID mouse device structure.");
                 ddf_fun_destroy(fun);
                 return ENOMEM;
@@ -349 +372 @@
         errno_t ret = mouse_dev_init(mouse_dev, hid_dev);
         if (ret != EOK) {
-                usb_log_error("Failed to init HID mouse device structure.\n");
+                usb_log_error("Failed to init HID mouse device structure.");
                 return ret;
         }
@@ -357 +380 @@
         ret = ddf_fun_bind(fun);
         if (ret != EOK) {
-                usb_log_error("Could not bind DDF function `%s': %s.\n",
+                usb_log_error("Could not bind DDF function `%s': %s.",
                     ddf_fun_get_name(fun), str_error(ret));
                 ddf_fun_destroy(fun);
@@ -363 +386 @@
         }
 
-        usb_log_debug("Adding DDF function `%s' to category %s...\n",
+        usb_log_debug("Adding DDF function `%s' to category %s...",
             ddf_fun_get_name(fun), HID_MOUSE_CATEGORY);
         ret = ddf_fun_add_to_category(fun, HID_MOUSE_CATEGORY);
@@ -390 +413 @@
 
         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 true;
 }
 
@@ -420 +445 @@
 
         if (rc != EOK) {
-                usb_log_error("Failed to parse boot report descriptor: %s\n",
+                usb_log_error("Failed to parse boot report descriptor: %s",
                     str_error(rc));
                 return rc;

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

@@ -2 +2 @@
  * Copyright (c) 2011 Lubos Slovak
  * Copyright (c) 2011 Vojtech Horky
+ * Copyright (c) 2018 Ondrej Hlavaty
  * All rights reserved.
  *
@@ -86 +87 @@
     ipc_callid_t icallid, ipc_call_t *icall)
 {
-        usb_log_debug(NAME " default_connection_handler()\n");
+        usb_log_debug(NAME " default_connection_handler()");
 
         usb_multimedia_t *multim_dev = ddf_fun_data_get(fun);
@@ -95 +96 @@
                 if (multim_dev->console_sess == NULL) {
                         multim_dev->console_sess = sess;
-                        usb_log_debug(NAME " Saved session to console: %p\n",
+                        usb_log_debug(NAME " Saved session to console: %p",
                             sess);
                         async_answer_0(icallid, EOK);
@@ -137 +138 @@
         };
 
-        usb_log_debug2(NAME " Sending key %d to the console\n", ev.key);
+        usb_log_debug2(NAME " Sending key %d to the console", ev.key);
         if (multim_dev->console_sess == NULL) {
                 usb_log_warning(
@@ -149 +150 @@
                 async_exchange_end(exch);
         } else {
-                usb_log_warning("Failed to send multimedia key.\n");
+                usb_log_warning("Failed to send multimedia key.");
         }
 }
@@ -159 +160 @@
         }
 
-        usb_log_debug(NAME " Initializing HID/multimedia structure...\n");
+        usb_log_debug(NAME " Initializing HID/multimedia structure...");
 
         /* Create the exposed function. */
@@ -165 +166 @@
             hid_dev->usb_dev, fun_exposed, NAME);
         if (fun == NULL) {
-                usb_log_error("Could not create DDF function node.\n");
+                usb_log_error("Could not create DDF function node.");
                 return ENOMEM;
         }
@@ -184 +185 @@
         errno_t rc = ddf_fun_bind(fun);
         if (rc != EOK) {
-                usb_log_error("Could not bind DDF function: %s.\n",
+                usb_log_error("Could not bind DDF function: %s.",
                     str_error(rc));
                 ddf_fun_destroy(fun);
@@ -190 +191 @@
         }
 
-        usb_log_debug(NAME " function created (handle: %" PRIun ").\n",
+        usb_log_debug(NAME " function created (handle: %" PRIun ").",
             ddf_fun_get_handle(fun));
 
@@ -199 +200 @@
                     str_error(rc));
                 if (ddf_fun_unbind(fun) != EOK) {
-                        usb_log_error("Failed to unbind %s, won't destroy.\n",
+                        usb_log_error("Failed to unbind %s, won't destroy.",
                             ddf_fun_get_name(fun));
                 } else {
@@ -210 +211 @@
         *data = fun;
 
-        usb_log_debug(NAME " HID/multimedia structure initialized.\n");
+        usb_log_debug(NAME " HID/multimedia structure initialized.");
         return EOK;
 }
@@ -224 +225 @@
                 async_hangup(multim_dev->console_sess);
         if (ddf_fun_unbind(fun) != EOK) {
-                usb_log_error("Failed to unbind %s, won't destroy.\n",
+                usb_log_error("Failed to unbind %s, won't destroy.",
                     ddf_fun_get_name(fun));
         } else {
-                usb_log_debug2("%s unbound.\n", ddf_fun_get_name(fun));
+                usb_log_debug2("%s unbound.", ddf_fun_get_name(fun));
                 /* This frees multim_dev too as it was stored in
                  * fun->data */
@@ -266 +267 @@
         while (field != NULL) {
                 if (field->value != 0) {
-                        usb_log_debug(NAME " KEY VALUE(%X) USAGE(%X)\n",
+                        usb_log_debug(NAME " KEY VALUE(%X) USAGE(%X)",
                             field->value, field->usage);
                         const unsigned key =
@@ -272 +273 @@
                         const char *key_str =
                             usbhid_multimedia_usage_to_str(field->usage);
-                        usb_log_info("Pressed key: %s\n", key_str);
+                        usb_log_info("Pressed key: %s", key_str);
                         usb_multimedia_push_ev(multim_dev, KEY_PRESS, key);
                 }

uspace/drv/hid/usbhid/usbhid.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Lubos Slovak
+ * Copyright (c) 2018 Petr Manek, Ondrej Hlavaty
  * All rights reserved.
  *
@@ -134 +135 @@
         usb_hid_report_path_t *usage_path = usb_hid_report_path();
         if (usage_path == NULL) {
-                usb_log_debug("Failed to create usage path.\n");
+                usb_log_debug("Failed to create usage path.");
                 return false;
         }
@@ -143 +144 @@
                     mapping->usage_path[i].usage_page,
                     mapping->usage_path[i].usage) != EOK) {
-                        usb_log_debug("Failed to append to usage path.\n");
+                        usb_log_debug("Failed to append to usage path.");
                         usb_hid_report_path_free(usage_path);
                         return false;
@@ -149 +150 @@
         }
 
-        usb_log_debug("Compare flags: %d\n", mapping->compare);
+        usb_log_debug("Compare flags: %d", mapping->compare);
 
         bool matches = false;
@@ -155 +156 @@
 
         do {
-                usb_log_debug("Trying report id %u\n", report_id);
+                usb_log_debug("Trying report id %u", report_id);
                 if (report_id != 0) {
                         usb_hid_report_path_set_report_id(usage_path,
@@ -166 +167 @@
                         USB_HID_REPORT_TYPE_INPUT);
 
-                usb_log_debug("Field: %p\n", field);
+                usb_log_debug("Field: %p", field);
 
                 if (field != NULL) {
@@ -243 +244 @@
                             mapping->product_id);
                         if (usb_hid_ids_match(hid_dev, mapping)) {
-                                usb_log_debug("IDs matched.\n");
+                                usb_log_debug("IDs matched.");
                                 matched = true;
                         }
@@ -250 +251 @@
                 /* Check usage match. */
                 if (mapping->usage_path != NULL) {
-                        usb_log_debug("Comparing device against usage path.\n");
+                        usb_log_debug("Comparing device against usage path.");
                         if (usb_hid_path_matches(hid_dev, mapping)) {
                                 /* Does not matter if IDs were matched. */
@@ -258 +259 @@
 
                 if (matched) {
-                        usb_log_debug("Subdriver matched.\n");
+                        usb_log_debug("Subdriver matched.");
                         subdrivers[count++] = &mapping->subdriver;
                 }
@@ -285 +286 @@
                     usb_device_get_mapped_ep_desc(dev, endpoints[i].desc);
                 if (epm && epm->present) {
-                        usb_log_debug("Found: %s.\n", endpoints[i].description);
+                        usb_log_debug("Found: %s.", endpoints[i].description);
                         hid_dev->poll_pipe_mapping = epm;
                         return EOK;
@@ -301 +302 @@
 
         do {
-                usb_log_debug("Getting size of the report.\n");
+                usb_log_debug("Getting size of the report.");
                 const size_t size =
                     usb_hid_report_byte_size(&hid_dev->report, report_id,
                         USB_HID_REPORT_TYPE_INPUT);
-                usb_log_debug("Report ID: %u, size: %zu\n", report_id, size);
+                usb_log_debug("Report ID: %u, size: %zu", report_id, size);
                 max_size = (size > max_size) ? size : max_size;
-                usb_log_debug("Getting next report ID\n");
+                usb_log_debug("Getting next report ID");
                 report_id = usb_hid_get_next_report_id(&hid_dev->report,
                     report_id, USB_HID_REPORT_TYPE_INPUT);
         } while (report_id != 0);
 
-        usb_log_debug("Max size of input report: %zu\n", max_size);
+        usb_log_debug("Max size of input report: %zu", max_size);
 
         assert(hid_dev->input_report == NULL);
@@ -323 +324 @@
 
         return EOK;
+}
+
+static bool usb_hid_polling_callback(usb_device_t *dev, uint8_t *buffer,
+    size_t buffer_size, void *arg)
+{
+        if (dev == NULL || arg == NULL || buffer == NULL) {
+                usb_log_error("Missing arguments to polling callback.");
+                return false;
+        }
+        usb_hid_dev_t *hid_dev = arg;
+
+        assert(hid_dev->input_report != NULL);
+
+        usb_log_debug("New data [%zu/%zu]: %s", buffer_size,
+            hid_dev->max_input_report_size,
+            usb_debug_str_buffer(buffer, buffer_size, 0));
+
+        if (hid_dev->max_input_report_size >= buffer_size) {
+                /*! @todo This should probably be atomic. */
+                memcpy(hid_dev->input_report, buffer, buffer_size);
+                hid_dev->input_report_size = buffer_size;
+                usb_hid_new_report(hid_dev);
+        }
+
+        /* Parse the input report */
+        const errno_t rc = usb_hid_parse_report(
+            &hid_dev->report, buffer, buffer_size, &hid_dev->report_id);
+        if (rc != EOK) {
+                usb_log_warning("Failure in usb_hid_parse_report():"
+                    "%s\n", str_error(rc));
+        }
+
+        bool cont = false;
+        /* Continue if at least one of the subdrivers want to continue */
+        for (unsigned i = 0; i < hid_dev->subdriver_count; ++i) {
+                if (hid_dev->subdrivers[i].poll != NULL) {
+                        cont = cont || hid_dev->subdrivers[i].poll(
+                            hid_dev, hid_dev->subdrivers[i].data);
+                }
+        }
+
+        return cont;
+}
+
+static bool usb_hid_polling_error_callback(usb_device_t *dev, errno_t 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;
+}
+
+static void usb_hid_polling_ended_callback(usb_device_t *dev, bool reason, void *arg)
+{
+        assert(dev);
+        assert(arg);
+
+        usb_hid_dev_t *hid_dev = arg;
+
+        for (unsigned i = 0; i < hid_dev->subdriver_count; ++i) {
+                if (hid_dev->subdrivers[i].poll_end != NULL) {
+                        hid_dev->subdrivers[i].poll_end(
+                            hid_dev, hid_dev->subdrivers[i].data, reason);
+                }
+        }
+
+        hid_dev->running = false;
 }
 
@@ -332 +405 @@
  * 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.
  *
@@ -347 +420 @@
         assert(dev);
 
-        usb_log_debug("Initializing HID structure...\n");
+        usb_log_debug("Initializing HID structure...");
 
         usb_hid_report_init(&hid_dev->report);
@@ -369 +442 @@
                 usb_hid_find_subdrivers(hid_dev);
         } else {
-                usb_log_error("Failed to parse report descriptor: fallback.\n");
+                usb_log_error("Failed to parse report descriptor: fallback.");
                 hid_dev->subdrivers = NULL;
                 hid_dev->subdriver_count = 0;
         }
 
-        usb_log_debug("Subdriver count(before trying boot protocol): %d\n",
+        usb_log_debug("Subdriver count(before trying boot protocol): %d",
             hid_dev->subdriver_count);
 
@@ -385 +458 @@
                 switch (hid_dev->poll_pipe_mapping->interface->interface_protocol) {
                 case USB_HID_PROTOCOL_KEYBOARD:
-                        usb_log_info("Falling back to kbd boot protocol.\n");
+                        usb_log_info("Falling back to kbd boot protocol.");
                         rc = usb_kbd_set_boot_protocol(hid_dev);
                         if (rc == EOK) {
@@ -392 +465 @@
                         break;
                 case USB_HID_PROTOCOL_MOUSE:
-                        usb_log_info("Falling back to mouse boot protocol.\n");
+                        usb_log_info("Falling back to mouse boot protocol.");
                         rc = usb_mouse_set_boot_protocol(hid_dev);
                         if (rc == EOK) {
@@ -399 +472 @@
                         break;
                 default:
-                        usb_log_info("Falling back to generic HID driver.\n");
+                        usb_log_info("Falling back to generic HID driver.");
                         usb_hid_set_generic_hid_subdriver(hid_dev);
                 }
         }
 
-        usb_log_debug("Subdriver count(after trying boot protocol): %d\n",
+        usb_log_debug("Subdriver count(after trying boot protocol): %d",
             hid_dev->subdriver_count);
 
@@ -419 +492 @@
         for (unsigned i = 0; i < hid_dev->subdriver_count; ++i) {
                 if (hid_dev->subdrivers[i].init != NULL) {
-                        usb_log_debug("Initializing subdriver %d.\n",i);
+                        usb_log_debug("Initializing subdriver %d.",i);
                         const errno_t pret = hid_dev->subdrivers[i].init(hid_dev,
                             &hid_dev->subdrivers[i].data);
@@ -442 +515 @@
                 rc = usb_hid_init_report(hid_dev);
                 if (rc != EOK) {
-                        usb_log_error("Failed to initialize input report buffer"
-                            ".\n");
-                }
+                        usb_log_error("Failed to initialize input report buffer: %s", str_error(rc));
+                        // FIXME: What happens now?
+                }
+
+                usb_polling_t *polling = &hid_dev->polling;
+                if ((rc = usb_polling_init(polling))) {
+                        usb_log_error("Failed to initialize polling: %s", str_error(rc));
+                        // FIXME: What happens now?
+                }
+
+                polling->device = hid_dev->usb_dev;
+                polling->ep_mapping = hid_dev->poll_pipe_mapping;
+                polling->request_size = hid_dev->poll_pipe_mapping->pipe.desc.max_transfer_size;
+                polling->buffer = malloc(polling->request_size);
+                polling->on_data = usb_hid_polling_callback;
+                polling->on_polling_end = usb_hid_polling_ended_callback;
+                polling->on_error = usb_hid_polling_error_callback;
+                polling->arg = hid_dev;
         }
 
         return rc;
-}
-
-bool usb_hid_polling_callback(usb_device_t *dev, uint8_t *buffer,
-    size_t buffer_size, void *arg)
-{
-        if (dev == NULL || arg == NULL || buffer == NULL) {
-                usb_log_error("Missing arguments to polling callback.\n");
-                return false;
-        }
-        usb_hid_dev_t *hid_dev = arg;
-
-        assert(hid_dev->input_report != NULL);
-
-        usb_log_debug("New data [%zu/%zu]: %s\n", buffer_size,
-            hid_dev->max_input_report_size,
-            usb_debug_str_buffer(buffer, buffer_size, 0));
-
-        if (hid_dev->max_input_report_size >= buffer_size) {
-                /*! @todo This should probably be atomic. */
-                memcpy(hid_dev->input_report, buffer, buffer_size);
-                hid_dev->input_report_size = buffer_size;
-                usb_hid_new_report(hid_dev);
-        }
-
-        /* Parse the input report */
-        const errno_t rc = usb_hid_parse_report(
-            &hid_dev->report, buffer, buffer_size, &hid_dev->report_id);
-        if (rc != EOK) {
-                usb_log_warning("Failure in usb_hid_parse_report():"
-                    "%s\n", str_error(rc));
-        }
-
-        bool cont = false;
-        /* Continue if at least one of the subdrivers want to continue */
-        for (unsigned i = 0; i < hid_dev->subdriver_count; ++i) {
-                if (hid_dev->subdrivers[i].poll != NULL) {
-                        cont = cont || hid_dev->subdrivers[i].poll(
-                            hid_dev, hid_dev->subdrivers[i].data);
-                }
-        }
-
-        return cont;
-}
-
-void usb_hid_polling_ended_callback(usb_device_t *dev, bool reason, void *arg)
-{
-        assert(dev);
-        assert(arg);
-
-        usb_hid_dev_t *hid_dev = arg;
-
-        for (unsigned i = 0; i < hid_dev->subdriver_count; ++i) {
-                if (hid_dev->subdrivers[i].poll_end != NULL) {
-                        hid_dev->subdrivers[i].poll_end(
-                            hid_dev, hid_dev->subdrivers[i].data, reason);
-                }
-        }
-
-        hid_dev->running = false;
 }
 
@@ -524 +553 @@
         assert(hid_dev->subdrivers != NULL || hid_dev->subdriver_count == 0);
 
-
-        usb_log_debug("Subdrivers: %p, subdriver count: %d\n", 
+        free(hid_dev->polling.buffer);
+        usb_polling_fini(&hid_dev->polling);
+
+        usb_log_debug("Subdrivers: %p, subdriver count: %d",
             hid_dev->subdrivers, hid_dev->subdriver_count);
 
@@ -541 +572 @@
         /* Destroy the parser */
         usb_hid_report_deinit(&hid_dev->report);
-
 }
 

uspace/drv/hid/usbhid/usbhid.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Lubos Slovak
+ * Copyright (c) 2018 Petr Manek
  * All rights reserved.
  *
@@ -43 +44 @@
 #include <usb/dev/pipes.h>
 #include <usb/dev/driver.h>
+#include <usb/dev/poll.h>
 #include <usb/hid/hid.h>
 #include <stdbool.h>
@@ -106 +108 @@
         usb_endpoint_mapping_t *poll_pipe_mapping;
 
+        /** Device polling structure. */
+        usb_polling_t polling;
+
         /** Subdrivers. */
         usb_hid_subdriver_t *subdrivers;
@@ -138 +143 @@
 void usb_hid_deinit(usb_hid_dev_t *hid_dev);
 
-bool usb_hid_polling_callback(usb_device_t *dev,
-    uint8_t *buffer, size_t buffer_size, void *arg);
-
-void usb_hid_polling_ended_callback(usb_device_t *dev, bool reason, void *arg);
-
 void usb_hid_new_report(usb_hid_dev_t *hid_dev);