Changeset 6a32665d in mainline

Timestamp:

2011-04-08T11:07:05Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

cd1cec3b

Parents:

52cc968

Message:

Add endpoint access serializing mechanism.

Location:

uspace/lib/usb

Files:

• include/usb/host/endpoint.h (modified) (3 diffs)
• src/host/endpoint.c (modified) (3 diffs)

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

@@ -39 +39 @@
 #include <bool.h>
 #include <adt/list.h>
+#include <fibril_synch.h>
+
 #include <usb/usb.h>
 
@@ -48 +50 @@
         usb_speed_t speed;
         size_t max_packet_size;
+        unsigned toggle:1;
+        fibril_mutex_t guard;
+        fibril_condvar_t avail;
         bool active;
-        unsigned toggle:1;
         link_t same_device_eps;
 } endpoint_t;
@@ -58 +62 @@
 
 void endpoint_destroy(endpoint_t *instance);
+
+void endpoint_use(endpoint_t *instance);
+
+void endpoint_release(endpoint_t *instance);
 
 int endpoint_toggle_get(endpoint_t *instance);

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;
@@ -58 +62 @@
         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_condvar_signal(&instance->avail);
+        fibril_mutex_unlock(&instance->guard);
 }
 /*----------------------------------------------------------------------------*/