Changeset 48ae3ef in mainline for uspace/drv/bus/usb/vhc

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/drv/bus/usb/vhc/connhost.c (modified) (4 diffs)

uspace/drv/bus/usb/vhc/connhost.c

@@ -140 +140 @@
     size_t max_packet_size, unsigned int interval)
 {
-        /* TODO: Use usb_endpoint_manager_add_ep */
-        VHC_DATA(vhc, fun);
-
-        endpoint_t *ep = endpoint_create(
-            address, endpoint, direction, transfer_type, USB_SPEED_FULL, 1, 0);
-        if (ep == NULL) {
-                return ENOMEM;
-        }
-
-        int rc = usb_endpoint_manager_register_ep(&vhc->ep_manager, ep, 1);
-        if (rc != EOK) {
-                endpoint_destroy(ep);
-                return rc;
-        }
-
-        return EOK;
+        VHC_DATA(vhc, fun);
+
+        return usb_endpoint_manager_add_ep(&vhc->ep_manager,
+            address, endpoint, direction, transfer_type, USB_SPEED_FULL, 1, 0,
+            NULL, NULL);
+
 }
 
@@ -171 +161 @@
         VHC_DATA(vhc, fun);
 
-        int rc = usb_endpoint_manager_unregister_ep(&vhc->ep_manager,
-            address, endpoint, direction);
+        int rc = usb_endpoint_manager_remove_ep(&vhc->ep_manager,
+            address, endpoint, direction, NULL, NULL);
 
         return rc;
@@ -413 +403 @@
         VHC_DATA(vhc, fun);
 
-        endpoint_t *ep = usb_endpoint_manager_get_ep(&vhc->ep_manager,
+        endpoint_t *ep = usb_endpoint_manager_find_ep(&vhc->ep_manager,
             target.address, target.endpoint, USB_DIRECTION_IN);
         if (ep == NULL) {
@@ -455 +445 @@
         VHC_DATA(vhc, fun);
 
-        endpoint_t *ep = usb_endpoint_manager_get_ep(&vhc->ep_manager,
+        endpoint_t *ep = usb_endpoint_manager_find_ep(&vhc->ep_manager,
             target.address, target.endpoint, USB_DIRECTION_OUT);
         if (ep == NULL) {