Changeset 85c47729 in mainline for uspace/lib/usb/src

Timestamp:

2011-04-08T13:25:58Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

61727bf

Parents:

8b74997f (diff), 4b39af4 (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:

Per endpoint communication mutex

Location:

uspace/lib/usb/src/host

Files:

• batch.c (modified) (2 diffs)
• device_keeper.c (modified) (1 diff)
• endpoint.c (modified) (3 diffs)

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

@@ -79 +79 @@
         instance->error = EOK;
         instance->ep = ep;
+        endpoint_use(instance->ep);
 }
 /*----------------------------------------------------------------------------*/
@@ -86 +87 @@
  *
  */
-void usb_transfer_batch_finish(usb_transfer_batch_t *instance, int error)
+void usb_transfer_batch_finish(usb_transfer_batch_t *instance)
 {
         assert(instance);
-        instance->error = error;
+        assert(instance->ep);
+        endpoint_release(instance->ep);
         instance->next_step(instance);
 }

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

@@ -264 +264 @@
         return instance->devices[address].speed;
 }
-/*----------------------------------------------------------------------------*/
-void usb_device_keeper_use_control(
-    usb_device_keeper_t *instance, usb_target_t target)
-{
-        assert(instance);
-        const uint16_t ep = 1 << target.endpoint;
-        fibril_mutex_lock(&instance->guard);
-        while (instance->devices[target.address].control_used & ep) {
-                fibril_condvar_wait(&instance->change, &instance->guard);
-        }
-        instance->devices[target.address].control_used |= ep;
-        fibril_mutex_unlock(&instance->guard);
-}
-/*----------------------------------------------------------------------------*/
-void usb_device_keeper_release_control(
-    usb_device_keeper_t *instance, usb_target_t target)
-{
-        assert(instance);
-        const uint16_t ep = 1 << target.endpoint;
-        fibril_mutex_lock(&instance->guard);
-        assert((instance->devices[target.address].control_used & ep) != 0);
-        instance->devices[target.address].control_used &= ~ep;
-        fibril_mutex_unlock(&instance->guard);
-        fibril_condvar_signal(&instance->change);
-}
 /**
  * @}

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

@@ -34 +34 @@
  */
 
+#include <assert.h>
 #include <errno.h>
 #include <usb/host/endpoint.h>
@@ -49 +50 @@
         instance->max_packet_size = max_packet_size;
         instance->toggle = 0;
+        instance->active = false;
+        fibril_mutex_initialize(&instance->guard);
+        fibril_condvar_initialize(&instance->avail);
         link_initialize(&instance->same_device_eps);
         return EOK;
@@ -56 +60 @@
 {
         assert(instance);
+        assert(!instance->active);
         list_remove(&instance->same_device_eps);
         free(instance);
+}
+/*----------------------------------------------------------------------------*/
+void endpoint_use(endpoint_t *instance)
+{
+        assert(instance);
+        fibril_mutex_lock(&instance->guard);
+        while (instance->active)
+                fibril_condvar_wait(&instance->avail, &instance->guard);
+        instance->active = true;
+        fibril_mutex_unlock(&instance->guard);
+}
+/*----------------------------------------------------------------------------*/
+void endpoint_release(endpoint_t *instance)
+{
+        assert(instance);
+        fibril_mutex_lock(&instance->guard);
+        instance->active = false;
+        fibril_mutex_unlock(&instance->guard);
+        fibril_condvar_signal(&instance->avail);
 }
 /*----------------------------------------------------------------------------*/