Changes in uspace/lib/usbhost/src/usb_bus.c [b7fd2a0:f527f58] in mainline

File:

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

uspace/lib/usbhost/src/usb_bus.c

@@ -102 +102 @@
  *
  * @param[in] instance Device manager structure to use.
- * @param[out] address Free address.
- * @return Error code.
- */
-static errno_t usb_bus_get_free_address(usb_bus_t *instance, usb_address_t *address)
+ * @return Free address, or error code.
+ */
+static usb_address_t usb_bus_get_free_address(usb_bus_t *instance)
 {
 
@@ -120 +119 @@
         instance->last_address = new_address;
 
-        *address = new_address;
-        return EOK;
+        return new_address;
 }
 
@@ -200 +198 @@
  * @return Error code.
  */
-errno_t usb_bus_init(usb_bus_t *instance,
+int usb_bus_init(usb_bus_t *instance,
     size_t available_bandwidth, bw_count_func_t bw_count, usb_speed_t max_speed)
 {
@@ -224 +222 @@
  * @return Error code.
  */
-errno_t usb_bus_register_ep(usb_bus_t *instance, endpoint_t *ep, size_t data_size)
+int usb_bus_register_ep(usb_bus_t *instance, endpoint_t *ep, size_t data_size)
 {
         assert(instance);
@@ -262 +260 @@
  * @return Error code.
  */
-errno_t usb_bus_unregister_ep(usb_bus_t *instance, endpoint_t *ep)
+int usb_bus_unregister_ep(usb_bus_t *instance, endpoint_t *ep)
 {
         assert(instance);
@@ -316 +314 @@
  * @return Error code.
  */
-errno_t usb_bus_add_ep(usb_bus_t *instance,
+int usb_bus_add_ep(usb_bus_t *instance,
     usb_address_t address, usb_endpoint_t endpoint, usb_direction_t direction,
     usb_transfer_type_t type, size_t max_packet_size, unsigned packets,
@@ -364 +362 @@
 
         if (callback) {
-                const errno_t ret = callback(ep, arg);
+                const int ret = callback(ep, arg);
                 if (ret != EOK) {
                         fibril_mutex_unlock(&instance->guard);
@@ -394 +392 @@
  * @return Error code.
  */
-errno_t usb_bus_remove_ep(usb_bus_t *instance,
+int usb_bus_remove_ep(usb_bus_t *instance,
     usb_address_t address, usb_endpoint_t endpoint, usb_direction_t direction,
     ep_remove_callback_t callback, void *arg)
@@ -417 +415 @@
 }
 
-errno_t usb_bus_reset_toggle(usb_bus_t *instance, usb_target_t target, bool all)
+int usb_bus_reset_toggle(usb_bus_t *instance, usb_target_t target, bool all)
 {
         assert(instance);
@@ -423 +421 @@
                 return EINVAL;
 
-        errno_t ret = ENOENT;
+        int ret = ENOENT;
 
         fibril_mutex_lock(&instance->guard);
@@ -446 +444 @@
  * @return Error code.
  */
-errno_t usb_bus_remove_address(usb_bus_t *instance,
+int usb_bus_remove_address(usb_bus_t *instance,
     usb_address_t address, ep_remove_callback_t callback, void *arg)
 {
@@ -455 +453 @@
         fibril_mutex_lock(&instance->guard);
 
-        const errno_t ret = instance->devices[address].occupied ? EOK : ENOENT;
+        const int ret = instance->devices[address].occupied ? EOK : ENOENT;
         instance->devices[address].occupied = false;
 
@@ -476 +474 @@
 /** Request USB address.
  * @param instance usb_device_manager
- * @param[inout] address Pointer to requested address value, place to store new address
+ * @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.
  */
-errno_t usb_bus_request_address(usb_bus_t *instance,
+int usb_bus_request_address(usb_bus_t *instance,
     usb_address_t *address, bool strict, usb_speed_t speed)
 {
@@ -493 +491 @@
 
         usb_address_t addr = *address;
-        errno_t rc;
 
         fibril_mutex_lock(&instance->guard);
         /* Only grant default address to strict requests */
         if ((addr == USB_ADDRESS_DEFAULT) && !strict) {
-                rc = usb_bus_get_free_address(instance, &addr);
-                if (rc != EOK) {
-                        fibril_mutex_unlock(&instance->guard);
-                        return rc;
-                }
+                addr = usb_bus_get_free_address(instance);
         }
 
@@ -510 +503 @@
                         return ENOENT;
                 }
-                rc = usb_bus_get_free_address(instance, &addr);
-                if (rc != EOK) {
-                        fibril_mutex_unlock(&instance->guard);
-                        return rc;
-                }
+                addr = usb_bus_get_free_address(instance);
         }
         if (usb_address_is_valid(addr)) {
@@ -527 +516 @@
 
         fibril_mutex_unlock(&instance->guard);
-
-        *address = addr;
-        return EOK;
+        return addr;
 }
 
@@ -539 +526 @@
  * @return Error code.
  */
-errno_t usb_bus_get_speed(usb_bus_t *instance, usb_address_t address,
+int usb_bus_get_speed(usb_bus_t *instance, usb_address_t address,
     usb_speed_t *speed)
 {
@@ -549 +536 @@
         fibril_mutex_lock(&instance->guard);
 
-        const errno_t ret = instance->devices[address].occupied ? EOK : ENOENT;
+        const int ret = instance->devices[address].occupied ? EOK : ENOENT;
         if (speed && instance->devices[address].occupied) {
                 *speed = instance->devices[address].speed;