Changeset 1585c7e in mainline

Timestamp:

2011-03-25T17:03:49Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

da88eb82

Parents:

d93b3e3

Message:

Use control transfer lock for control transfers.

Use global done list for all transfer lists.

Location:

uspace/drv/uhci-hcd

Files:

• hc.c (modified) (2 diffs)
• transfer_list.c (modified) (3 diffs)
• transfer_list.h (modified) (1 diff)

uspace/drv/uhci-hcd/hc.c

@@ -336 +336 @@
             instance->transfers[batch->speed][batch->transfer_type];
         assert(list);
+        if (batch->transfer_type == USB_TRANSFER_CONTROL) {
+                usb_device_keeper_use_control(
+                    &instance->manager, batch->target.address);
+        }
         transfer_list_add_batch(list, batch);
 
@@ -357 +361 @@
         /* Lower 2 bits are transaction error and transaction complete */
         if (status & 0x3) {
-                transfer_list_remove_finished(&instance->transfers_interrupt);
-                transfer_list_remove_finished(&instance->transfers_control_slow);
-                transfer_list_remove_finished(&instance->transfers_control_full);
-                transfer_list_remove_finished(&instance->transfers_bulk_full);
+                LIST_INITIALIZE(done);
+                transfer_list_remove_finished(
+                    &instance->transfers_interrupt, &done);
+                transfer_list_remove_finished(
+                    &instance->transfers_control_slow, &done);
+                transfer_list_remove_finished(
+                    &instance->transfers_control_full, &done);
+                transfer_list_remove_finished(
+                    &instance->transfers_bulk_full, &done);
+
+                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);
+                        if (batch->transfer_type == USB_TRANSFER_CONTROL) {
+                                usb_device_keeper_release_control(
+                                    &instance->manager, batch->target.address);
+                        }
+                        batch->next_step(batch);
+                }
         }
         /* bits 4 and 5 indicate hc error */

uspace/drv/uhci-hcd/transfer_list.c

@@ -142 +142 @@
  * 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);
@@ -158 +157 @@
                         /* Save for post-processing */
                         transfer_list_remove_batch(instance, batch);
-                        list_append(current, &done);
+                        list_append(current, done);
                 }
                 current = next;
@@ -164 +163 @@
         fibril_mutex_unlock(&instance->guard);
 
-        async_usleep(1000);
-        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);
-        }
 }
 /*----------------------------------------------------------------------------*/

uspace/drv/uhci-hcd/transfer_list.h

@@ -67 +67 @@
 void transfer_list_add_batch(transfer_list_t *instance, usb_transfer_batch_t *batch);
 
-void transfer_list_remove_finished(transfer_list_t *instance);
+void transfer_list_remove_finished(transfer_list_t *instance, link_t *done);
 
 void transfer_list_abort_all(transfer_list_t *instance);