Changeset 13b9cb5 in mainline

Timestamp:

2011-03-19T09:32:04Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4fb6d9ee

Parents:

ebf59e4

Message:

Use horizontal list instead of vertical in uhci scheduler

This breaks debug fibril algo so turn it of for now

Location:

uspace/drv/uhci-hcd

Files:

• transfer_list.c (modified) (4 diffs)
• uhci_hc.c (modified) (1 diff)

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);
-        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);
-        }
+                last_qh = last->qh;
+        }
+        const uint32_t pa = addr_to_phys(batch->qh);
+        assert((pa & LINK_POINTER_ADDRESS_MASK) == pa);
+
+        batch->qh->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;
                 batch_t *batch = list_get_instance(current, batch_t, link);
@@ -204 +202 @@
         if (batch->link.prev == &instance->batch_list) {
                 /* I'm the first one here */
-                qh_set_element_qh(instance->queue_head, batch->qh->next);
+                instance->queue_head->next = batch->qh->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);
+                prev->qh->next = batch->qh->next;
                 pos = "NOT FIRST";
         }

uspace/drv/uhci-hcd/uhci_hc.c

@@ -123 +123 @@
         }
 
-        instance->debug_checker = fibril_create(uhci_hc_debug_checker, instance);
-        fibril_add_ready(instance->debug_checker);
+        instance->debug_checker =
+            fibril_create(uhci_hc_debug_checker, instance);
+//      fibril_add_ready(instance->debug_checker);
 
         usb_log_info("Started UHCI driver.\n");