Changeset 44b1674 in mainline for uspace/drv/usbhub

Timestamp:

2011-04-18T21:48:55Z (15 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

Location:

uspace/drv/usbhub

Files:

• ports.c (modified) (6 diffs)
• usbhub.c (modified) (4 diffs)

uspace/drv/usbhub/ports.c

@@ -83 +83 @@
 void usb_hub_process_interrupt(usb_hub_info_t * hub,
         uint16_t port) {
-        usb_log_debug("interrupt at port %d\n", port);
+        usb_log_debug("interrupt at port %zu\n", (size_t) port);
         //determine type of change
         //usb_pipe_t *pipe = hub->control_pipe;
@@ -93 +93 @@
         if (opResult != EOK) {
                 usb_log_error("Failed to get port %zu status: %s.\n",
-                    port, str_error(opResult));
+                    (size_t) port, str_error(opResult));
                 return;
         }
@@ -100 +100 @@
                 bool device_connected = usb_port_is_status(status,
                     USB_HUB_FEATURE_PORT_CONNECTION);
-                usb_log_debug("Connection change on port %zu: %s.\n", port,
+                usb_log_debug("Connection change on port %zu: %s.\n",
+                    (size_t) port,
                     device_connected ? "device attached" : "device removed");
 
@@ -109 +110 @@
                                 usb_log_error(
                                     "Cannot handle change on port %zu: %s.\n",
-                                    str_error(opResult));
+                                    (size_t) port, str_error(opResult));
                         }
                 } else {
@@ -210 +211 @@
 static void usb_hub_port_reset_completed(usb_hub_info_t * hub,
         uint16_t port, uint32_t status){
-        usb_log_debug("Port %zu reset complete.\n", port);
+        usb_log_debug("Port %zu reset complete.\n", (size_t) port);
         if (usb_port_is_status(status, USB_HUB_FEATURE_PORT_ENABLE)) {
                 /* Finalize device adding. */
@@ -222 +223 @@
                 usb_log_warning(
                     "Port %zu reset complete but port not enabled.\n",
-                    port);
+                    (size_t) port);
         }
 }

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