Changeset a1732929 in mainline for uspace/drv/bus/usb/usbdiag

Timestamp:

2018-01-15T17:04:34Z (8 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.

Location:

uspace/drv/bus/usb/usbdiag

Files:

• device.c (modified) (1 diff)
• main.c (modified) (3 diffs)
• tests.c (modified) (5 diffs)

uspace/drv/bus/usb/usbdiag/device.c

@@ -79 +79 @@
         usb_endpoint_mapping_t *epm = usb_device_get_mapped_ep(dev->usb_dev, USBDIAG_EP_##ep_no);\
         if (!epm || !epm->present) {\
-                usb_log_error("Failed to map endpoint: " #ep_no ".\n");\
+                usb_log_error("Failed to map endpoint: " #ep_no ".");\
                 rc = ENOENT;\
                 goto err_fun;\

uspace/drv/bus/usb/usbdiag/main.c

@@ -52 +52 @@
         usbdiag_dev_t *diag_dev;
         if ((rc = usbdiag_dev_create(dev, &diag_dev))) {
-                usb_log_error("Failed create device: %s.\n", str_error(rc));
+                usb_log_error("Failed create device: %s.", str_error(rc));
                 goto err;
         }
 
         if ((rc = ddf_fun_bind(diag_dev->fun))) {
-                usb_log_error("Failed to bind DDF function: %s.\n", str_error(rc));
+                usb_log_error("Failed to bind DDF function: %s.", str_error(rc));
                 goto err_create;
         }
@@ -96 +96 @@
 
         if ((rc = ddf_fun_unbind(diag_dev->fun))) {
-                usb_log_error("Failed to unbind DDF function: %s\n", str_error(rc));
+                usb_log_error("Failed to unbind DDF function: %s", str_error(rc));
                 goto err;
         }
@@ -117 +117 @@
 
         if ((rc = ddf_fun_unbind(diag_dev->fun))) {
-                usb_log_error("Failed to unbind DDF function: %s\n", str_error(rc));
+                usb_log_error("Failed to unbind DDF function: %s", str_error(rc));
                 goto err;
         }

uspace/drv/bus/usb/usbdiag/tests.c

@@ -68 +68 @@
                 while (remaining > 0) {
                         if ((rc = usb_pipe_read(pipe, buffer + size - remaining, remaining, &transferred))) {
-                                usb_log_error("Read of %s IN endpoint failed with error: %s\n", usb_str_transfer_type(pipe->desc.transfer_type), str_error(rc));
+                                usb_log_error("Read of %s IN endpoint failed with error: %s", usb_str_transfer_type(pipe->desc.transfer_type), str_error(rc));
                                 break;
                         }
 
                         if (transferred > remaining) {
-                                usb_log_error("Read of %s IN endpoint returned more data than expected.\n", usb_str_transfer_type(pipe->desc.transfer_type));
+                                usb_log_error("Read of %s IN endpoint returned more data than expected.", usb_str_transfer_type(pipe->desc.transfer_type));
                                 rc = EINVAL;
                                 break;
@@ -121 +121 @@
                 // Write buffer to device.
                 if ((rc = usb_pipe_write(pipe, buffer, size))) {
-                        usb_log_error("Write to %s OUT endpoint failed with error: %s\n", usb_str_transfer_type(pipe->desc.transfer_type), str_error(rc));
+                        usb_log_error("Write to %s OUT endpoint failed with error: %s", usb_str_transfer_type(pipe->desc.transfer_type), str_error(rc));
                         break;
                 }
@@ -169 +169 @@
                 while (remaining > 0) {
                         if ((rc = usb_pipe_read(pipe, buffer + size - remaining, remaining, &transferred))) {
-                                usb_log_error("Read of %s IN endpoint failed with error: %s\n", usb_str_transfer_type(pipe->desc.transfer_type), str_error(rc));
+                                usb_log_error("Read of %s IN endpoint failed with error: %s", usb_str_transfer_type(pipe->desc.transfer_type), str_error(rc));
                                 break;
                         }
 
                         if (transferred > remaining) {
-                                usb_log_error("Read of %s IN endpoint returned more data than expected.\n", usb_str_transfer_type(pipe->desc.transfer_type));
+                                usb_log_error("Read of %s IN endpoint returned more data than expected.", usb_str_transfer_type(pipe->desc.transfer_type));
                                 rc = EINVAL;
                                 break;
@@ -187 +187 @@
                 for (size_t i = 0; i < size; i += sizeof(test_data)) {
                         if (*(uint32_t *)(buffer + i) != test_data) {
-                                usb_log_error("Read of %s IN endpoint returned invald data at address %lu.\n", usb_str_transfer_type(pipe->desc.transfer_type), i);
+                                usb_log_error("Read of %s IN endpoint returned invald data at address %lu.", usb_str_transfer_type(pipe->desc.transfer_type), i);
                                 rc = EINVAL;
                                 break;
@@ -238 +238 @@
                 // Write buffer to device.
                 if ((rc = usb_pipe_write(pipe, buffer, size))) {
-                        usb_log_error("Write to %s OUT endpoint failed with error: %s\n", usb_str_transfer_type(pipe->desc.transfer_type), str_error(rc));
+                        usb_log_error("Write to %s OUT endpoint failed with error: %s", usb_str_transfer_type(pipe->desc.transfer_type), str_error(rc));
                         break;
                 }