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

Timestamp:

2011-03-21T20:22:50Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c56c5b5b

Parents:

4fb6d9ee (diff), 31b568e (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:

Development branch changes (including OHCI)

File:

• uspace/drv/uhci-hcd/transfer_list.c (modified) (10 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.
@@ -91 +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);
         assert(batch);
         usb_log_debug2("Queue %s: Adding batch(%p).\n", instance->name, batch);
-
 
         fibril_mutex_lock(&instance->guard);
@@ -107 +106 @@
         } else {
                 /* There is something scheduled */
-                batch_t *last = list_get_instance(
-                    instance->batch_list.prev, batch_t, link);
-                last_qh = last->qh;
+                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);
         assert((pa & LINK_POINTER_ADDRESS_MASK) == pa);
 
-        batch->qh->next = last_qh->next;
+        /* keep link */
+        batch_qh(batch)->next = last_qh->next;
         qh_set_next_qh(last_qh, pa);
 
@@ -120 +120 @@
         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);
@@ -146 +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)) {
@@ -160 +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 +174 @@
         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);
@@ -189 +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));
 
@@ -205 +205 @@
                 /* I'm the first one here */
                 assert((instance->queue_head->next & LINK_POINTER_ADDRESS_MASK)
-                    == addr_to_phys(batch->qh));
-                instance->queue_head->next = batch->qh->next;
+                    == addr_to_phys(bathc_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);
-                assert((prev->qh->next & LINK_POINTER_ADDRESS_MASK)
-                    == addr_to_phys(batch->qh));
-                prev->qh->next = batch->qh->next;
+                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";
         }
@@ -219 +219 @@
         list_remove(&batch->link);
         usb_log_debug("Batch(%p) removed (%s) from %s, next %x.\n",
-            batch, qpos, instance->name, batch->qh->next);
+            batch, pos, instance->name, batch_qh(batch)->next);
 }
 /**