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

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/vhc

Files:

• conndev.c (modified) (2 diffs)
• hub/hub.c (modified) (3 diffs)
• main.c (modified) (4 diffs)
• transfer.c (modified) (3 diffs)

uspace/drv/bus/usb/vhc/conndev.c

@@ -113 +113 @@
                 receive_device_name(callback);
                 
-                usb_log_info("New virtual device `%s' (id: %" PRIxn ").\n",
+                usb_log_info("New virtual device `%s' (id: %" PRIxn ").",
                     plugged_device_name, plugged_device_handle);
         } else
@@ -130 +130 @@
 
         if (plugged_device_handle != 0) {
-                usb_log_info("Virtual device `%s' disconnected (id: %" PRIxn ").\n",
+                usb_log_info("Virtual device `%s' disconnected (id: %" PRIxn ").",
                     plugged_device_name, plugged_device_handle);
                 vhc_virtdev_unplug(vhc, plugged_device_handle);

uspace/drv/bus/usb/vhc/hub/hub.c

@@ -231 +231 @@
         }
 
-        usb_log_debug("Setting port %zu to state %d.\n", port_index, state);
+        usb_log_debug("Setting port %zu to state %d.", port_index, state);
 
         switch (state) {
@@ -423 +423 @@
         uint16_t old_value = port->status_change;
         port->status_change |= change;
-        usb_log_debug("Changing status change on %zu: %04x => %04x\n",
+        usb_log_debug("Changing status change on %zu: %04x => %04x",
             port->index,
             (unsigned int) old_value, (unsigned int) port->status_change);
@@ -510 +510 @@
         fid_t fibril = fibril_create(set_port_state_delayed_fibril, change);
         if (fibril == 0) {
-                printf("Failed to create fibril\n");
+                usb_log_error("Failed to create fibril.");
                 free(change);
                 return;

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

@@ -77 +77 @@
         int ret = hcd_ddf_setup_hc(dev, sizeof(vhc_data_t));
         if (ret != EOK) {
-                usb_log_error("Failed to init HCD structures: %s.\n",
+                usb_log_error("Failed to init HCD structures: %s.",
                    str_error(ret));
                 return ret;
@@ -90 +90 @@
         ret = vhc_control_node(dev, &ctl_fun);
         if (ret != EOK) {
-                usb_log_error("Failed to setup control node.\n");
+                usb_log_error("Failed to setup control node.");
                 return ret;
         }
@@ -97 +97 @@
         ret = vhc_virtdev_plug_hub(vhc, &vhc->hub, NULL, 0);
         if (ret != EOK) {
-                usb_log_error("Failed to plug root hub: %s.\n", str_error(ret));
+                usb_log_error("Failed to plug root hub: %s.", str_error(ret));
                 ddf_fun_destroy(ctl_fun);
                 return ret;
@@ -108 +108 @@
         ret = hcd_setup_virtual_root_hub(&vhc->base);
         if (ret != EOK) {
-                usb_log_error("Failed to init VHC root hub: %s\n",
+                usb_log_error("Failed to init VHC root hub: %s",
                         str_error(ret));
                 // TODO do something here...

uspace/drv/bus/usb/vhc/transfer.c

@@ -207 +207 @@
         
         if (targets > 1)
-                usb_log_warning("Transfer would be accepted by more devices!\n");
+                usb_log_warning("Transfer would be accepted by more devices!");
 
         return targets ? EOK : ENOENT;
@@ -236 +236 @@
                             dev->dev_local, &data_transfer_size);
                 } else {
-                        usb_log_warning("Device has no remote phone nor local node.\n");
+                        usb_log_warning("Device has no remote phone nor local node.");
                         rc = ESTALL;
                 }
 
-                usb_log_debug2("Transfer %p processed: %s.\n",
+                usb_log_debug2("Transfer %p processed: %s.",
                     transfer, str_error(rc));
 
@@ -249 +249 @@
                                     (void*) transfer->batch.setup.buffer;
                                 dev->address = setup->value;
-                                usb_log_debug2("Address changed to %d\n",
+                                usb_log_debug2("Address changed to %d",
                                     dev->address);
                         }