Index: uspace/drv/ohci/hc.c
===================================================================
--- uspace/drv/ohci/hc.c	(revision 5e2be26723e8c36a320afa8d3a1bd358b33157d7)
+++ uspace/drv/ohci/hc.c	(revision 5876d36dd0e9c757ce7fe9ac68bc8c368d9d6e68)
@@ -92,7 +92,7 @@
 	instance->ddf_instance = fun;
 	usb_device_keeper_init(&instance->manager);
-	ret = bandwidth_init(&instance->bandwidth, BANDWIDTH_AVAILABLE_USB11,
-	    bandwidth_count_usb11);
-	CHECK_RET_RETURN(ret, "Failed to initialize bandwidth allocator: %s.\n",
+	ret = usb_endpoint_manager_init(&instance->ep_manager,
+	    BANDWIDTH_AVAILABLE_USB11);
+	CHECK_RET_RETURN(ret, "Failed to initialize endpoint manager: %s.\n",
 	    ret, str_error(ret));
 
Index: uspace/drv/ohci/hc.h
===================================================================
--- uspace/drv/ohci/hc.h	(revision 5e2be26723e8c36a320afa8d3a1bd358b33157d7)
+++ uspace/drv/ohci/hc.h	(revision 5876d36dd0e9c757ce7fe9ac68bc8c368d9d6e68)
@@ -42,5 +42,5 @@
 #include <usb/usb.h>
 #include <usb/host/device_keeper.h>
-#include <usb/host/bandwidth.h>
+#include <usb/host/usb_endpoint_manager.h>
 #include <usbhc_iface.h>
 
@@ -55,5 +55,5 @@
 	ddf_fun_t *ddf_instance;
 	usb_device_keeper_t manager;
-	bandwidth_t bandwidth;
+	usb_endpoint_manager_t ep_manager;
 	fid_t interrupt_emulator;
 } hc_t;
Index: uspace/drv/ohci/iface.c
===================================================================
--- uspace/drv/ohci/iface.c	(revision 5e2be26723e8c36a320afa8d3a1bd358b33157d7)
+++ uspace/drv/ohci/iface.c	(revision 5876d36dd0e9c757ce7fe9ac68bc8c368d9d6e68)
@@ -162,6 +162,7 @@
 	    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,
+	    address, endpoint, direction, NULL, NULL, 0);
 }
 /*----------------------------------------------------------------------------*/
@@ -183,7 +184,6 @@
 	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);
 }
 /*----------------------------------------------------------------------------*/