Changeset 97ab321 in mainline for uspace/drv/ohci/iface.c

Timestamp:

2011-04-07T09:53:12Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

d41f301

Parents:

c4e0b47 (diff), 41c1f7b (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 development/ changes

File:

• uspace/drv/ohci/iface.c (modified) (2 diffs)

uspace/drv/ohci/iface.c

@@ -162 +162 @@
             address, endpoint, usb_str_transfer_type(transfer_type),
             usb_str_speed(speed), direction, size, max_packet_size, interval);
-        return bandwidth_reserve(&hc->bandwidth, address, endpoint, direction,
-            speed, transfer_type, max_packet_size, size, interval);
+        // TODO use real endpoint here!
+        return usb_endpoint_manager_register_ep(&hc->ep_manager,NULL, 0);
 }
 /*----------------------------------------------------------------------------*/
@@ -183 +183 @@
         usb_log_debug("Unregister endpoint %d:%d %d.\n",
             address, endpoint, direction);
-        return bandwidth_release(&hc->bandwidth, address, endpoint, direction);
-
-        return ENOTSUP;
+        return usb_endpoint_manager_unregister_ep(&hc->ep_manager, address,
+            endpoint, direction);
 }
 /*----------------------------------------------------------------------------*/