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

Timestamp:

2011-03-21T23:42:08Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

11dd29b, 62f4212

Parents:

31b568e (diff), 87644b4 (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:

Fixes selecting a new USB address when max address has been reached.

Whitespace and code-style fixes, renames

File:

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

uspace/drv/uhci-hcd/transfer_list.c

@@ -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);
 }
 /*----------------------------------------------------------------------------*/
@@ -98 +97 @@
         usb_log_debug2("Queue %s: Adding batch(%p).\n", instance->name, batch);
 
-        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(batch), 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 */
                 usb_transfer_batch_t *last = list_get_instance(
                     instance->batch_list.prev, usb_transfer_batch_t, link);
-                qh_set_next_qh(batch_qh(last), pa);
-        }
+                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);
@@ -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;
                 usb_transfer_batch_t *batch = list_get_instance(current, usb_transfer_batch_t, link);
@@ -197 +195 @@
         assert(batch);
         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(batch)->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 {
                 usb_transfer_batch_t *prev =
                     list_get_instance(batch->link.prev, usb_transfer_batch_t, link);
-                qh_set_next_qh(batch_qh(prev), batch_qh(batch)->next);
-                pos = "NOT FIRST";
-        }
-        /* Remove from the driver list */
+                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(batch)->next);
+        usb_log_debug("Batch(%p) removed (%s) from %s, next %x.\n",
+            batch, qpos, instance->name, batch_qh(batch)->next);
 }
 /**