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

Timestamp:

2011-04-29T13:43:01Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a81a1d09

Parents:

380e0364 (diff), f19f1b7 (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:

Merge development/ changes

File:

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

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

@@ -48 +48 @@
 {
         assert(instance);
-        fibril_mutex_initialize(&instance->guard);
-        fibril_condvar_initialize(&instance->change);
-        instance->last_address = 0;
         unsigned i = 0;
         for (; i < USB_ADDRESS_COUNT; ++i) {
@@ -60 +57 @@
         // (it is needed to allow smooth registration at default address)
         instance->devices[0].occupied = true;
+        instance->last_address = 0;
+        fibril_mutex_initialize(&instance->guard);
 }
-/*----------------------------------------------------------------------------*/
-/** Attempt to obtain address 0, blocks.
- *
- * @param[in] instance Device keeper structure to use.
- * @param[in] speed Speed of the device requesting default address.
- */
-void usb_device_keeper_reserve_default_address(
-    usb_device_keeper_t *instance, usb_speed_t speed)
-{
-        assert(instance);
-        fibril_mutex_lock(&instance->guard);
-        while (instance->devices[USB_ADDRESS_DEFAULT].occupied) {
-                fibril_condvar_wait(&instance->change, &instance->guard);
-        }
-        instance->devices[USB_ADDRESS_DEFAULT].occupied = true;
-        instance->devices[USB_ADDRESS_DEFAULT].speed = speed;
-        fibril_mutex_unlock(&instance->guard);
-}
-/*----------------------------------------------------------------------------*/
-/** Attempt to obtain address 0, blocks.
- *
- * @param[in] instance Device keeper structure to use.
- * @param[in] speed Speed of the device requesting default address.
- */
-void usb_device_keeper_release_default_address(usb_device_keeper_t *instance)
-{
-        assert(instance);
-        fibril_mutex_lock(&instance->guard);
-        instance->devices[USB_ADDRESS_DEFAULT].occupied = false;
-        fibril_mutex_unlock(&instance->guard);
-        fibril_condvar_signal(&instance->change);
-}
-/*----------------------------------------------------------------------------*/
 /*----------------------------------------------------------------------------*/
 /** Get a free USB address
@@ -120 +86 @@
         assert(new_address != USB_ADDRESS_DEFAULT);
         assert(instance->devices[new_address].occupied == false);
+
         instance->devices[new_address].occupied = true;
         instance->devices[new_address].speed = speed;
         instance->last_address = new_address;
+
         fibril_mutex_unlock(&instance->guard);
         return new_address;
@@ -138 +106 @@
         assert(instance);
         fibril_mutex_lock(&instance->guard);
+
         assert(address > 0);
         assert(address <= USB11_ADDRESS_MAX);
         assert(instance->devices[address].occupied);
+
         instance->devices[address].handle = handle;
         fibril_mutex_unlock(&instance->guard);
@@ -159 +129 @@
         fibril_mutex_lock(&instance->guard);
         assert(instance->devices[address].occupied);
+
         instance->devices[address].occupied = false;
         fibril_mutex_unlock(&instance->guard);
@@ -177 +148 @@
         while (address <= USB11_ADDRESS_MAX) {
                 if (instance->devices[address].handle == handle) {
+                        assert(instance->devices[address].occupied);
                         fibril_mutex_unlock(&instance->guard);
                         return address;
@@ -198 +170 @@
         assert(address >= 0);
         assert(address <= USB11_ADDRESS_MAX);
+
         return instance->devices[address].speed;
 }