Changeset df6ded8 in mainline for uspace/drv/hid/usbhid/multimedia/multimedia.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/multimedia/multimedia.c (modified) (14 diffs)

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