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

Timestamp:

2011-02-14T10:14:31Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

962ce100

Parents:

0d36c20 (diff), 45c01a1 (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) (2 diffs)

uspace/drv/uhci-hcd/transfer_list.c

@@ -51 +51 @@
 
         queue_head_init(instance->queue_head);
+        list_initialize(&instance->batch_list);
+        fibril_mutex_initialize(&instance->guard);
         return EOK;
 }
@@ -58 +60 @@
         assert(instance);
         assert(next);
-        instance->next = next;
         if (!instance->queue_head)
                 return;
-        queue_head_add_next(instance->queue_head, next->queue_head_pa);
+        queue_head_append_qh(instance->queue_head, next->queue_head_pa);
+        instance->queue_head->element = instance->queue_head->next_queue;
 }
 /*----------------------------------------------------------------------------*/
-void transfer_list_add_tracker(transfer_list_t *instance, tracker_t *tracker)
+void transfer_list_add_batch(transfer_list_t *instance, batch_t *batch)
 {
         assert(instance);
-        assert(tracker);
+        assert(batch);
 
-        uint32_t pa = (uintptr_t)addr_to_phys(tracker->td);
+        uint32_t pa = (uintptr_t)addr_to_phys(batch->qh);
         assert((pa & LINK_POINTER_ADDRESS_MASK) == pa);
+        pa |= LINK_POINTER_QUEUE_HEAD_FLAG;
 
+        batch->qh->next_queue = instance->queue_head->next_queue;
 
-        if (instance->queue_head->element & LINK_POINTER_TERMINATE_FLAG) {
-                usb_log_debug2("Adding td(%X:%X) to queue %s first.\n",
-                        tracker->td->status, tracker->td->device, instance->name);
+        fibril_mutex_lock(&instance->guard);
+
+        if (instance->queue_head->element == instance->queue_head->next_queue) {
                 /* there is nothing scheduled */
-                instance->last_tracker = tracker;
+                list_append(&batch->link, &instance->batch_list);
                 instance->queue_head->element = pa;
-                usb_log_debug2("Added td(%X:%X) to queue %s first.\n",
-                        tracker->td->status, tracker->td->device, instance->name);
+                usb_log_debug2("Added batch(%p) to queue %s first.\n",
+                        batch, instance->name);
+                fibril_mutex_unlock(&instance->guard);
                 return;
         }
-        usb_log_debug2("Adding td(%X:%X) to queue %s last.%p\n",
-            tracker->td->status, tracker->td->device, instance->name,
-            instance->last_tracker);
-        /* now we can be sure that last_tracker is a valid pointer */
-        instance->last_tracker->td->next = pa;
-        instance->last_tracker = tracker;
+        /* now we can be sure that there is someting scheduled */
+        assert(!list_empty(&instance->batch_list));
+        batch_t *first = list_get_instance(
+                  instance->batch_list.next, batch_t, link);
+        batch_t *last = list_get_instance(
+            instance->batch_list.prev, batch_t, link);
+        queue_head_append_qh(last->qh, pa);
+        list_append(&batch->link, &instance->batch_list);
+        usb_log_debug2("Added batch(%p) to queue %s last, first is %p.\n",
+                batch, instance->name, first );
+        fibril_mutex_unlock(&instance->guard);
+}
+/*----------------------------------------------------------------------------*/
+static void transfer_list_remove_batch(
+    transfer_list_t *instance, batch_t *batch)
+{
+        assert(instance);
+        assert(batch);
+        assert(instance->queue_head);
+        assert(batch->qh);
 
-        usb_log_debug2("Added td(%X:%X) to queue %s last.\n",
-                tracker->td->status, tracker->td->device, instance->name);
+        /* I'm the first one here */
+        if (batch->link.prev == &instance->batch_list) {
+                usb_log_debug("Removing tracer %p was first, next element %x.\n",
+                        batch, batch->qh->next_queue);
+                instance->queue_head->element = batch->qh->next_queue;
+        } else {
+                usb_log_debug("Removing tracer %p was NOT first, next element %x.\n",
+                        batch, batch->qh->next_queue);
+                batch_t *prev = list_get_instance(batch->link.prev, batch_t, link);
+                prev->qh->next_queue = batch->qh->next_queue;
+        }
+        list_remove(&batch->link);
+}
+/*----------------------------------------------------------------------------*/
+void transfer_list_check(transfer_list_t *instance)
+{
+        assert(instance);
+        fibril_mutex_lock(&instance->guard);
+        link_t *current = instance->batch_list.next;
+        while (current != &instance->batch_list) {
+                link_t *next = current->next;
+                batch_t *batch = list_get_instance(current, batch_t, link);
 
-        /* check again, may be use atomic compare and swap */
-        if (instance->queue_head->element & LINK_POINTER_TERMINATE_FLAG) {
-                instance->queue_head->element = pa;
-                usb_log_debug2("Added td(%X:%X) to queue first2 %s.\n",
-                        tracker->td->status, tracker->td->device, instance->name);
+                if (batch_is_complete(batch)) {
+                        transfer_list_remove_batch(instance, batch);
+                        batch->next_step(batch);
+                }
+                current = next;
         }
+        fibril_mutex_unlock(&instance->guard);
 }
 /**