Changeset dc4c19e in mainline for uspace/lib/usb/src/host/endpoint.c

Timestamp:

2011-04-10T12:18:09Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

60c0573

Parents:

a49e171 (diff), 82e8861 (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 changes

File:

• uspace/lib/usb/src/host/endpoint.c (modified) (4 diffs)

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;
-        link_initialize(&instance->same_device_eps);
+        instance->active = false;
+        fibril_mutex_initialize(&instance->guard);
+        fibril_condvar_initialize(&instance->avail);
         return EOK;
 }
@@ -56 +59 @@
 {
         assert(instance);
-        list_remove(&instance->same_device_eps);
+        assert(!instance->active);
         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);
 }
 /*----------------------------------------------------------------------------*/
@@ -73 +95 @@
 }
 /*----------------------------------------------------------------------------*/
-void endpoint_toggle_reset(link_t *ep)
+void endpoint_toggle_reset_filtered(endpoint_t *instance, usb_target_t target)
 {
-        endpoint_t *instance =
-            list_get_instance(ep, endpoint_t, same_device_eps);
         assert(instance);
-        instance->toggle = 0;
-}
-/*----------------------------------------------------------------------------*/
-void endpoint_toggle_reset_filtered(link_t *ep, usb_endpoint_t epn)
-{
-        endpoint_t *instance =
-            list_get_instance(ep, endpoint_t, same_device_eps);
-        assert(instance);
-        if (instance->endpoint == epn)
+        if (instance->address == target.address &&
+            (instance->endpoint == target.endpoint || target.endpoint == 0))
                 instance->toggle = 0;
 }