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

Timestamp:

2011-12-18T14:02:30Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c868e2d

Parents:

3b71e84d (diff), 1761268 (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) (4 diffs)

uspace/lib/usbhost/src/iface.c

@@ -89 +89 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Request address interface function
- *
- * @param[in] fun DDF function that was called.
- * @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)
-{
-        assert(fun);
-        hcd_t *hcd = fun_to_hcd(fun);
-        assert(hcd);
-        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
- *
- * @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(&hcd->dev_manager, address, handle);
-}
-/*----------------------------------------------------------------------------*/
-/** Find device handle by address interface function.
- *
- * @param[in] fun DDF function that was called.
- * @param[in] address Address in question.
- * @param[out] handle Where to store device handle if found.
- * @return Error code.
- */
-static int find_by_address(ddf_fun_t *fun, usb_address_t address,
-    devman_handle_t *handle)
-{
-        assert(fun);
-        hcd_t *hcd = fun_to_hcd(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(&hcd->dev_manager, address);
-        return EOK;
-}
-/*----------------------------------------------------------------------------*/
 static int register_helper(endpoint_t *ep, void *arg)
 {
@@ -183 +108 @@
 }
 /*----------------------------------------------------------------------------*/
+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] 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_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);
+}
+/*----------------------------------------------------------------------------*/
+/** Find device handle by address interface function.
+ *
+ * @param[in] fun DDF function that was called.
+ * @param[in] address Address in question.
+ * @param[out] handle Where to store device handle if found.
+ * @return Error code.
+ */
+static int find_by_address(ddf_fun_t *fun, usb_address_t address,
+    devman_handle_t *handle)
+{
+        assert(fun);
+        hcd_t *hcd = fun_to_hcd(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;
+}
+/*----------------------------------------------------------------------------*/
 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)
@@ -193 +203 @@
         assert(hcd);
         const size_t size = max_packet_size;
-        /* Default address is not bound or registered,
-         * thus it does not provide speed info. */
-        usb_speed_t speed = ep_speed;
-        /* NOTE The function will return EINVAL and won't
-         * touch speed variable for default address */
-        usb_device_manager_get_info_by_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",
@@ -243 +252 @@
         .request_address = request_address,
         .bind_address = bind_address,
-        .find_by_address = find_by_address,
+        .get_handle = find_by_address,
         .release_address = release_address,