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

Timestamp:

2011-10-28T21:52:15Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

57e06ef

Parents:

7265558

Message:

libusbhost: Make interfaces more symmetric.

Make usb_endpoint_manager interface easier to use and understand.
Move ep removal hook pointer from endpoint_t to hcd_t.

File:

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

uspace/lib/usbhost/src/iface.c

@@ -49 +49 @@
         assert(hcd);
 
-        endpoint_t *ep = usb_endpoint_manager_get_ep(&hcd->ep_manager,
+        endpoint_t *ep = usb_endpoint_manager_find_ep(&hcd->ep_manager,
             target.address, target.endpoint, direction);
         if (ep == NULL) {
@@ -165 +165 @@
 }
 /*----------------------------------------------------------------------------*/
+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 int register_endpoint(
     ddf_fun_t *fun, usb_address_t address, usb_speed_t ep_speed,
@@ -188 +207 @@
             max_packet_size, interval);
 
-        endpoint_t *ep =
-            endpoint_create(address, endpoint, direction, transfer_type,
-                speed, max_packet_size, 0);
-        if (!ep)
-                return ENOMEM;
-
-        if (hcd->ep_add_hook) {
-                const int ret = hcd->ep_add_hook(hcd, ep);
-                if (ret != EOK) {
-                        endpoint_destroy(ep);
-                        return ret;
-                }
-        }
-
-        const int 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);
 }
 /*----------------------------------------------------------------------------*/
@@ -219 +221 @@
         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);
 }
 /*----------------------------------------------------------------------------*/