Changeset 62f4212 in mainline for uspace/drv/uhci-hcd/transfer_list.c

Timestamp:

2011-03-22T10:07:53Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

f8e4cb6

Parents:

18b3cfd (diff), b01995b (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:

Merged changes from development

File:

• uspace/drv/uhci-hcd/transfer_list.c (modified) (8 diffs)

uspace/drv/uhci-hcd/transfer_list.c

@@ -38 +38 @@
 
 static void transfer_list_remove_batch(
-    transfer_list_t *instance, batch_t *batch);
+    transfer_list_t *instance, usb_transfer_batch_t *batch);
 /*----------------------------------------------------------------------------*/
 /** Initialize transfer list structures.
@@ -79 +79 @@
         if (!instance->queue_head)
                 return;
-        /* Set both next and element to point to the same QH */
+        /* Set both queue_head.next to point to the follower */
         qh_set_next_qh(instance->queue_head, next->queue_head_pa);
-        qh_set_element_qh(instance->queue_head, next->queue_head_pa);
 }
 /*----------------------------------------------------------------------------*/
@@ -92 +91 @@
  * The batch is added to the end of the list and queue.
  */
-void transfer_list_add_batch(transfer_list_t *instance, batch_t *batch)
+void transfer_list_add_batch(transfer_list_t *instance, usb_transfer_batch_t *batch)
 {
         assert(instance);
@@ -98 +97 @@
         usb_log_debug2("Queue %s: Adding batch(%p).\n", instance->name, batch);
 
-        const uint32_t pa = addr_to_phys(batch->qh);
-        assert((pa & LINK_POINTER_ADDRESS_MASK) == pa);
-
-        /* New batch will be added to the end of the current list
-         * so set the link accordingly */
-        qh_set_next_qh(batch->qh, instance->queue_head->next);
-
         fibril_mutex_lock(&instance->guard);
 
+        qh_t *last_qh = NULL;
         /* Add to the hardware queue. */
         if (list_empty(&instance->batch_list)) {
                 /* There is nothing scheduled */
-                qh_t *qh = instance->queue_head;
-                assert(qh->element == qh->next);
-                qh_set_element_qh(qh, pa);
+                last_qh = instance->queue_head;
         } else {
                 /* There is something scheduled */
-                batch_t *last = list_get_instance(
-                    instance->batch_list.prev, batch_t, link);
-                qh_set_next_qh(last->qh, pa);
-        }
+                usb_transfer_batch_t *last = list_get_instance(
+                    instance->batch_list.prev, usb_transfer_batch_t, link);
+                last_qh = batch_qh(last);
+        }
+        const uint32_t pa = addr_to_phys(batch_qh(batch));
+        assert((pa & LINK_POINTER_ADDRESS_MASK) == pa);
+
+        /* keep link */
+        batch_qh(batch)->next = last_qh->next;
+        qh_set_next_qh(last_qh, pa);
+
         /* Add to the driver list */
         list_append(&batch->link, &instance->batch_list);
 
-        batch_t *first = list_get_instance(
-            instance->batch_list.next, batch_t, link);
+        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);
@@ -148 +146 @@
         while (current != &instance->batch_list) {
                 link_t *next = current->next;
-                batch_t *batch = list_get_instance(current, batch_t, link);
+                usb_transfer_batch_t *batch = list_get_instance(current, usb_transfer_batch_t, link);
 
                 if (batch_is_complete(batch)) {
@@ -162 +160 @@
                 link_t *item = done.next;
                 list_remove(item);
-                batch_t *batch = list_get_instance(item, batch_t, link);
+                usb_transfer_batch_t *batch = list_get_instance(item, usb_transfer_batch_t, link);
                 batch->next_step(batch);
         }
@@ -174 +172 @@
 {
         fibril_mutex_lock(&instance->guard);
-        while (list_empty(&instance->batch_list)) {
+        while (!list_empty(&instance->batch_list)) {
                 link_t *current = instance->batch_list.next;
-                batch_t *batch = list_get_instance(current, batch_t, link);
+                usb_transfer_batch_t *batch = list_get_instance(current, usb_transfer_batch_t, link);
                 transfer_list_remove_batch(instance, batch);
-                batch_abort(batch);
+                usb_transfer_batch_finish(batch, EIO);
         }
         fibril_mutex_unlock(&instance->guard);
@@ -191 +189 @@
  * Does not lock the transfer list, caller is responsible for that.
  */
-void transfer_list_remove_batch(transfer_list_t *instance, batch_t *batch)
-{
-        assert(instance);
+void transfer_list_remove_batch(transfer_list_t *instance, usb_transfer_batch_t *batch)
+{
+        assert(instance);
+        assert(instance->queue_head);
         assert(batch);
-        assert(instance->queue_head);
-        assert(batch->qh);
+        assert(batch_qh(batch));
+        assert(fibril_mutex_is_locked(&instance->guard));
+
         usb_log_debug2(
             "Queue %s: removing batch(%p).\n", instance->name, batch);
 
-        const char * pos = NULL;
+        const char *qpos = NULL;
         /* Remove from the hardware queue */
-        if (batch->link.prev == &instance->batch_list) {
+        if (instance->batch_list.next == &batch->link) {
                 /* I'm the first one here */
-                qh_set_element_qh(instance->queue_head, batch->qh->next);
-                pos = "FIRST";
+                assert((instance->queue_head->next & LINK_POINTER_ADDRESS_MASK)
+                    == addr_to_phys(batch_qh(batch)));
+                instance->queue_head->next = batch_qh(batch)->next;
+                qpos = "FIRST";
         } else {
-                batch_t *prev =
-                    list_get_instance(batch->link.prev, batch_t, link);
-                qh_set_next_qh(prev->qh, batch->qh->next);
-                pos = "NOT FIRST";
-        }
-        /* Remove from the driver list */
+                usb_transfer_batch_t *prev =
+                    list_get_instance(batch->link.prev, usb_transfer_batch_t, link);
+                assert((batch_qh(prev)->next & LINK_POINTER_ADDRESS_MASK)
+                    == addr_to_phys(batch_qh(batch)));
+                batch_qh(prev)->next = batch_qh(batch)->next;
+                qpos = "NOT FIRST";
+        }
+        /* Remove from the batch list */
         list_remove(&batch->link);
-        usb_log_debug("Batch(%p) removed (%s) from %s, next element %x.\n",
-            batch, pos, instance->name, batch->qh->next);
+        usb_log_debug("Batch(%p) removed (%s) from %s, next %x.\n",
+            batch, qpos, instance->name, batch_qh(batch)->next);
 }
 /**