Changeset 4fd3faf in mainline

Timestamp:

2011-04-08T11:58:18Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ffc63b0

Parents:

cd1cec3b

Message:

Use per endpoint communication mutex

Location:

uspace

Files:

• drv/uhci-hcd/hc.c (modified) (2 diffs)
• drv/uhci-hcd/transfer_list.c (modified) (2 diffs)
• lib/usb/include/usb/host/endpoint.h (modified) (1 diff)
• lib/usb/src/host/batch.c (modified) (2 diffs)
• lib/usb/src/host/endpoint.c (modified) (2 diffs)

uspace/drv/uhci-hcd/hc.c

@@ -332 +332 @@
             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);
-        }
         transfer_list_add_batch(list, batch);
 
@@ -373 +369 @@
                         usb_transfer_batch_t *batch =
                             list_get_instance(item, usb_transfer_batch_t, link);
-                        switch (batch->transfer_type)
-                        {
-                        case USB_TRANSFER_CONTROL:
-                                usb_device_keeper_release_control(
-                                    &instance->manager, batch->target);
-                                break;
-                        case USB_TRANSFER_INTERRUPT:
-                        case USB_TRANSFER_ISOCHRONOUS: {
-                                }
-                        default:
-                                break;
-                        }
                         usb_transfer_batch_finish(batch);
                 }

uspace/drv/uhci-hcd/transfer_list.c

@@ -132 +132 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Check list for finished batches.
- *
- * @param[in] instance List to use.
- * @return Error code
- *
- * Creates a local list of finished batches and calls next_step on each and
- * every one. This is safer because next_step may theoretically access
- * this transfer list leading to the deadlock if its done inline.
+/** Create list for finished batches.
+ *
+ * @param[in] instance List to use.
+ * @param[in] done list to fill
  */
 void transfer_list_remove_finished(transfer_list_t *instance, link_t *done)
@@ -161 +157 @@
         }
         fibril_mutex_unlock(&instance->guard);
-
 }
 /*----------------------------------------------------------------------------*/

uspace/lib/usb/include/usb/host/endpoint.h

@@ -53 +53 @@
         fibril_mutex_t guard;
         fibril_condvar_t avail;
-        bool active;
+        volatile bool active;
         link_t same_device_eps;
 } endpoint_t;

uspace/lib/usb/src/host/batch.c

@@ -79 +79 @@
         instance->error = EOK;
         instance->ep = ep;
+        endpoint_use(instance->ep);
 }
 /*----------------------------------------------------------------------------*/
@@ -89 +90 @@
 {
         assert(instance);
+        assert(instance->ep);
+        endpoint_release(instance->ep);
         instance->next_step(instance);
 }

uspace/lib/usb/src/host/endpoint.c

@@ -60 +60 @@
 {
         assert(instance);
+        assert(!instance->active);
         list_remove(&instance->same_device_eps);
         free(instance);
@@ -79 +80 @@
         fibril_mutex_lock(&instance->guard);
         instance->active = false;
+        fibril_mutex_unlock(&instance->guard);
         fibril_condvar_signal(&instance->avail);
-        fibril_mutex_unlock(&instance->guard);
 }
 /*----------------------------------------------------------------------------*/