Changeset f1fae414 in mainline for uspace/drv/bus/usb/uhci/iface.c

Timestamp:

2011-06-22T01:34:53Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

8d7e82c1, cac458f

Parents:

72ec8cc (diff), bf172825 (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 mainline changes.

File:

• uspace/drv/bus/usb/uhci/iface.c (moved) (moved from uspace/drv/uhci_hcd/iface.c ) (3 diffs)

uspace/drv/bus/usb/uhci/iface.c

@@ -64 +64 @@
         }
 
-        usb_log_debug("%s %d:%d %zu(%zu).\n",
+        usb_log_debug2("%s %d:%d %zu(%zu).\n",
             name, target.address, target.endpoint, size, ep->max_packet_size);
 
@@ -172 +172 @@
                 speed = ep_speed;
         }
-        usb_log_debug("Register endpoint %d:%d %s %s(%d) %zu(%zu) %u.\n",
+        usb_log_debug("Register endpoint %d:%d %s-%s %s %zuB %ums.\n",
             address, endpoint, usb_str_transfer_type(transfer_type),
-            usb_str_speed(speed), direction, size, max_packet_size, interval);
+            usb_str_direction(direction), usb_str_speed(speed),
+            max_packet_size, interval);
 
         return usb_endpoint_manager_add_ep(&hc->ep_manager, address, endpoint,
@@ -187 +188 @@
         hc_t *hc = fun_to_hc(fun);
         assert(hc);
-        usb_log_debug("Unregister endpoint %d:%d %d.\n",
-            address, endpoint, direction);
+        usb_log_debug("Unregister endpoint %d:%d %s.\n",
+            address, endpoint, usb_str_direction(direction));
         return usb_endpoint_manager_unregister_ep(&hc->ep_manager, address,
             endpoint, direction);