Changeset 00aece0 in mainline for uspace/lib/usbhost/include/usb/host/usb_device_manager.h

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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 mainline changes.

File:

• uspace/lib/usbhost/include/usb/host/usb_device_manager.h (moved) (moved from uspace/lib/usbhost/include/usb/host/device_keeper.h ) (3 diffs)

uspace/lib/usbhost/include/usb/host/usb_device_manager.h

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 /** @addtogroup libusbhost
  * @{
  */
 /** @file
- * Device keeper structure and functions.
+ * Device manager structure and functions.
  *
  * Typical USB host controller needs to keep track of various settings for
@@ -38 +37 @@
  * This structure shall simplify the management.
  */
-#ifndef LIBUSBHOST_HOST_DEVICE_KEEPER_H
-#define LIBUSBHOST_HOST_DEVICE_KEEPER_H
+#ifndef LIBUSBHOST_HOST_USB_DEVICE_MANAGER_H
+#define LIBUSBHOST_HOST_USB_DEVICE_MANAGER_H
 
 #include <adt/list.h>
@@ -50 +49 @@
 #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 keeper.
- * You shall not access members directly but only using functions below.
+/** Host controller device manager.
+ * 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];
+        /** Maximum speed allowed. */
+        usb_speed_t max_speed;
+        /** Protect access to members. */
         fibril_mutex_t guard;
+        /** The last reserved address */
         usb_address_t last_address;
-} usb_device_keeper_t;
+} usb_device_manager_t;
 
-void usb_device_keeper_init(usb_device_keeper_t *instance);
+void usb_device_manager_init(
+    usb_device_manager_t *instance, usb_speed_t max_speed);
 
-usb_address_t device_keeper_get_free_address(usb_device_keeper_t *instance,
-    usb_speed_t speed);
+int usb_device_manager_request_address(usb_device_manager_t *instance,
+    usb_address_t *address, bool strict, usb_speed_t speed);
 
-void usb_device_keeper_bind(usb_device_keeper_t *instance,
+int usb_device_manager_bind_address(usb_device_manager_t *instance,
     usb_address_t address, devman_handle_t handle);
 
-void usb_device_keeper_release(usb_device_keeper_t *instance,
+int usb_device_manager_release_address(usb_device_manager_t *instance,
     usb_address_t address);
 
-usb_address_t usb_device_keeper_find(usb_device_keeper_t *instance,
+usb_address_t usb_device_manager_find_address(usb_device_manager_t *instance,
     devman_handle_t handle);
 
-bool usb_device_keeper_find_by_address(usb_device_keeper_t *instance,
-    usb_address_t address, devman_handle_t *handle);
-
-usb_speed_t usb_device_keeper_get_speed(usb_device_keeper_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
 /**