Changeset d93b3e3 in mainline

Timestamp:

2011-03-25T17:02:08Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1585c7e

Parents:

30718cc2

Message:

Add lock for control transfers (hc can't guarantee their atomicity)

Use one wait condition for multiple waits (rename)

Location:

uspace/lib/usb

Files:

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

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

@@ -51 +51 @@
         usb_speed_t speed;
         bool occupied;
+        bool control_used;
         uint16_t toggle_status[2];
         devman_handle_t handle;
@@ -61 +62 @@
         struct usb_device_info devices[USB_ADDRESS_COUNT];
         fibril_mutex_t guard;
-        fibril_condvar_t default_address_occupied;
+        fibril_condvar_t change;
         usb_address_t last_address;
 } usb_device_keeper_t;
@@ -97 +98 @@
     usb_address_t address);
 
+void usb_device_keeper_use_control(usb_device_keeper_t *instance,
+    usb_address_t address);
+
+void usb_device_keeper_release_control(usb_device_keeper_t *instance,
+    usb_address_t address);
+
 #endif
 /**

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

@@ -49 +49 @@
         assert(instance);
         fibril_mutex_initialize(&instance->guard);
-        fibril_condvar_initialize(&instance->default_address_occupied);
+        fibril_condvar_initialize(&instance->change);
         instance->last_address = 0;
         unsigned i = 0;
         for (; i < USB_ADDRESS_COUNT; ++i) {
                 instance->devices[i].occupied = false;
+                instance->devices[i].control_used = false;
                 instance->devices[i].handle = 0;
                 instance->devices[i].toggle_status[0] = 0;
@@ -71 +72 @@
         fibril_mutex_lock(&instance->guard);
         while (instance->devices[USB_ADDRESS_DEFAULT].occupied) {
-                fibril_condvar_wait(&instance->default_address_occupied,
-                    &instance->guard);
+                fibril_condvar_wait(&instance->change, &instance->guard);
         }
         instance->devices[USB_ADDRESS_DEFAULT].occupied = true;
@@ -90 +90 @@
         instance->devices[USB_ADDRESS_DEFAULT].occupied = false;
         fibril_mutex_unlock(&instance->guard);
-        fibril_condvar_signal(&instance->default_address_occupied);
+        fibril_condvar_signal(&instance->change);
 }
 /*----------------------------------------------------------------------------*/
@@ -309 +309 @@
         return instance->devices[address].speed;
 }
-
+/*----------------------------------------------------------------------------*/
+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) {
+                fibril_condvar_wait(&instance->change, &instance->guard);
+        }
+        instance->devices[address].control_used = true;
+        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;
+        fibril_mutex_unlock(&instance->guard);
+        fibril_condvar_signal(&instance->change);
+}
 /**
  * @}