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

Timestamp:

2011-03-21T13:19:19Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0e45e7f, 8a951ca

Parents:

e387d0f (diff), 2e1d5d70 (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 development/ changes

File:

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

uspace/drv/uhci-hcd/transfer_list.c

@@ -98 +98 @@
         usb_log_debug2("Queue %s: Adding batch(%p).\n", instance->name, batch);
 
-        const uint32_t pa = addr_to_phys(batch->qh);
+        const uint32_t pa = addr_to_phys(batch_qh(batch));
         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);
+        qh_set_next_qh(batch_qh(batch), instance->queue_head->next);
 
         fibril_mutex_lock(&instance->guard);
@@ -117 +117 @@
                 batch_t *last = list_get_instance(
                     instance->batch_list.prev, batch_t, link);
-                qh_set_next_qh(last->qh, pa);
+                qh_set_next_qh(batch_qh(last), pa);
         }
         /* Add to the driver list */
@@ -178 +178 @@
                 batch_t *batch = list_get_instance(current, batch_t, link);
                 transfer_list_remove_batch(instance, batch);
-                batch_abort(batch);
+                batch_finish(batch, EIO);
         }
         fibril_mutex_unlock(&instance->guard);
@@ -194 +194 @@
 {
         assert(instance);
+        assert(instance->queue_head);
         assert(batch);
-        assert(instance->queue_head);
-        assert(batch->qh);
+        assert(batch_qh(batch));
         usb_log_debug2(
             "Queue %s: removing batch(%p).\n", instance->name, batch);
@@ -204 +204 @@
         if (batch->link.prev == &instance->batch_list) {
                 /* I'm the first one here */
-                qh_set_element_qh(instance->queue_head, batch->qh->next);
+                qh_set_element_qh(instance->queue_head, batch_qh(batch)->next);
                 pos = "FIRST";
         } else {
                 batch_t *prev =
                     list_get_instance(batch->link.prev, batch_t, link);
-                qh_set_next_qh(prev->qh, batch->qh->next);
+                qh_set_next_qh(batch_qh(prev), batch_qh(batch)->next);
                 pos = "NOT FIRST";
         }
@@ -215 +215 @@
         list_remove(&batch->link);
         usb_log_debug("Batch(%p) removed (%s) from %s, next element %x.\n",
-            batch, pos, instance->name, batch->qh->next);
+            batch, pos, instance->name, batch_qh(batch)->next);
 }
 /**