Changeset 925a21e in mainline for uspace/lib/usbhost/src/usb_device_manager.c

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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/src/usb_device_manager.c (moved) (moved from uspace/lib/usbhost/src/device_keeper.c ) (8 diffs)

uspace/lib/usbhost/src/usb_device_manager.c

@@ -31 +31 @@
  */
 /** @file
- * Device keeper structure and functions (implementation).
+ * Device manager structure and functions (implementation).
  */
 #include <assert.h>
 #include <errno.h>
 #include <usb/debug.h>
-#include <usb/host/device_keeper.h>
-
-/*----------------------------------------------------------------------------*/
-/** Initialize device keeper structure.
+#include <usb/host/usb_device_manager.h>
+
+/*----------------------------------------------------------------------------*/
+/** Initialize device manager structure.
  *
  * @param[in] instance Memory place to initialize.
@@ -45 +45 @@
  * Set all values to false/0.
  */
-void usb_device_keeper_init(usb_device_keeper_t *instance)
+void usb_device_manager_init(usb_device_manager_t *instance)
 {
         assert(instance);
@@ -63 +63 @@
 /** Get a free USB address
  *
- * @param[in] instance Device keeper structure to use.
+ * @param[in] instance Device manager structure to use.
  * @param[in] speed Speed of the device requiring address.
  * @return Free address, or error code.
  */
-usb_address_t device_keeper_get_free_address(
-    usb_device_keeper_t *instance, usb_speed_t speed)
+usb_address_t usb_device_manager_get_free_address(
+    usb_device_manager_t *instance, usb_speed_t speed)
 {
         assert(instance);
@@ -97 +97 @@
 /** Bind USB address to devman handle.
  *
- * @param[in] instance Device keeper structure to use.
+ * @param[in] instance Device manager structure to use.
  * @param[in] address Device address
  * @param[in] handle Devman handle of the device.
  */
-void usb_device_keeper_bind(usb_device_keeper_t *instance,
+void usb_device_manager_bind(usb_device_manager_t *instance,
     usb_address_t address, devman_handle_t handle)
 {
@@ -117 +117 @@
 /** Release used USB address.
  *
- * @param[in] instance Device keeper structure to use.
+ * @param[in] instance Device manager structure to use.
  * @param[in] address Device address
  */
-void usb_device_keeper_release(
-    usb_device_keeper_t *instance, usb_address_t address)
+void usb_device_manager_release(
+    usb_device_manager_t *instance, usb_address_t address)
 {
         assert(instance);
@@ -136 +136 @@
 /** Find USB address associated with the device
  *
- * @param[in] instance Device keeper structure to use.
+ * @param[in] instance Device manager structure to use.
  * @param[in] handle Devman handle of the device seeking its address.
  * @return USB Address, or error code.
  */
-usb_address_t usb_device_keeper_find(
-    usb_device_keeper_t *instance, devman_handle_t handle)
+usb_address_t usb_device_manager_find(
+    usb_device_manager_t *instance, devman_handle_t handle)
 {
         assert(instance);
@@ -161 +161 @@
  * Intentionally refuse to find handle of default address.
  *
- * @param[in] instance Device keeper structure to use.
+ * @param[in] instance Device manager structure to use.
  * @param[in] address Address the caller wants to find.
  * @param[out] handle Where to store found handle.
  * @return Whether such address is currently occupied.
  */
-bool usb_device_keeper_find_by_address(usb_device_keeper_t *instance,
+bool usb_device_manager_find_by_address(usb_device_manager_t *instance,
     usb_address_t address, devman_handle_t *handle)
 {
@@ -191 +191 @@
 /** Get speed associated with the address
  *
- * @param[in] instance Device keeper structure to use.
+ * @param[in] instance Device manager structure to use.
  * @param[in] address Address of the device.
  * @return USB speed.
  */
-usb_speed_t usb_device_keeper_get_speed(
-    usb_device_keeper_t *instance, usb_address_t address)
+usb_speed_t usb_device_manager_get_speed(
+    usb_device_manager_t *instance, usb_address_t address)
 {
         assert(instance);