Index: uspace/lib/usbhost/include/usb/host/usb_device_manager.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/usb_device_manager.h	(revision db2cb04d30489049d84db8ab1d20c969b36ac3a4)
+++ uspace/lib/usbhost/include/usb/host/usb_device_manager.h	(revision 42679089e62747f5e00b53db2cc50e13781157a1)
@@ -49,17 +49,16 @@
 #define USB_ADDRESS_COUNT (USB11_ADDRESS_MAX + 1)
 
-/** Information about attached USB device. */
-struct usb_device_info {
-	usb_speed_t speed;
-	bool occupied;
-	devman_handle_t handle;
-};
-
 /** Host controller device manager.
- * You shall not access members directly but only using functions below.
+ * You shall not access members directly.
  */
 typedef struct {
-	struct usb_device_info devices[USB_ADDRESS_COUNT];
+	/** Information about attached USB devices. */
+	struct {
+		usb_speed_t speed;      /**< Device speed */
+		bool occupied;          /**< The address is in use. */
+		devman_handle_t handle; /**< Devman handle of the device. */
+	} devices[USB_ADDRESS_COUNT];
 	fibril_mutex_t guard;
+	/** The last reserved address */
 	usb_address_t last_address;
 } usb_device_manager_t;
@@ -76,12 +75,9 @@
     usb_address_t address);
 
-usb_address_t usb_device_manager_find(usb_device_manager_t *instance,
+usb_address_t usb_device_manager_find_address(usb_device_manager_t *instance,
     devman_handle_t handle);
 
-bool usb_device_manager_find_by_address(usb_device_manager_t *instance,
-    usb_address_t address, devman_handle_t *handle);
-
-usb_speed_t usb_device_manager_get_speed(usb_device_manager_t *instance,
-    usb_address_t address);
+int usb_device_manager_get_info_by_address(usb_device_manager_t *instance,
+    usb_address_t address, devman_handle_t *handle, usb_speed_t *speed);
 #endif
 /**