Index: uspace/lib/usbhost/include/usb/host/usb2_bus.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/usb2_bus.h	(revision b3573772a2359da2498360d630ee4e92272fd61c)
+++ uspace/lib/usbhost/include/usb/host/usb2_bus.h	(revision d369b3b064d5f65c029ccc881a911bb4836375a0)
@@ -47,8 +47,6 @@
 typedef struct endpoint endpoint_t;
 
-/** Endpoint management structure */
-typedef struct usb2_bus {
-	bus_t base;			/**< Inheritance - keep this first */
-
+/** Endpoint and bandwidth management structure */
+typedef struct usb2_bus_helper {
 	/** Map of occupied addresses */
 	bool address_occupied [USB_ADDRESS_COUNT];
@@ -61,9 +59,11 @@
 	/* Configured bandwidth accounting */
 	const bandwidth_accounting_t *bw_accounting;
-} usb2_bus_t;
+} usb2_bus_helper_t;
 
-extern const bus_ops_t usb2_bus_ops;
+extern void usb2_bus_helper_init(usb2_bus_helper_t *, const bandwidth_accounting_t *);
 
-extern void usb2_bus_init(usb2_bus_t *, const bandwidth_accounting_t *);
+extern int usb2_bus_device_enumerate(usb2_bus_helper_t *, device_t *);
+extern int usb2_bus_endpoint_register(usb2_bus_helper_t *, endpoint_t *);
+extern void usb2_bus_endpoint_unregister(usb2_bus_helper_t *, endpoint_t *);
 
 #endif