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

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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/transfer_list.c (modified) (8 diffs)

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

@@ -37 +37 @@
 #include <usb/debug.h>
 #include <libarch/barrier.h>
+
 #include "transfer_list.h"
-#include "batch.h"
 
 static void transfer_list_remove_batch(
-    transfer_list_t *instance, usb_transfer_batch_t *batch);
+    transfer_list_t *instance, uhci_transfer_batch_t *uhci_batch);
 /*----------------------------------------------------------------------------*/
 /** Initialize transfer list structures.
@@ -106 +106 @@
  */
 void transfer_list_add_batch(
-    transfer_list_t *instance, usb_transfer_batch_t *batch)
-{
-        assert(instance);
-        assert(batch);
-        usb_log_debug2("Queue %s: Adding batch(%p).\n", instance->name, batch);
+    transfer_list_t *instance, uhci_transfer_batch_t *uhci_batch)
+{
+        assert(instance);
+        assert(uhci_batch);
+        usb_log_debug2("Queue %s: Adding batch(%p).\n", instance->name,
+            uhci_batch->usb_batch);
 
         fibril_mutex_lock(&instance->guard);
 
-        qh_t *last_qh = NULL;
+        /* Assume there is nothing scheduled */
+        qh_t *last_qh = instance->queue_head;
+        /* There is something scheduled */
+        if (!list_empty(&instance->batch_list)) {
+                last_qh = uhci_transfer_batch_from_link(
+                    list_last(&instance->batch_list))->qh;
+        }
         /* Add to the hardware queue. */
-        if (list_empty(&instance->batch_list)) {
-                /* There is nothing scheduled */
-                last_qh = instance->queue_head;
-        } else {
-                /* There is something scheduled */
-                usb_transfer_batch_t *last = usb_transfer_batch_from_link(
-                    list_last(&instance->batch_list));
-                last_qh = batch_qh(last);
-        }
-        const uint32_t pa = addr_to_phys(batch_qh(batch));
+        const uint32_t pa = addr_to_phys(uhci_batch->qh);
         assert((pa & LINK_POINTER_ADDRESS_MASK) == pa);
 
@@ -132 +130 @@
 
         /* keep link */
-        batch_qh(batch)->next = last_qh->next;
-        qh_set_next_qh(last_qh, batch_qh(batch));
+        uhci_batch->qh->next = last_qh->next;
+        qh_set_next_qh(last_qh, uhci_batch->qh);
 
         /* Make sure the pointer is updated */
@@ -139 +137 @@
 
         /* Add to the driver's list */
-        list_append(&batch->link, &instance->batch_list);
+        list_append(&uhci_batch->link, &instance->batch_list);
 
         usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " scheduled in queue %s.\n",
-            batch, USB_TRANSFER_BATCH_ARGS(*batch), instance->name);
+            uhci_batch, USB_TRANSFER_BATCH_ARGS(*uhci_batch->usb_batch),
+            instance->name);
         fibril_mutex_unlock(&instance->guard);
 }
@@ -157 +156 @@
 
         fibril_mutex_lock(&instance->guard);
-        link_t *current = instance->batch_list.head.next;
-        while (current != &instance->batch_list.head) {
+        link_t *current = list_first(&instance->batch_list);
+        while (current && current != &instance->batch_list.head) {
                 link_t * const next = current->next;
-                usb_transfer_batch_t *batch =
-                    usb_transfer_batch_from_link(current);
-
-                if (batch_is_complete(batch)) {
+                uhci_transfer_batch_t *batch =
+                    uhci_transfer_batch_from_link(current);
+
+                if (uhci_transfer_batch_is_complete(batch)) {
                         /* Save for processing */
                         transfer_list_remove_batch(instance, batch);
@@ -182 +181 @@
         while (!list_empty(&instance->batch_list)) {
                 link_t * const current = list_first(&instance->batch_list);
-                usb_transfer_batch_t *batch =
-                    usb_transfer_batch_from_link(current);
+                uhci_transfer_batch_t *batch =
+                    uhci_transfer_batch_from_link(current);
                 transfer_list_remove_batch(instance, batch);
-                usb_transfer_batch_finish_error(batch, EINTR);
+                uhci_transfer_batch_abort(batch);
         }
         fibril_mutex_unlock(&instance->guard);
@@ -198 +197 @@
  */
 void transfer_list_remove_batch(
-    transfer_list_t *instance, usb_transfer_batch_t *batch)
+    transfer_list_t *instance, uhci_transfer_batch_t *uhci_batch)
 {
         assert(instance);
         assert(instance->queue_head);
-        assert(batch);
-        assert(batch_qh(batch));
+        assert(uhci_batch);
+        assert(uhci_batch->qh);
         assert(fibril_mutex_is_locked(&instance->guard));
 
-        usb_log_debug2(
-            "Queue %s: removing batch(%p).\n", instance->name, batch);
-
-        const char *qpos = NULL;
-        qh_t *prev_qh = NULL;
+        usb_log_debug2("Queue %s: removing batch(%p).\n",
+            instance->name, uhci_batch->usb_batch);
+
+        /* Assume I'm the first */
+        const char *qpos = "FIRST";
+        qh_t *prev_qh = instance->queue_head;
         /* Remove from the hardware queue */
-        if (list_first(&instance->batch_list) == &batch->link) {
-                /* I'm the first one here */
-                prev_qh = instance->queue_head;
-                qpos = "FIRST";
-        } else {
-                /* The thing before me is a batch too */
-                usb_transfer_batch_t *prev =
-                    usb_transfer_batch_from_link(batch->link.prev);
-                prev_qh = batch_qh(prev);
+        if (list_first(&instance->batch_list) != &uhci_batch->link) {
+                /* There is a batch in front of me */
+                prev_qh =
+                    uhci_transfer_batch_from_link(uhci_batch->link.prev)->qh;
                 qpos = "NOT FIRST";
         }
         assert((prev_qh->next & LINK_POINTER_ADDRESS_MASK)
-            == addr_to_phys(batch_qh(batch)));
-        prev_qh->next = batch_qh(batch)->next;
+            == addr_to_phys(uhci_batch->qh));
+        prev_qh->next = uhci_batch->qh->next;
 
         /* Make sure the pointer is updated */
@@ -231 +226 @@
 
         /* Remove from the batch list */
-        list_remove(&batch->link);
+        list_remove(&uhci_batch->link);
         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);
+            uhci_batch, USB_TRANSFER_BATCH_ARGS(*uhci_batch->usb_batch),
+            qpos, instance->name, uhci_batch->qh->next);
 }
 /**