Changeset 6b6fc232 in mainline

Timestamp:

2011-11-04T16:06:25Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

bbd09694

Parents:

46f2808

Message:

libusbhost,iface: Remove all registered endpoints on address release.

Warn if there are any endpoints that would be let behind.

File:

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

uspace/lib/usbhost/src/iface.c

@@ -89 +89 @@
 }
 /*----------------------------------------------------------------------------*/
+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);
+}
+/*----------------------------------------------------------------------------*/
 /** Request address interface function
  *
@@ -159 +189 @@
         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_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);
 }
 /*----------------------------------------------------------------------------*/