Changeset c83a55c in mainline for uspace/drv/bus/usb/vhc/connhost.c

Timestamp:

2011-10-31T06:52:54Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

c25e39b

Parents:

e8ab32f (diff), 3ce78580 (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 with mainline

File:

• uspace/drv/bus/usb/vhc/connhost.c (modified) (6 diffs)

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

@@ -104 +104 @@
 {
         VHC_DATA(vhc, fun);
-        bool found =
-            usb_device_manager_find_by_address(&vhc->dev_manager, address, handle);
-        return found ? EOK : ENOENT;
+        return usb_device_manager_get_info_by_address(
+            &vhc->dev_manager, address, handle, NULL);
 }
 
@@ -141 +140 @@
     size_t max_packet_size, unsigned int interval)
 {
-        /* TODO: Use usb_endpoint_manager_add_ep */
-        VHC_DATA(vhc, fun);
-
-        endpoint_t *ep = endpoint_get(
-            address, endpoint, direction, transfer_type, USB_SPEED_FULL, 1);
-        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);
+
 }
 
@@ -172 +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;
@@ -414 +403 @@
         VHC_DATA(vhc, fun);
 
-        endpoint_t *ep = usb_endpoint_manager_get_ep(&vhc->ep_manager,
-            target.address, target.endpoint, USB_DIRECTION_IN, NULL);
+        endpoint_t *ep = usb_endpoint_manager_find_ep(&vhc->ep_manager,
+            target.address, target.endpoint, USB_DIRECTION_IN);
         if (ep == NULL) {
                 return ENOENT;
@@ -456 +445 @@
         VHC_DATA(vhc, fun);
 
-        endpoint_t *ep = usb_endpoint_manager_get_ep(&vhc->ep_manager,
-            target.address, target.endpoint, USB_DIRECTION_OUT, NULL);
+        endpoint_t *ep = usb_endpoint_manager_find_ep(&vhc->ep_manager,
+            target.address, target.endpoint, USB_DIRECTION_OUT);
         if (ep == NULL) {
                 return ENOENT;
@@ -518 +507 @@
 
         usb_log_debug("tell_address_rh(handle=%" PRIun ")\n", handle);
-        usb_address_t addr = usb_device_manager_find(&vhc->dev_manager, handle);
+        const usb_address_t addr =
+            usb_device_manager_find_address(&vhc->dev_manager, handle);
         if (addr < 0) {
                 return addr;