Changeset a61ddcf4 in mainline

Timestamp:

2012-02-26T09:10:05Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

1d68621

Parents:

c4f318d6 (diff), b64fbc9 (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 with mainline

Location:

uspace/drv/bus/usb/uhci

Files:

• transfer_list.c (modified) (4 diffs)
• uhci_batch.c (modified) (1 diff)

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

@@ -110 +110 @@
         assert(instance);
         assert(uhci_batch);
-        usb_log_debug2("Queue %s: Adding batch(%p).\n", instance->name,
-            uhci_batch->usb_batch);
+        usb_log_debug2("Batch %p adding to queue %s.\n",
+            uhci_batch->usb_batch, instance->name);
 
         fibril_mutex_lock(&instance->guard);
@@ -139 +139 @@
         list_append(&uhci_batch->link, &instance->batch_list);
 
-        usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " scheduled in queue %s.\n",
-            uhci_batch, USB_TRANSFER_BATCH_ARGS(*uhci_batch->usb_batch),
-            instance->name);
+        usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT
+            " scheduled in queue %s.\n", uhci_batch->usb_batch,
+            USB_TRANSFER_BATCH_ARGS(*uhci_batch->usb_batch), instance->name);
         fibril_mutex_unlock(&instance->guard);
 }
@@ -205 +205 @@
         assert(fibril_mutex_is_locked(&instance->guard));
 
-        usb_log_debug2("Queue %s: removing batch(%p).\n",
-            instance->name, uhci_batch->usb_batch);
+        usb_log_debug2("Batch %p removing from queue %s.\n",
+            uhci_batch->usb_batch, instance->name);
 
         /* Assume I'm the first */
@@ -228 +228 @@
         list_remove(&uhci_batch->link);
         usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " removed (%s) "
-            "from %s, next: %x.\n",
-            uhci_batch, USB_TRANSFER_BATCH_ARGS(*uhci_batch->usb_batch),
+            "from %s, next: %x.\n", uhci_batch->usb_batch,
+            USB_TRANSFER_BATCH_ARGS(*uhci_batch->usb_batch),
             qpos, instance->name, uhci_batch->qh->next);
 }

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