Changeset df6ded8 in mainline for uspace/drv/hid/usbhid/generic/hiddev.c

Timestamp:

2018-02-28T16:37:50Z (6 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

File:

• uspace/drv/hid/usbhid/generic/hiddev.c (modified) (13 diffs)

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;
 }