Changeset a1732929 in mainline for uspace/drv/hid/usbhid/mouse/mousedev.c

Timestamp:

2018-01-15T17:04:34Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

9ff99e8

Parents:

c1a966e

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-15 17:04:32)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-15 17:04:34)

Message:

usb: unified logging

Use logger instead of printf. Logger adds newlines automatically.

File:

• uspace/drv/hid/usbhid/mouse/mousedev.c (modified) (15 diffs)

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

@@ -118 +118 @@
 
         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 +132 @@
                 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 +142 @@
                 }
         } else {
-                usb_log_debug("%s: Invalid function.\n", __FUNCTION__);
+                usb_log_debug("%s: Invalid function.", __FUNCTION__);
                 async_answer_0(icallid, EINVAL);
         }
@@ -171 +171 @@
 
         if (mouse_dev->mouse_sess == NULL) {
-                usb_log_warning(NAME " No console session.\n");
+                usb_log_warning(NAME " No console session.");
                 return;
         }
@@ -225 +225 @@
         usb_hid_report_path_t *path = usb_hid_report_path();
         if (path == NULL) {
-                usb_log_warning("Failed to create USB HID report path.\n");
+                usb_log_warning("Failed to create USB HID report path.");
                 return;
         }
@@ -232 +232 @@
         if (ret != EOK) {
                 usb_hid_report_path_free(path);
-                usb_log_warning("Failed to add buttons to report path.\n");
+                usb_log_warning("Failed to add buttons to report path.");
                 return;
         }
@@ -242 +242 @@
 
         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);
@@ -331 +331 @@
 
         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;
@@ -344 +344 @@
 int 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) {
@@ -353 +353 @@
 
         /* 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;
@@ -364 +364 @@
         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;
@@ -371 +371 @@
         int 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;
         }
@@ -379 +379 @@
         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);
@@ -385 +385 @@
         }
 
-        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);
@@ -444 +444 @@
 
         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;