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

Timestamp:

2011-03-29T12:09:15Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

d012590

Parents:

841e6e5 (diff), 51e5608 (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:

development merge - mainline changes

File:

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

uspace/drv/uhci-hcd/transfer_list.c

@@ -58 +58 @@
         }
         instance->queue_head_pa = addr_to_phys(instance->queue_head);
+        usb_log_debug2("Transfer list %s setup with QH: %p(%p).\n",
+            name, instance->queue_head, instance->queue_head_pa);
 
         qh_init(instance->queue_head);
@@ -118 +120 @@
         qh_set_next_qh(last_qh, pa);
 
+        asm volatile ("": : :"memory");
+
         /* Add to the driver list */
         list_append(&batch->link, &instance->batch_list);
@@ -137 +141 @@
  * this transfer list leading to the deadlock if its done inline.
  */
-void transfer_list_remove_finished(transfer_list_t *instance)
-{
-        assert(instance);
-
-        LIST_INITIALIZE(done);
+void transfer_list_remove_finished(transfer_list_t *instance, link_t *done)
+{
+        assert(instance);
+        assert(done);
 
         fibril_mutex_lock(&instance->guard);
@@ -153 +156 @@
                         /* Save for post-processing */
                         transfer_list_remove_batch(instance, batch);
-                        list_append(current, &done);
+                        list_append(current, done);
                 }
                 current = next;
@@ -159 +162 @@
         fibril_mutex_unlock(&instance->guard);
 
-        while (!list_empty(&done)) {
-                link_t *item = done.next;
-                list_remove(item);
-                usb_transfer_batch_t *batch =
-                    list_get_instance(item, usb_transfer_batch_t, link);
-                batch->next_step(batch);
-        }
 }
 /*----------------------------------------------------------------------------*/
@@ -222 +218 @@
                 qpos = "NOT FIRST";
         }
+        asm volatile ("": : :"memory");
         /* Remove from the batch list */
         list_remove(&batch->link);