Changeset 98cb0495 in mainline for uspace/drv/bus/usb/uhci/uhci_batch.c

Timestamp:

2012-03-04T18:52:28Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

38b950f

Parents:

6561a8e (diff), 0499235 (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/uhci_batch.c (modified) (1 diff)

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

@@ -174 +174 @@
                         assert(uhci_batch->usb_batch->ep != NULL);
 
-                        usb_log_debug("Batch(%p) found error TD(%zu):%"
+                        usb_log_debug("Batch %p found error TD(%zu->%p):%"
                             PRIx32 ".\n", uhci_batch->usb_batch, i,
-                            uhci_batch->tds[i].status);
+                            &uhci_batch->tds[i], uhci_batch->tds[i].status);
                         td_print_status(&uhci_batch->tds[i]);