Changes in uspace/lib/usbhost/src/usb_device_manager.c [bbd09694:2fd1f0c6] in mainline

File:

• uspace/lib/usbhost/src/usb_device_manager.c (modified) (5 diffs)

uspace/lib/usbhost/src/usb_device_manager.c

@@ -38 +38 @@
 #include <usb/host/usb_device_manager.h>
 
-/** Get a free USB address
- *
- * @param[in] instance Device manager structure to use.
- * @param[in] speed Speed of the device requiring address.
- * @return Free address, or error code.
- */
-static usb_address_t usb_device_manager_get_free_address(
-    usb_device_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;
-}
-/*----------------------------------------------------------------------------*/
 /** Initialize device manager structure.
  *
  * @param[in] instance Memory place to initialize.
- * @param[in] max_speed Maximum allowed USB speed of devices (inclusive).
  *
  * Set all values to false/0.
  */
-void usb_device_manager_init(
-    usb_device_manager_t *instance, usb_speed_t max_speed)
+void usb_device_manager_init(usb_device_manager_t *instance)
 {
         assert(instance);
@@ -80 +52 @@
                 instance->devices[i].speed = USB_SPEED_MAX;
         }
-        instance->last_address = 1;
-        instance->max_speed = max_speed;
+        // TODO: is this hack enough?
+        // (it is needed to allow smooth registration at default address)
+        instance->devices[0].occupied = true;
+        instance->last_address = 0;
         fibril_mutex_initialize(&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_device_manager_request_address(usb_device_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 ((*address) < 0 || (*address) >= USB_ADDRESS_COUNT)
-                return EINVAL;
-
-        fibril_mutex_lock(&instance->guard);
-        /* Only grant default address to strict requests */
-        if (( (*address) == USB_ADDRESS_DEFAULT) && !strict) {
-                *address = instance->last_address;
-        }
-
-        if (instance->devices[*address].occupied) {
-                if (strict) {
+/** Get a free USB address
+ *
+ * @param[in] instance Device manager structure to use.
+ * @param[in] speed Speed of the device requiring address.
+ * @return Free address, or error code.
+ */
+usb_address_t usb_device_manager_get_free_address(
+    usb_device_manager_t *instance, usb_speed_t speed)
+{
+        assert(instance);
+        fibril_mutex_lock(&instance->guard);
+
+        usb_address_t new_address = instance->last_address;
+        do {
+                ++new_address;
+                if (new_address > USB11_ADDRESS_MAX)
+                        new_address = 1; // NOTE it should be safe to put 0 here
+                                         // TODO Use mod
+                if (new_address == instance->last_address) {
                         fibril_mutex_unlock(&instance->guard);
-                        return ENOENT;
+                        return ENOSPC;
                 }
-                *address = usb_device_manager_get_free_address(instance);
-        }
-        assert(instance->devices[*address].occupied == false);
-        assert(instance->devices[*address].handle == 0);
-        assert(*address != USB_ADDRESS_DEFAULT || strict);
-
-        instance->devices[*address].occupied = true;
-        instance->devices[*address].speed = speed;
-
-        fibril_mutex_unlock(&instance->guard);
-        return EOK;
+        } while (instance->devices[new_address].occupied);
+
+        assert(new_address != USB_ADDRESS_DEFAULT);
+        assert(instance->devices[new_address].occupied == false);
+        assert(instance->devices[new_address].handle == 0);
+
+        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;
 }
 /*----------------------------------------------------------------------------*/
@@ -134 +102 @@
  * @return Error code.
  */
-int usb_device_manager_bind_address(usb_device_manager_t *instance,
+int usb_device_manager_bind(usb_device_manager_t *instance,
     usb_address_t address, devman_handle_t handle)
 {
@@ -164 +132 @@
  * @return Error code.
  */
-int usb_device_manager_release_address(
+int usb_device_manager_release(
     usb_device_manager_t *instance, usb_address_t address)
 {
-        if ((address < 0) || (address >= USB_ADDRESS_COUNT)) {
+        if ((address <= 0) || (address >= USB_ADDRESS_COUNT)) {
                 return EINVAL;
         }
@@ -220 +188 @@
 {
         assert(instance);
-        if ((address < 0) || (address >= USB_ADDRESS_COUNT)) {
+        if ((address <= 0) || (address >= USB_ADDRESS_COUNT)) {
                 return EINVAL;
         }