Changeset 8b54fe6 in mainline for uspace/lib/usbhost/include/usb

Timestamp:

2011-09-15T15:05:38Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

db2cb04

Parents:

f58ef61

Message:

usb: Rename device_keeper ⇒ sub-device_manager to match the rest of the library

Location:

uspace/lib/usbhost/include/usb/host

Files:

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

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

@@ -37 +37 @@
 
 #include <assert.h>
-#include <usb/host/device_keeper.h>
+#include <usb/host/usb_device_manager.h>
 #include <usb/host/usb_endpoint_manager.h>
 #include <usb/host/usb_transfer_batch.h>
@@ -45 +45 @@
 
 struct hcd {
-        usb_device_keeper_t dev_manager;
+        usb_device_manager_t dev_manager;
         usb_endpoint_manager_t ep_manager;
         void *private_data;
@@ -57 +57 @@
 {
         assert(hcd);
-        usb_device_keeper_init(&hcd->dev_manager);
+        usb_device_manager_init(&hcd->dev_manager);
         return usb_endpoint_manager_init(&hcd->ep_manager, bandwidth, bw_count);
 }

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>
@@ -57 +56 @@
 };
 
-/** Host controller device keeper.
+/** Host controller device manager.
  * You shall not access members directly but only using functions below.
  */
@@ -64 +63 @@
         fibril_mutex_t guard;
         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_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);
 
-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);
 
-void usb_device_keeper_release(usb_device_keeper_t *instance,
+void usb_device_manager_release(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(usb_device_manager_t *instance,
     devman_handle_t handle);
 
-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);
 
-usb_speed_t usb_device_keeper_get_speed(usb_device_keeper_t *instance,
+usb_speed_t usb_device_manager_get_speed(usb_device_manager_t *instance,
     usb_address_t address);
 #endif