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

Timestamp:

2011-06-22T01:59:39Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

41e2118

Parents:

79506d6 (diff), f1fae414 (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 libposix changes.

File:

• uspace/drv/bus/usb/uhci/transfer_list.c (moved) (moved from uspace/drv/uhci_hcd/transfer_list.c ) (6 diffs)

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

@@ -121 +121 @@
         } else {
                 /* There is something scheduled */
-                usb_transfer_batch_t *last =
-                    usb_transfer_batch_from_link(instance->batch_list.prev);
+                usb_transfer_batch_t *last = usb_transfer_batch_from_link(
+                    list_last(&instance->batch_list));
                 last_qh = batch_qh(last);
         }
@@ -141 +141 @@
         list_append(&batch->link, &instance->batch_list);
 
-        usb_transfer_batch_t *first = list_get_instance(
-            instance->batch_list.next, usb_transfer_batch_t, link);
-        usb_log_debug("Batch(%p) added to queue %s, first is %p.\n",
-                batch, instance->name, first);
+        usb_log_debug("Batch %p " USB_TRANSFER_BATCH_FMT " scheduled in queue %s.\n",
+            batch, USB_TRANSFER_BATCH_ARGS(*batch), instance->name);
         fibril_mutex_unlock(&instance->guard);
 }
 /*----------------------------------------------------------------------------*/
-/** Add completed bantches to the provided list.
+/** Add completed batches to the provided list.
  *
  * @param[in] instance List to use.
  * @param[in] done list to fill
  */
-void transfer_list_remove_finished(transfer_list_t *instance, link_t *done)
+void transfer_list_remove_finished(transfer_list_t *instance, list_t *done)
 {
         assert(instance);
@@ -159 +157 @@
 
         fibril_mutex_lock(&instance->guard);
-        link_t *current = instance->batch_list.next;
-        while (current != &instance->batch_list) {
+        link_t *current = instance->batch_list.head.next;
+        while (current != &instance->batch_list.head) {
                 link_t * const next = current->next;
                 usb_transfer_batch_t *batch =
@@ -183 +181 @@
         fibril_mutex_lock(&instance->guard);
         while (!list_empty(&instance->batch_list)) {
-                link_t * const current = instance->batch_list.next;
+                link_t * const current = list_first(&instance->batch_list);
                 usb_transfer_batch_t *batch =
                     usb_transfer_batch_from_link(current);
@@ -214 +212 @@
         qh_t *prev_qh = NULL;
         /* Remove from the hardware queue */
-        if (instance->batch_list.next == &batch->link) {
+        if (list_first(&instance->batch_list) == &batch->link) {
                 /* I'm the first one here */
                 prev_qh = instance->queue_head;
@@ -234 +232 @@
         /* Remove from the batch list */
         list_remove(&batch->link);
-        usb_log_debug("Batch(%p) removed (%s) from %s, next: %x.\n",
-            batch, qpos, instance->name, batch_qh(batch)->next);
+        usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " removed (%s) "
+            "from %s, next: %x.\n",
+            batch, USB_TRANSFER_BATCH_ARGS(*batch),
+            qpos, instance->name, batch_qh(batch)->next);
 }
 /**