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

Timestamp:

2011-02-26T01:25:28Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

eb292a0

Parents:

c3ae877

Message:

Fixes

Fixed: infinite loop in device_keeper
Fixed: assertion fail in device_keeper
Fixed: Callback on batches after releasing transfer_list mutex
Fixed: debug output in pci.c

File:

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

uspace/drv/uhci-hcd/transfer_list.c

@@ -70 +70 @@
         assert(instance);
         assert(batch);
+        usb_log_debug("Adding batch(%p) to queue %s.\n", batch, instance->name);
 
         uint32_t pa = (uintptr_t)addr_to_phys(batch->qh);
@@ -123 +124 @@
 }
 /*----------------------------------------------------------------------------*/
-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 +138 @@
                 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);
+        }
 }
 /**