Changeset 44b1674 in mainline for uspace/drv/usbhub/usbhub.c

Timestamp:

2011-04-18T21:48:55Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

9014dcd

Parents:

618f9ed (diff), 84a04dd (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.

Message:

merge form usb/development

File:

• uspace/drv/usbhub/usbhub.c (modified) (4 diffs)

uspace/drv/usbhub/usbhub.c

@@ -260 +260 @@
                                     port+1, USB_HUB_FEATURE_PORT_POWER);
                                 if (opResult != EOK) {
-                                        usb_log_error("cannot power on port %d;  %d\n",
-                                            port+1, opResult);
+                                        usb_log_error("cannot power on port %zu: %s.\n",
+                                            port+1, str_error(opResult));
                                 }
                         }
@@ -269 +269 @@
                             USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
                         if (opResult != EOK) {
-                                usb_log_error("cannot power hub;  %d\n",
-                                  opResult);
+                                usb_log_error("cannot power hub: %s\n",
+                                    str_error(opResult));
                         }
                 }
@@ -356 +356 @@
         }
 
-        usb_log_info("Controlling hub `%s' (%d ports).\n",
+        usb_log_info("Controlling hub `%s' (%zu ports).\n",
             hub_info->usb_device->ddf_dev->name, hub_info->port_count);
         return EOK;
@@ -424 +424 @@
                             port, USB_HUB_FEATURE_PORT_POWER);
                         if (opResult != EOK) {
-                                usb_log_error("cannot power on port %d;  %d\n",
-                                    port, opResult);
+                                usb_log_error("Cannot power on port %zu: %s.\n",
+                                    port, str_error(opResult));
                         }
                 }