Changeset 423c749 in mainline

Timestamp:

2013-07-27T07:49:45Z (11 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.

Location:

uspace/lib

Files:

• usb/include/usb/usb.h (modified) (2 diffs)
• usbhost/Makefile (modified) (1 diff)
• usbhost/include/usb/host/hcd.h (modified) (2 diffs)
• usbhost/include/usb/host/usb_device_manager.h (deleted)
• usbhost/include/usb/host/usb_endpoint_manager.h (modified) (5 diffs)
• usbhost/src/ddf_helpers.c (modified) (1 diff)
• usbhost/src/hcd.c (modified) (5 diffs)
• usbhost/src/usb_device_manager.c (deleted)
• usbhost/src/usb_endpoint_manager.c (modified) (6 diffs)

uspace/lib/usb/include/usb/usb.h

@@ -110 +110 @@
 #define USB_ADDRESS_DEFAULT 0
 /** Maximum address number in USB 1.1. */
-#define USB11_ADDRESS_MAX 128
+#define USB11_ADDRESS_MAX 127
+#define USB_ADDRESS_COUNT (USB11_ADDRESS_MAX + 1)
 
 /** Check USB address for allowed values.
@@ -119 +120 @@
 static inline bool usb_address_is_valid(usb_address_t a)
 {
-        return (a >= USB_ADDRESS_DEFAULT) && (a < USB11_ADDRESS_MAX);
+        return (a >= USB_ADDRESS_DEFAULT) && (a <= USB11_ADDRESS_MAX);
 }
 

uspace/lib/usbhost/Makefile

@@ -40 +40 @@
         src/hcd.c \
         src/iface.c \
-        src/usb_device_manager.c \
         src/usb_endpoint_manager.c \
         src/usb_transfer_batch.c

uspace/lib/usbhost/include/usb/host/hcd.h

@@ -41 +41 @@
 #include <usbhc_iface.h>
 
-#include <usb/host/usb_device_manager.h>
 #include <usb/host/usb_endpoint_manager.h>
 #include <usb/host/usb_transfer_batch.h>
@@ -53 +52 @@
 /** Generic host controller driver structure. */
 struct hcd {
-        /** Device manager storing handles and addresses. */
-        usb_device_manager_t dev_manager;
         /** Endpoint manager. */
         usb_endpoint_manager_t ep_manager;

uspace/lib/usbhost/include/usb/host/usb_endpoint_manager.h

@@ -50 +50 @@
 /** 90% of total bandwidth is available for periodic transfers */
 #define BANDWIDTH_AVAILABLE_USB11 ((BANDWIDTH_TOTAL_USB11 / 10) * 9)
-/** 16 addresses per list */
-#define ENDPOINT_LIST_COUNT 8
 
 typedef size_t (*bw_count_func_t)(usb_speed_t, usb_transfer_type_t, size_t, size_t);
@@ -59 +57 @@
 /** Endpoint management structure */
 typedef struct usb_endpoint_manager {
-        /** Store endpoint_t instances */
-        list_t endpoint_lists[ENDPOINT_LIST_COUNT];
+        struct {
+                usb_speed_t speed;      /**< Device speed */
+                bool occupied;          /**< The address is in use. */
+                list_t endpoint_list;   /**< Store endpoint_t instances */
+        } devices[USB_ADDRESS_COUNT];
         /** Prevents races accessing lists */
         fibril_mutex_t guard;
@@ -67 +68 @@
         /** Use this function to count bw required by EP */
         bw_count_func_t bw_count;
+        /** Maximum speed allowed. */
+        usb_speed_t max_speed;
+        /** The last reserved address */
+        usb_address_t last_address;
 } usb_endpoint_manager_t;
 
@@ -74 +79 @@
 
 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);
 
 int usb_endpoint_manager_register_ep(
@@ -98 +103 @@
 void usb_endpoint_manager_remove_address(usb_endpoint_manager_t *instance,
     usb_address_t address, ep_remove_callback_t callback, void *arg);
+
+int usb_endpoint_manager_request_address(usb_endpoint_manager_t *instance,
+    usb_address_t *address, bool strict, usb_speed_t speed);
+
+int usb_endpoint_manager_release_address(usb_endpoint_manager_t *instance,
+    usb_address_t address);
+
+int usb_endpoint_manager_get_info_by_address(usb_endpoint_manager_t *instance,
+    usb_address_t address, usb_speed_t *speed);
 #endif
 /**

uspace/lib/usbhost/src/ddf_helpers.c

@@ -401 +401 @@
 
         /* This checks whether the default address is reserved and gets speed */
-        int ret = usb_device_manager_get_info_by_address(&hcd->dev_manager,
+        int ret = usb_endpoint_manager_get_info_by_address(&hcd->ep_manager,
                 USB_ADDRESS_DEFAULT, &speed);
         if (ret != EOK) {

uspace/lib/usbhost/src/hcd.c

@@ -95 +95 @@
 {
         assert(hcd);
-        usb_device_manager_init(&hcd->dev_manager, max_speed);
-        usb_endpoint_manager_init(&hcd->ep_manager, bandwidth, bw_count);
+        usb_endpoint_manager_init(&hcd->ep_manager, bandwidth, bw_count, max_speed);
 
         hcd->private_data = NULL;
@@ -108 +107 @@
         assert(hcd);
         usb_address_t address = 0;
-        const int ret = usb_device_manager_request_address(
-            &hcd->dev_manager, &address, false, speed);
+        const int ret = usb_endpoint_manager_request_address(
+            &hcd->ep_manager, &address, false, speed);
         if (ret != EOK)
                 return ret;
@@ -120 +119 @@
         usb_endpoint_manager_remove_address(&hcd->ep_manager, address,
             unregister_helper_warn, hcd);
-        usb_device_manager_release_address(&hcd->dev_manager, address);
+        usb_endpoint_manager_release_address(&hcd->ep_manager, address);
         return EOK;
 }
@@ -128 +127 @@
         assert(hcd);
         usb_address_t address = 0;
-        return usb_device_manager_request_address(
-            &hcd->dev_manager, &address, true, speed);
+        return usb_endpoint_manager_request_address(
+            &hcd->ep_manager, &address, true, speed);
 }
 
@@ -137 +136 @@
         assert(hcd);
         usb_speed_t speed = USB_SPEED_MAX;
-        const int ret = usb_device_manager_get_info_by_address(
-            &hcd->dev_manager, target.address, &speed);
+        const int ret = usb_endpoint_manager_get_info_by_address(
+            &hcd->ep_manager, target.address, &speed);
         if (ret != EOK) {
                 return ret;

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;
+}
 /**
  * @}