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

Timestamp:

2011-02-28T13:04:21Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0b5644c, 494eaf7, 51b46f2

Parents:

81c508c (diff), dced52a (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:

hc and rh work

Support for low speed devices
RH iospace obtained from parent hc driver
proper hc initialization
Debug messages reworked
intelpci adressspace size fix (read the warning)

File:

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

uspace/drv/uhci-hcd/transfer_list.c

@@ -70 +70 @@
         assert(instance);
         assert(batch);
+        usb_log_debug2("Adding batch(%p) to queue %s.\n", batch, instance->name);
 
         uint32_t pa = (uintptr_t)addr_to_phys(batch->qh);
@@ -83 +84 @@
                 list_append(&batch->link, &instance->batch_list);
                 instance->queue_head->element = pa;
-                usb_log_debug2("Added batch(%p) to queue %s first.\n",
+                usb_log_debug("Batch(%p) added to queue %s first.\n",
                         batch, instance->name);
                 fibril_mutex_unlock(&instance->guard);
@@ -96 +97 @@
         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",
+        usb_log_debug("Batch(%p) added to queue %s last, first is %p.\n",
                 batch, instance->name, first );
         fibril_mutex_unlock(&instance->guard);
@@ -108 +109 @@
         assert(instance->queue_head);
         assert(batch->qh);
+        usb_log_debug2("Removing batch(%p) from queue %s.\n", batch, instance->name);
 
         /* I'm the first one here */
         if (batch->link.prev == &instance->batch_list) {
-                usb_log_debug("Removing batch %p was first, next element %x.\n",
-                        batch, batch->qh->next_queue);
+                usb_log_debug("Batch(%p) removed (FIRST) from queue %s, next element %x.\n",
+                        batch, instance->name, batch->qh->next_queue);
                 instance->queue_head->element = batch->qh->next_queue;
         } else {
-                usb_log_debug("Removing batch %p was NOT first, next element %x.\n",
-                        batch, batch->qh->next_queue);
+                usb_log_debug("Batch(%p) removed (NOT FIRST) from queue, next element %x.\n",
+                        batch, instance->name, batch->qh->next_queue);
                 batch_t *prev = list_get_instance(batch->link.prev, batch_t, link);
                 prev->qh->next_queue = batch->qh->next_queue;
@@ -123 +125 @@
 }
 /*----------------------------------------------------------------------------*/
-void transfer_list_check(transfer_list_t *instance)
+void transfer_list_remove_finished(transfer_list_t *instance)
 {
         assert(instance);
+
+        LIST_INITIALIZE(done);
+
         fibril_mutex_lock(&instance->guard);
         link_t *current = instance->batch_list.next;
@@ -134 +139 @@
                 if (batch_is_complete(batch)) {
                         transfer_list_remove_batch(instance, batch);
-                        batch->next_step(batch);
+                        list_append(current, &done);
                 }
                 current = next;
         }
         fibril_mutex_unlock(&instance->guard);
+
+        while (!list_empty(&done)) {
+                link_t *item = done.next;
+                list_remove(item);
+                batch_t *batch = list_get_instance(item, batch_t, link);
+                batch->next_step(batch);
+        }
 }
 /**