Changeset db96017 in mainline for uspace/lib/usbhost/src/iface.c

Timestamp:

2012-04-07T17:41:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b6913b7

Parents:

b69e4c0 (diff), 6bb169b5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

uspace/lib/usbhost/src/iface.c

@@ -39 +39 @@
 #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,
@@ -49 +59 @@
         assert(hcd);
 
-        int ret;
-
-        size_t res_bw;
-        endpoint_t *ep = usb_endpoint_manager_get_ep(&hcd->ep_manager,
-            target.address, target.endpoint, direction, &res_bw);
+        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",
@@ -65 +72 @@
         const size_t bw = bandwidth_count_usb11(
             ep->speed, ep->transfer_type, size, ep->max_packet_size);
-        if (res_bw < bw) {
+        /* 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",
-                    target.address, target.endpoint, name, bw, res_bw);
+                    ep->address, ep->endpoint, name, bw, ep->bandwidth);
                 return ENOSPC;
         }
@@ -78 +86 @@
         /* No private data and no private data dtor */
         usb_transfer_batch_t *batch =
-            usb_transfer_batch_get(ep, data, size, setup_data,
+            usb_transfer_batch_create(ep, data, size, setup_data,
             in, out, arg, fun, NULL, NULL);
         if (!batch) {
@@ -84 +92 @@
         }
 
-        ret = hcd->schedule(hcd, batch);
+        const int ret = hcd->schedule(hcd, batch);
         if (ret != EOK)
-                usb_transfer_batch_dispose(batch);
+                usb_transfer_batch_destroy(batch);
 
         return ret;
 }
 /*----------------------------------------------------------------------------*/
-/** Request address interface function
+/** 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.
- * @param[out] address Place to write a new address.
  * @return Error code.
  */
 static int request_address(
-    ddf_fun_t *fun, usb_speed_t speed, usb_address_t *address)
+    ddf_fun_t *fun, usb_address_t *address, bool strict, usb_speed_t speed)
 {
         assert(fun);
@@ -106 +159 @@
         assert(address);
 
-        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;
-}
-/*----------------------------------------------------------------------------*/
-/** Bind address interface function
+        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.
@@ -123 +173 @@
  */
 static int bind_address(
-  ddf_fun_t *fun, usb_address_t address, devman_handle_t handle)
+    ddf_fun_t *fun, usb_address_t address, devman_handle_t handle)
 {
         assert(fun);
@@ -130 +180 @@
 
         usb_log_debug("Address bind %d-%" PRIun ".\n", address, handle);
-        usb_device_manager_bind(&hcd->dev_manager, address, handle);
-        return EOK;
+        return usb_device_manager_bind_address(
+            &hcd->dev_manager, address, handle);
 }
 /*----------------------------------------------------------------------------*/
@@ -147 +197 @@
         hcd_t *hcd = fun_to_hcd(fun);
         assert(hcd);
-        const bool found =
-            usb_device_manager_find_by_address(&hcd->dev_manager, address, handle);
-        return found ? EOK : ENOENT;
-}
-/*----------------------------------------------------------------------------*/
-/** Release address interface function
+        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.
@@ -164 +213 @@
         assert(hcd);
         usb_log_debug("Address release %d.\n", address);
-        usb_device_manager_release(&hcd->dev_manager, 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;
 }
 /*----------------------------------------------------------------------------*/
+/** Register endpoint interface function.
+ * @param fun DDF function.
+ * @param address USB address of the device.
+ * @param endpoint USB endpoint number to be registered.
+ * @param transfer_type Endpoint's transfer type.
+ * @param direction USB communication direction the endpoint is capable of.
+ * @param max_packet_size Maximu size of packets the endpoint accepts.
+ * @param interval Preferred timeout between communication.
+ * @return Error code.
+ */
 static int register_endpoint(
-    ddf_fun_t *fun, usb_address_t address, usb_speed_t ep_speed,
-    usb_endpoint_t endpoint,
+    ddf_fun_t *fun, usb_address_t address, usb_endpoint_t endpoint,
     usb_transfer_type_t transfer_type, usb_direction_t direction,
-    size_t max_packet_size, unsigned int interval)
+    size_t max_packet_size, unsigned interval)
 {
         assert(fun);
@@ -178 +238 @@
         assert(hcd);
         const size_t size = max_packet_size;
-        /* 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_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;
+        }
 
         usb_log_debug("Register endpoint %d:%d %s-%s %s %zuB %ums.\n",
@@ -188 +250 @@
             max_packet_size, interval);
 
-        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;
-}
-/*----------------------------------------------------------------------------*/
+        return usb_endpoint_manager_add_ep(&hcd->ep_manager, address, endpoint,
+            direction, transfer_type, speed, max_packet_size, size,
+            register_helper, hcd);
+}
+/*----------------------------------------------------------------------------*/
+/** Unregister endpoint interface function.
+ * @param fun DDF function.
+ * @param address USB address of the endpoint.
+ * @param endpoint USB endpoint number.
+ * @param direction Communication direction of the enpdoint to unregister.
+ * @return Error code.
+ */
 static int unregister_endpoint(
     ddf_fun_t *fun, usb_address_t address,
@@ -218 +271 @@
         usb_log_debug("Unregister endpoint %d:%d %s.\n",
             address, endpoint, usb_str_direction(direction));
-        return usb_endpoint_manager_unregister_ep(&hcd->ep_manager, address,
-            endpoint, direction);
-}
-/*----------------------------------------------------------------------------*/
+        return usb_endpoint_manager_remove_ep(&hcd->ep_manager, address,
+            endpoint, direction, unregister_helper, hcd);
+}
+/*----------------------------------------------------------------------------*/
+/** Inbound communication interface function.
+ * @param fun DDF function.
+ * @param target Communication target.
+ * @param setup_data Data to use in setup stage (control transfers).
+ * @param data Pointer to data buffer.
+ * @param size Size of the data buffer.
+ * @param callback Function to call on communication end.
+ * @param arg Argument passed to the callback function.
+ * @return Error code.
+ */
 static int usb_read(ddf_fun_t *fun, usb_target_t target, uint64_t setup_data,
     uint8_t *data, size_t size, usbhc_iface_transfer_in_callback_t callback,
@@ -230 +293 @@
 }
 /*----------------------------------------------------------------------------*/
+/** Outbound communication interface function.
+ * @param fun DDF function.
+ * @param target Communication target.
+ * @param setup_data Data to use in setup stage (control transfers).
+ * @param data Pointer to data buffer.
+ * @param size Size of the data buffer.
+ * @param callback Function to call on communication end.
+ * @param arg Argument passed to the callback function.
+ * @return Error code.
+ */
 static int usb_write(ddf_fun_t *fun, usb_target_t target, uint64_t setup_data,
     const uint8_t *data, size_t size,
@@ -238 +311 @@
 }
 /*----------------------------------------------------------------------------*/
+/** usbhc Interface implementation using hcd_t from libusbhost library. */
 usbhc_iface_t hcd_iface = {
         .request_address = request_address,
         .bind_address = bind_address,
-        .find_by_address = find_by_address,
+        .get_handle = find_by_address,
         .release_address = release_address,