Changeset 58ac3ec in mainline for uspace/drv/bus/usb/uhci/transfer_list.c

Timestamp:

2017-10-28T10:39:17Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

40a3bfa

Parents:

8b8c164

Message:

uhci: finished forgotten refactoring to generic batch

File:

• uspace/drv/bus/usb/uhci/transfer_list.c (modified) (4 diffs)

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

@@ -116 +116 @@
         assert(uhci_batch);
         usb_log_debug2("Batch %p adding to queue %s.\n",
-            uhci_batch->usb_batch, instance->name);
+            uhci_batch, instance->name);
 
         fibril_mutex_lock(&instance->guard);
@@ -145 +145 @@
 
         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);
+            " scheduled in queue %s.\n", uhci_batch,
+            USB_TRANSFER_BATCH_ARGS(uhci_batch->base), instance->name);
         fibril_mutex_unlock(&instance->guard);
 }
@@ -211 +211 @@
 
         usb_log_debug2("Batch %p removing from queue %s.\n",
-            uhci_batch->usb_batch, instance->name);
+            uhci_batch, instance->name);
 
         /* Assume I'm the first */
@@ -233 +233 @@
         list_remove(&uhci_batch->link);
         usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " removed (%s) "
-            "from %s, next: %x.\n", uhci_batch->usb_batch,
-            USB_TRANSFER_BATCH_ARGS(*uhci_batch->usb_batch),
+            "from %s, next: %x.\n", uhci_batch,
+            USB_TRANSFER_BATCH_ARGS(uhci_batch->base),
             qpos, instance->name, uhci_batch->qh->next);
 }