Changeset 516d361 in mainline

Timestamp:

2017-12-20T15:55:28Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

d9f0894

Parents:

4547f11

Message:

Return address from usb_bus_get_free_address() separately from error code.

File:

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

uspace/lib/usbhost/src/usb_bus.c

@@ -102 +102 @@
  *
  * @param[in] instance Device manager structure to use.
- * @return Free address, or error code.
- */
-static usb_address_t usb_bus_get_free_address(usb_bus_t *instance)
+ * @param[out] address Free address.
+ * @return Error code.
+ */
+static int usb_bus_get_free_address(usb_bus_t *instance, usb_address_t *address)
 {
 
@@ -119 +120 @@
         instance->last_address = new_address;
 
-        return new_address;
+        *address = new_address;
+        return EOK;
 }
 
@@ -474 +476 @@
 /** Request USB address.
  * @param instance usb_device_manager
- * @param address Pointer to requested address value, place to store new address
+ * @param[inout] address Pointer to requested address value, place to store new address
  * @parma strict Fail if the requested address is not available.
  * @return Error code.
@@ -491 +493 @@
 
         usb_address_t addr = *address;
+        int rc;
 
         fibril_mutex_lock(&instance->guard);
         /* Only grant default address to strict requests */
         if ((addr == USB_ADDRESS_DEFAULT) && !strict) {
-                addr = usb_bus_get_free_address(instance);
+                rc = usb_bus_get_free_address(instance, &addr);
+                if (rc != EOK) {
+                        fibril_mutex_unlock(&instance->guard);
+                        return rc;
+                }
         }
 
@@ -503 +510 @@
                         return ENOENT;
                 }
-                addr = usb_bus_get_free_address(instance);
+                rc = usb_bus_get_free_address(instance, &addr);
+                if (rc != EOK) {
+                        fibril_mutex_unlock(&instance->guard);
+                        return rc;
+                }
         }
         if (usb_address_is_valid(addr)) {
@@ -516 +527 @@
 
         fibril_mutex_unlock(&instance->guard);
-        return addr;
+
+        *address = addr;
+        return EOK;
 }