Changeset d773285 in mainline for uspace/lib/usb/src/host/device_keeper.c

Timestamp:

2011-04-02T15:37:22Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0053fa38

Parents:

1273b86c

Message:

Use per endpoint control transfer mutex

File:

• uspace/lib/usb/src/host/device_keeper.c (modified) (2 diffs)

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

@@ -54 +54 @@
         for (; i < USB_ADDRESS_COUNT; ++i) {
                 instance->devices[i].occupied = false;
-                instance->devices[i].control_used = false;
+                instance->devices[i].control_used = 0;
                 instance->devices[i].handle = 0;
                 instance->devices[i].toggle_status[0] = 0;
@@ -311 +311 @@
 /*----------------------------------------------------------------------------*/
 void usb_device_keeper_use_control(usb_device_keeper_t *instance,
-    usb_address_t address)
-{
-        assert(instance);
-        fibril_mutex_lock(&instance->guard);
-        while (instance->devices[address].control_used) {
+    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[address].control_used = true;
+        instance->devices[target.address].control_used |= ep;
         fibril_mutex_unlock(&instance->guard);
 }
 /*----------------------------------------------------------------------------*/
 void usb_device_keeper_release_control(usb_device_keeper_t *instance,
-    usb_address_t address)
-{
-        assert(instance);
-        fibril_mutex_lock(&instance->guard);
-        instance->devices[address].control_used = false;
+    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);