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

Timestamp:

2011-02-11T12:06:05Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

03197ffc, fe1776c2

Parents:

960ff451 (diff), f96aefc (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:

UHCI internals rework, add support for ew control transfer API

File:

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

uspace/drv/uhci-hcd/transfer_list.c

@@ -41 +41 @@
 {
         assert(instance);
-        instance->first = NULL;
-        instance->last = NULL;
         instance->next = NULL;
         instance->name = name;
@@ -66 +64 @@
 }
 /*----------------------------------------------------------------------------*/
-int transfer_list_append(
-  transfer_list_t *instance, transfer_descriptor_t *transfer)
+void transfer_list_add_tracker(transfer_list_t *instance, tracker_t *tracker)
 {
         assert(instance);
-        assert(transfer);
+        assert(tracker);
 
-        uint32_t pa = (uintptr_t)addr_to_phys(transfer);
+        uint32_t pa = (uintptr_t)addr_to_phys(tracker->td);
         assert((pa & LINK_POINTER_ADDRESS_MASK) == pa);
 
-        /* empty list */
-        if (instance->first == NULL) {
-                assert(instance->last == NULL);
-                instance->first = instance->last = transfer;
-        } else {
-                assert(instance->last);
-                instance->last->next_va = transfer;
 
-                assert(instance->last->next & LINK_POINTER_TERMINATE_FLAG);
-                instance->last->next = (pa & LINK_POINTER_ADDRESS_MASK);
-                instance->last = transfer;
+        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);
+                /* there is nothing scheduled */
+                instance->last_tracker = tracker;
+                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);
+                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;
 
-        assert(instance->queue_head);
+        usb_log_debug2("Added td(%X:%X) to queue %s last.\n",
+                tracker->td->status, tracker->td->device, instance->name);
+
+        /* check again, may be use atomic compare and swap */
         if (instance->queue_head->element & LINK_POINTER_TERMINATE_FLAG) {
-                instance->queue_head->element = (pa & LINK_POINTER_ADDRESS_MASK);
+                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);
         }
-        usb_log_debug("Successfully added transfer to the hc queue %s.\n",
-          instance->name);
-        return EOK;
 }
 /**