Changeset 55e388a1 in mainline for uspace/lib/usb/src/host/device_keeper.c

Timestamp:

2011-03-24T14:57:53Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

b53d3b7

Parents:

361e61b (diff), e18e0d6 (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:

Check of initialization of report parser structure

File:

• uspace/lib/usb/src/host/device_keeper.c (modified) (13 diffs)

uspace/lib/usb/src/host/device_keeper.c

@@ -31 +31 @@
  */
 /** @file
- * @brief UHCI driver
+ * Device keeper structure and functions (implementation).
  */
 #include <assert.h>
@@ -45 +45 @@
  * Set all values to false/0.
  */
-void device_keeper_init(device_keeper_t *instance)
+void usb_device_keeper_init(usb_device_keeper_t *instance)
 {
         assert(instance);
@@ -65 +65 @@
  * @param[in] speed Speed of the device requesting default address.
  */
-void device_keeper_reserve_default(device_keeper_t *instance, usb_speed_t speed)
+void usb_device_keeper_reserve_default_address(usb_device_keeper_t *instance,
+    usb_speed_t speed)
 {
         assert(instance);
@@ -83 +84 @@
  * @param[in] speed Speed of the device requesting default address.
  */
-void device_keeper_release_default(device_keeper_t *instance)
+void usb_device_keeper_release_default_address(usb_device_keeper_t *instance)
 {
         assert(instance);
@@ -100 +101 @@
  * Really ugly one.
  */
-void device_keeper_reset_if_need(
-    device_keeper_t *instance, usb_target_t target, const unsigned char *data)
+void usb_device_keeper_reset_if_need(usb_device_keeper_t *instance,
+    usb_target_t target, const uint8_t *data)
 {
         assert(instance);
@@ -144 +145 @@
  * @return Error code
  */
-int device_keeper_get_toggle(
-    device_keeper_t *instance, usb_target_t target, usb_direction_t direction)
+int usb_device_keeper_get_toggle(usb_device_keeper_t *instance,
+    usb_target_t target, usb_direction_t direction)
 {
         assert(instance);
@@ -173 +174 @@
  * @return Error code.
  */
-int device_keeper_set_toggle(device_keeper_t *instance,
+int usb_device_keeper_set_toggle(usb_device_keeper_t *instance,
     usb_target_t target, usb_direction_t direction, bool toggle)
 {
@@ -207 +208 @@
  * @return Free address, or error code.
  */
-usb_address_t device_keeper_request(
-    device_keeper_t *instance, usb_speed_t speed)
-{
-        assert(instance);
-        fibril_mutex_lock(&instance->guard);
-
-        usb_address_t new_address = instance->last_address + 1;
-        while (instance->devices[new_address].occupied) {
+usb_address_t device_keeper_get_free_address(usb_device_keeper_t *instance,
+    usb_speed_t speed)
+{
+        assert(instance);
+        fibril_mutex_lock(&instance->guard);
+
+        usb_address_t new_address = instance->last_address;
+        do {
+                ++new_address;
+                if (new_address > USB11_ADDRESS_MAX)
+                        new_address = 1;
                 if (new_address == instance->last_address) {
                         fibril_mutex_unlock(&instance->guard);
                         return ENOSPC;
                 }
-                if (new_address == USB11_ADDRESS_MAX)
-                        new_address = 1;
-                ++new_address;
-        }
+        } while (instance->devices[new_address].occupied);
 
         assert(new_address != USB_ADDRESS_DEFAULT);
@@ -241 +242 @@
  * @param[in] handle Devman handle of the device.
  */
-void device_keeper_bind(
-    device_keeper_t *instance, usb_address_t address, devman_handle_t handle)
+void usb_device_keeper_bind(usb_device_keeper_t *instance,
+    usb_address_t address, devman_handle_t handle)
 {
         assert(instance);
@@ -258 +259 @@
  * @param[in] address Device address
  */
-void device_keeper_release(device_keeper_t *instance, usb_address_t address)
+void usb_device_keeper_release(usb_device_keeper_t *instance,
+    usb_address_t address)
 {
         assert(instance);
@@ -276 +278 @@
  * @return USB Address, or error code.
  */
-usb_address_t device_keeper_find(
-    device_keeper_t *instance, devman_handle_t handle)
+usb_address_t usb_device_keeper_find(usb_device_keeper_t *instance,
+    devman_handle_t handle)
 {
         assert(instance);
@@ -299 +301 @@
  * @return USB speed.
  */
-usb_speed_t device_keeper_speed(
-    device_keeper_t *instance, usb_address_t address)
+usb_speed_t usb_device_keeper_get_speed(usb_device_keeper_t *instance,
+    usb_address_t address)
 {
         assert(instance);
@@ -307 +309 @@
         return instance->devices[address].speed;
 }
+
 /**
  * @}