Changeset e1dbcbc in mainline for uspace/drv/usbhub/ports.c

Timestamp:

2011-04-29T13:43:01Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a81a1d09

Parents:

380e0364 (diff), f19f1b7 (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 development/ changes

File:

• uspace/drv/usbhub/ports.c (modified) (8 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 {
@@ -166 +167 @@
 
         //close address
-        //if (hub->attached_devs[port].address != 0) {
         if(hub->ports[port].attached_device.address >= 0){
                 /*uncomment this code to use it when DDF allows device removal
@@ -181 +181 @@
                  */
         } else {
-                // TODO: is this really reason to print a warning?
                 usb_log_warning("Device removed before being registered.\n");
 
@@ -210 +209 @@
 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 +221 @@
                 usb_log_warning(
                     "Port %zu reset complete but port not enabled.\n",
-                    port);
+                    (size_t) port);
         }
 }