Changeset 423c749 in mainline for uspace/lib/usbhost/src/usb_endpoint_manager.c

Timestamp:

2013-07-27T07:49:45Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

3aac088

Parents:

2838486

Message:

libusbhost: Remove usb_device_manager.

Functions merged to usb_endpoint_manager.

File:

• uspace/lib/usbhost/src/usb_endpoint_manager.c (modified) (6 diffs)

uspace/lib/usbhost/src/usb_endpoint_manager.c

@@ -36 +36 @@
 #include <assert.h>
 #include <errno.h>
+#include <macros.h>
 
 #include <usb/debug.h>
@@ -71 +72 @@
         assert(instance);
         assert(addr >= 0);
-        return &instance->endpoint_lists[addr % ENDPOINT_LIST_COUNT];
+        return &instance->devices[addr % ARRAY_SIZE(instance->devices)].endpoint_list;
 }
 
@@ -96 +97 @@
         }
         return NULL;
+}
+
+/** Get a free USB address
+ *
+ * @param[in] instance Device manager structure to use.
+ * @return Free address, or error code.
+ */
+static usb_address_t usb_endpoint_manager_get_free_address(
+    usb_endpoint_manager_t *instance)
+{
+
+        usb_address_t new_address = instance->last_address;
+        do {
+                new_address = (new_address + 1) % USB_ADDRESS_COUNT;
+                if (new_address == USB_ADDRESS_DEFAULT)
+                        new_address = 1;
+                if (new_address == instance->last_address)
+                        return ENOSPC;
+        } while (instance->devices[new_address].occupied);
+
+        assert(new_address != USB_ADDRESS_DEFAULT);
+        instance->last_address = new_address;
+
+        return new_address;
 }
 
@@ -156 +181 @@
  */
 int usb_endpoint_manager_init(usb_endpoint_manager_t *instance,
-    size_t available_bandwidth, bw_count_func_t bw_count)
+    size_t available_bandwidth, bw_count_func_t bw_count, usb_speed_t max_speed)
 {
         assert(instance);
@@ -162 +187 @@
         instance->free_bw = available_bandwidth;
         instance->bw_count = bw_count;
-        for (unsigned i = 0; i < ENDPOINT_LIST_COUNT; ++i) {
-                list_initialize(&instance->endpoint_lists[i]);
+        instance->last_address = 1;
+        instance->max_speed = max_speed;
+        for (unsigned i = 0; i < ARRAY_SIZE(instance->devices); ++i) {
+                list_initialize(&instance->devices[i].endpoint_list);
+                instance->devices[i].speed = USB_SPEED_MAX;
+                instance->devices[i].occupied = false;
         }
         return EOK;
@@ -386 +415 @@
         fibril_mutex_unlock(&instance->guard);
 }
+
+/** Request USB address.
+ * @param instance usb_device_manager
+ * @param address Pointer to requested address value, place to store new address
+ * @parma strict Fail if the requested address is not available.
+ * @return Error code.
+ * @note Default address is only available in strict mode.
+ */
+int usb_endpoint_manager_request_address(usb_endpoint_manager_t *instance,
+    usb_address_t *address, bool strict, usb_speed_t speed)
+{
+        assert(instance);
+        assert(address);
+        if (speed > instance->max_speed)
+                return ENOTSUP;
+
+        if (!usb_address_is_valid(*address))
+                return EINVAL;
+
+        usb_address_t addr = *address;
+
+        fibril_mutex_lock(&instance->guard);
+        /* Only grant default address to strict requests */
+        if ((addr == USB_ADDRESS_DEFAULT) && !strict) {
+                addr = usb_endpoint_manager_get_free_address(instance);
+        }
+
+        if (instance->devices[addr].occupied) {
+                if (strict) {
+                        fibril_mutex_unlock(&instance->guard);
+                        return ENOENT;
+                }
+                addr = usb_endpoint_manager_get_free_address(instance);
+        }
+        if (usb_address_is_valid(addr)) {
+                assert(instance->devices[addr].occupied == false);
+                assert(addr != USB_ADDRESS_DEFAULT || strict);
+
+                instance->devices[addr].occupied = true;
+                instance->devices[addr].speed = speed;
+                *address = addr;
+                addr = 0;
+        }
+
+        fibril_mutex_unlock(&instance->guard);
+        return addr;
+}
+
+/** Release used USB address.
+ *
+ * @param[in] instance Device manager structure to use.
+ * @param[in] address Device address
+ * @return Error code.
+ */
+int usb_endpoint_manager_release_address(
+    usb_endpoint_manager_t *instance, usb_address_t address)
+{
+        assert(instance);
+        if (!usb_address_is_valid(address))
+                return EINVAL;
+
+        fibril_mutex_lock(&instance->guard);
+
+        const int rc = instance->devices[address].occupied ? EOK : ENOENT;
+        instance->devices[address].occupied = false;
+
+        fibril_mutex_unlock(&instance->guard);
+        return rc;
+}
+
+/** Get speed assigned to USB address.
+ *
+ * @param[in] instance Device manager structure to use.
+ * @param[in] address Address the caller wants to find.
+ * @param[out] speed Assigned speed.
+ * @return Error code.
+ */
+int usb_endpoint_manager_get_info_by_address(usb_endpoint_manager_t *instance,
+    usb_address_t address, usb_speed_t *speed)
+{
+        assert(instance);
+        if (!usb_address_is_valid(address)) {
+                return EINVAL;
+        }
+
+        fibril_mutex_lock(&instance->guard);
+
+        const int rc = instance->devices[address].occupied ? EOK : ENOENT;
+        if (speed && instance->devices[address].occupied) {
+                *speed = instance->devices[address].speed;
+        }
+
+        fibril_mutex_unlock(&instance->guard);
+        return rc;
+}
 /**
  * @}