Changes in uspace/lib/usbhost/src/iface.c [6b6fc232:8b54fe6] in mainline

File:

• uspace/lib/usbhost/src/iface.c (modified) (12 diffs)

uspace/lib/usbhost/src/iface.c

@@ -49 +49 @@
         assert(hcd);
 
-        endpoint_t *ep = usb_endpoint_manager_find_ep(&hcd->ep_manager,
-            target.address, target.endpoint, direction);
+        int ret;
+
+        size_t res_bw;
+        endpoint_t *ep = usb_endpoint_manager_get_ep(&hcd->ep_manager,
+            target.address, target.endpoint, direction, &res_bw);
         if (ep == NULL) {
                 usb_log_error("Endpoint(%d:%d) not registered for %s.\n",
@@ -62 +65 @@
         const size_t bw = bandwidth_count_usb11(
             ep->speed, ep->transfer_type, size, ep->max_packet_size);
-        /* Check if we have enough bandwidth reserved */
-        if (ep->bandwidth < bw) {
+        if (res_bw < bw) {
                 usb_log_error("Endpoint(%d:%d) %s needs %zu bw "
                     "but only %zu is reserved.\n",
-                    ep->address, ep->endpoint, name, bw, ep->bandwidth);
+                    target.address, target.endpoint, name, bw, res_bw);
                 return ENOSPC;
         }
@@ -76 +78 @@
         /* No private data and no private data dtor */
         usb_transfer_batch_t *batch =
-            usb_transfer_batch_create(ep, data, size, setup_data,
+            usb_transfer_batch_get(ep, data, size, setup_data,
             in, out, arg, fun, NULL, NULL);
         if (!batch) {
@@ -82 +84 @@
         }
 
-        const int ret = hcd->schedule(hcd, batch);
+        ret = hcd->schedule(hcd, batch);
         if (ret != EOK)
-                usb_transfer_batch_destroy(batch);
+                usb_transfer_batch_dispose(batch);
 
         return ret;
-}
-/*----------------------------------------------------------------------------*/
-static int register_helper(endpoint_t *ep, void *arg)
-{
-        hcd_t *hcd = arg;
-        assert(ep);
-        assert(hcd);
-        if (hcd->ep_add_hook)
-                return hcd->ep_add_hook(hcd, ep);
-        return EOK;
-}
-/*----------------------------------------------------------------------------*/
-static void unregister_helper(endpoint_t *ep, void *arg)
-{
-        hcd_t *hcd = arg;
-        assert(ep);
-        assert(hcd);
-        if (hcd->ep_remove_hook)
-                hcd->ep_remove_hook(hcd, ep);
-}
-/*----------------------------------------------------------------------------*/
-static void unregister_helper_warn(endpoint_t *ep, void *arg)
-{
-        hcd_t *hcd = arg;
-        assert(ep);
-        assert(hcd);
-        usb_log_warning("Endpoint %d:%d %s was left behind, removing.\n",
-            ep->address, ep->endpoint, usb_str_direction(ep->direction));
-        if (hcd->ep_remove_hook)
-                hcd->ep_remove_hook(hcd, ep);
 }
 /*----------------------------------------------------------------------------*/
@@ -127 +99 @@
  */
 static int request_address(
-    ddf_fun_t *fun, usb_address_t *address, bool strict, usb_speed_t speed)
+    ddf_fun_t *fun, usb_speed_t speed, usb_address_t *address)
 {
         assert(fun);
@@ -134 +106 @@
         assert(address);
 
-        usb_log_debug("Address request: speed: %s, address: %d, strict: %s.\n",
-            usb_str_speed(speed), *address, strict ? "YES" : "NO");
-        return usb_device_manager_request_address(
-            &hcd->dev_manager, address, strict, speed);
+        usb_log_debug("Address request speed: %s.\n", usb_str_speed(speed));
+        *address =
+            usb_device_manager_get_free_address(&hcd->dev_manager, speed);
+        usb_log_debug("Address request with result: %d.\n", *address);
+        if (*address <= 0)
+                return *address;
+        return EOK;
 }
 /*----------------------------------------------------------------------------*/
@@ -155 +130 @@
 
         usb_log_debug("Address bind %d-%" PRIun ".\n", address, handle);
-        return usb_device_manager_bind_address(
-            &hcd->dev_manager, address, handle);
+        usb_device_manager_bind(&hcd->dev_manager, address, handle);
+        return EOK;
 }
 /*----------------------------------------------------------------------------*/
