Changes in uspace/lib/usbhost/src/iface.c [77ad86c:ef40434] in mainline

File:

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

uspace/lib/usbhost/src/iface.c

@@ -40 +40 @@
 #include <usb/host/endpoint.h>
 #include <usb/host/hcd.h>
-
-/** Prepare generic usb_transfer_batch and schedule it.
- * @param fun DDF fun
- * @param target address and endpoint number.
- * @param setup_data Data to use in setup stage (Control communication type)
- * @param in Callback for device to host communication.
- * @param out Callback for host to device communication.
- * @param arg Callback parameter.
- * @param name Communication identifier (for nicer output).
- * @return Error code.
- */
-static inline int send_batch(
-    ddf_fun_t *fun, usb_target_t target, usb_direction_t direction,
-    void *data, size_t size, uint64_t setup_data,
-    usbhc_iface_transfer_in_callback_t in,
-    usbhc_iface_transfer_out_callback_t out, void *arg, const char* name)
-{
-        assert(fun);
-        hcd_t *hcd = fun_to_hcd(fun);
-        assert(hcd);
-
-        endpoint_t *ep = usb_endpoint_manager_find_ep(&hcd->ep_manager,
-            target.address, target.endpoint, direction);
-        if (ep == NULL) {
-                usb_log_error("Endpoint(%d:%d) not registered for %s.\n",
-                    target.address, target.endpoint, name);
-                return ENOENT;
-        }
-
-        usb_log_debug2("%s %d:%d %zu(%zu).\n",
-            name, target.address, target.endpoint, size, ep->max_packet_size);
-
-        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) {
-                usb_log_error("Endpoint(%d:%d) %s needs %zu bw "
-                    "but only %zu is reserved.\n",
-                    ep->address, ep->endpoint, name, bw, ep->bandwidth);
-                return ENOSPC;
-        }
-        if (!hcd->schedule) {
-                usb_log_error("HCD does not implement scheduler.\n");
-                return ENOTSUP;
-        }
-
-        /* No private data and no private data dtor */
-        usb_transfer_batch_t *batch =
-            usb_transfer_batch_create(ep, data, size, setup_data,
-            in, out, arg, fun, NULL, NULL);
-        if (!batch) {
-                return ENOMEM;
-        }
-
-        const int ret = hcd->schedule(hcd, batch);
-        if (ret != EOK)
-                usb_transfer_batch_destroy(batch);
-
-        return ret;
-}
-
-/** Calls ep_add_hook upon endpoint registration.
- * @param ep Endpoint to be registered.
- * @param arg hcd_t in disguise.
- * @return Error code.
- */
-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;
-}
-
-/** Calls ep_remove_hook upon endpoint removal.
- * @param ep Endpoint to be unregistered.
- * @param arg hcd_t in disguise.
- */
-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);
-}
-
-/** Calls ep_remove_hook upon endpoint removal. Prints warning.
- * @param ep Endpoint to be unregistered.
- * @param arg hcd_t in disguise.
- */
-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);
-}
-
-/** Request address interface function.
- *
- * @param[in] fun DDF function that was called.
- * @param[in] address Pointer to preferred USB address.
- * @param[out] address Place to write a new address.
- * @param[in] strict Fail if the preferred address is not available.
- * @param[in] speed Speed to associate with the new default address.
- * @return Error code.
- */
-static int request_address(
-    ddf_fun_t *fun, usb_address_t *address, bool strict, usb_speed_t speed)
-{
-        assert(fun);
-        hcd_t *hcd = fun_to_hcd(fun);
-        assert(hcd);
-        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);
-}
-
-/** Bind address interface function.
- *
- * @param[in] fun DDF function that was called.
- * @param[in] address Address of the device
- * @param[in] handle Devman handle of the device driver.
- * @return Error code.
- */
-static int bind_address(
-    ddf_fun_t *fun, usb_address_t address, devman_handle_t handle)
-{
-        assert(fun);
-        hcd_t *hcd = fun_to_hcd(fun);
-        assert(hcd);
-
-        usb_log_debug("Address bind %d-%" PRIun ".\n", address, handle);
-        return usb_device_manager_bind_address(
-            &hcd->dev_manager, address, handle);
-}
+#include "ddf_helpers.h"
 
 /** Find device handle by address interface function.
@@ -197 +53 @@
 {
         assert(fun);
-        hcd_t *hcd = fun_to_hcd(fun);
+        hcd_t *hcd = dev_to_hcd(ddf_fun_get_dev(fun));
         assert(hcd);
         return usb_device_manager_get_info_by_address(
             &hcd->dev_manager, address, handle, NULL);
-}
-
-/** Release address interface function.
- *
- * @param[in] fun DDF function that was called.
- * @param[in] address USB address to be released.
- * @return Error code.
- */
-static int release_address(ddf_fun_t *fun, usb_address_t address)
-{
-        assert(fun);
-        hcd_t *hcd = fun_to_hcd(fun);
-        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);
-        return EOK;
 }
 
@@ -237 +75 @@
 {
         assert(fun);
-        hcd_t *hcd = fun_to_hcd(fun);
+        hcd_t *hcd = dev_to_hcd(ddf_fun_get_dev(fun));
         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;
-        }
+        const usb_target_t target = {{.address = address, .endpoint = endpoint}};
 
-        usb_log_debug("Register endpoint %d:%d %s-%s %s %zuB %ums.\n",
+        usb_log_debug("Register endpoint %d:%d %s-%s %zuB %ums.\n",
             address, endpoint, usb_str_transfer_type(transfer_type),
-            usb_str_direction(direction), usb_str_speed(speed),
-            max_packet_size, interval);
+            usb_str_direction(direction), 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);
+        return hcd_add_ep(hcd, target, direction, transfer_type,
+            max_packet_size, size);
 }
 
@@ -269 +100 @@
 {
         assert(fun);
-        hcd_t *hcd = fun_to_hcd(fun);
+        hcd_t *hcd = dev_to_hcd(ddf_fun_get_dev(fun));
         assert(hcd);
+        const usb_target_t target = {{.address = address, .endpoint = endpoint}};
         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 hcd_remove_ep(hcd, target, direction);
 }
 
@@ -291 +122 @@
     void *arg)
 {
-        return send_batch(fun, target, USB_DIRECTION_IN, data, size,
-            setup_data, callback, NULL, arg, "READ");
+        return hcd_send_batch(dev_to_hcd(ddf_fun_get_dev(fun)), target,
+            USB_DIRECTION_IN, data, size, setup_data, callback, NULL, arg,
+            "READ");
 }
 
@@ -309 +141 @@
     usbhc_iface_transfer_out_callback_t callback, void *arg)
 {
-        return send_batch(fun, target, USB_DIRECTION_OUT, (uint8_t*)data, size,
-            setup_data, NULL, callback, arg, "WRITE");
+        return hcd_send_batch(dev_to_hcd(ddf_fun_get_dev(fun)),
+            target, USB_DIRECTION_OUT, (uint8_t*)data, size, setup_data, NULL,
+            callback, arg, "WRITE");
 }
 
 /** usbhc Interface implementation using hcd_t from libusbhost library. */
 usbhc_iface_t hcd_iface = {
-        .request_address = request_address,
-        .bind_address = bind_address,
         .get_handle = find_by_address,
-        .release_address = release_address,
 
         .register_endpoint = register_endpoint,