@@ -172 +147 @@
         hcd_t *hcd = fun_to_hcd(fun);
         assert(hcd);
-        return usb_device_manager_get_info_by_address(
-            &hcd->dev_manager, address, handle, NULL);
+        const bool found =
+            usb_device_manager_find_by_address(&hcd->dev_manager, address, handle);
+        return found ? EOK : ENOENT;
 }
 /*----------------------------------------------------------------------------*/
@@ -188 +164 @@
         assert(hcd);
         usb_log_debug("Address release %d.\n", address);
-        usb_device_manager_release_address(&hcd->dev_manager, address);
-        usb_endpoint_manager_remove_address(&hcd->ep_manager, address,
-            unregister_helper_warn, hcd);
+        usb_device_manager_release(&hcd->dev_manager, address);
         return EOK;
 }
 /*----------------------------------------------------------------------------*/
 static int register_endpoint(
-    ddf_fun_t *fun, usb_address_t address, usb_endpoint_t endpoint,
+    ddf_fun_t *fun, usb_address_t address, usb_speed_t ep_speed,
+    usb_endpoint_t endpoint,
     usb_transfer_type_t transfer_type, usb_direction_t direction,
     size_t max_packet_size, unsigned int interval)
@@ -203 +178 @@
         assert(hcd);
         const size_t size = max_packet_size;
-        usb_speed_t speed = USB_SPEED_MAX;
-        const int ret = usb_device_manager_get_info_by_address(
-            &hcd->dev_manager, address, NULL, &speed);
-        if (ret != EOK) {
-                return ret;
-        }
+        /* Default address is not bound or registered,
+         * thus it does not provide speed info. */
+        const usb_speed_t speed = (address == 0) ? ep_speed :
+            usb_device_manager_get_speed(&hcd->dev_manager, address);
 
         usb_log_debug("Register endpoint %d:%d %s-%s %s %zuB %ums.\n",
@@ -215 +188 @@
             max_packet_size, interval);
 
-        return usb_endpoint_manager_add_ep(&hcd->ep_manager, address, endpoint,
-            direction, transfer_type, speed, max_packet_size, size,
-            register_helper, hcd);
+        endpoint_t *ep = endpoint_get(
+            address, endpoint, direction, transfer_type, speed, max_packet_size);
+        if (!ep)
+                return ENOMEM;
+        int ret = EOK;
+
+        if (hcd->ep_add_hook) {
+                ret = hcd->ep_add_hook(hcd, ep);
+        }
+        if (ret != EOK) {
+                endpoint_destroy(ep);
+                return ret;
+        }
+
+        ret = usb_endpoint_manager_register_ep(&hcd->ep_manager, ep, size);
+        if (ret != EOK) {
+                endpoint_destroy(ep);
+        }
+        return ret;
 }
 /*----------------------------------------------------------------------------*/
@@ -229 +218 @@
         usb_log_debug("Unregister endpoint %d:%d %s.\n",
             address, endpoint, usb_str_direction(direction));
-        return usb_endpoint_manager_remove_ep(&hcd->ep_manager, address,
-            endpoint, direction, unregister_helper, hcd);
+        return usb_endpoint_manager_unregister_ep(&hcd->ep_manager, address,
+            endpoint, direction);
 }
 /*----------------------------------------------------------------------------*/