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

Timestamp:

2011-10-31T06:52:54Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

c25e39b

Parents:

e8ab32f (diff), 3ce78580 (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 with mainline

File:

• uspace/lib/usbhost/src/usb_device_manager.c (modified) (9 diffs)

uspace/lib/usbhost/src/usb_device_manager.c

@@ -38 +38 @@
 #include <usb/host/usb_device_manager.h>
 
-/*----------------------------------------------------------------------------*/
 /** Initialize device manager structure.
  *
@@ -48 +47 @@
 {
         assert(instance);
-        unsigned i = 0;
-        for (; i < USB_ADDRESS_COUNT; ++i) {
+        for (unsigned i = 0; i < USB_ADDRESS_COUNT; ++i) {
                 instance->devices[i].occupied = false;
                 instance->devices[i].handle = 0;
@@ -77 +75 @@
                 ++new_address;
                 if (new_address > USB11_ADDRESS_MAX)
-                        new_address = 1;
+                        new_address = 1; // NOTE it should be safe to put 0 here
+                                         // TODO Use mod
                 if (new_address == instance->last_address) {
                         fibril_mutex_unlock(&instance->guard);
@@ -86 +85 @@
         assert(new_address != USB_ADDRESS_DEFAULT);
         assert(instance->devices[new_address].occupied == false);
+        assert(instance->devices[new_address].handle == 0);
 
         instance->devices[new_address].occupied = true;
@@ -100 +100 @@
  * @param[in] address Device address
  * @param[in] handle Devman handle of the device.
- */
-void usb_device_manager_bind(usb_device_manager_t *instance,
+ * @return Error code.
+ */
+int usb_device_manager_bind(usb_device_manager_t *instance,
     usb_address_t address, devman_handle_t handle)
 {
-        assert(instance);
-        fibril_mutex_lock(&instance->guard);
-
-        assert(address > 0);
-        assert(address <= USB11_ADDRESS_MAX);
-        assert(instance->devices[address].occupied);
-
+        if ((address <= 0) || (address >= USB_ADDRESS_COUNT)) {
+                return EINVAL;
+        }
+        assert(instance);
+
+        fibril_mutex_lock(&instance->guard);
+        /* Not reserved */
+        if (!instance->devices[address].occupied) {
+                fibril_mutex_unlock(&instance->guard);
+                return ENOENT;
+        }
+        /* Already bound */
+        if (instance->devices[address].handle != 0) {
+                fibril_mutex_unlock(&instance->guard);
+                return EEXISTS;
+        }
         instance->devices[address].handle = handle;
         fibril_mutex_unlock(&instance->guard);
+        return EOK;
 }
 /*----------------------------------------------------------------------------*/
@@ -119 +130 @@
  * @param[in] instance Device manager structure to use.
  * @param[in] address Device address
- */
-void usb_device_manager_release(
+ * @return Error code.
+ */
+int usb_device_manager_release(
     usb_device_manager_t *instance, usb_address_t address)
 {
-        assert(instance);
-        assert(address > 0);
-        assert(address <= USB11_ADDRESS_MAX);
-
-        fibril_mutex_lock(&instance->guard);
-        assert(instance->devices[address].occupied);
+        if ((address <= 0) || (address >= USB_ADDRESS_COUNT)) {
+                return EINVAL;
+        }
+        assert(instance);
+
+        fibril_mutex_lock(&instance->guard);
+        if (!instance->devices[address].occupied) {
+                fibril_mutex_unlock(&instance->guard);
+                return ENOENT;
+        }
 
         instance->devices[address].occupied = false;
-        fibril_mutex_unlock(&instance->guard);
+        instance->devices[address].handle = 0;
+        fibril_mutex_unlock(&instance->guard);
+        return EOK;
 }
 /*----------------------------------------------------------------------------*/
@@ -140 +158 @@
  * @return USB Address, or error code.
  */
-usb_address_t usb_device_manager_find(
+usb_address_t usb_device_manager_find_address(
     usb_device_manager_t *instance, devman_handle_t handle)
 {
         assert(instance);
         fibril_mutex_lock(&instance->guard);
-        usb_address_t address = 1;
-        while (address <= USB11_ADDRESS_MAX) {
+        for (usb_address_t address = 1; address <= USB11_ADDRESS_MAX; ++address)
+        {
                 if (instance->devices[address].handle == handle) {
                         assert(instance->devices[address].occupied);
@@ -152 +170 @@
                         return address;
                 }
-                ++address;
         }
         fibril_mutex_unlock(&instance->guard);
         return ENOENT;
 }
-
-/** Find devman handle assigned to USB address.
- * Intentionally refuse to find handle of default address.
+/*----------------------------------------------------------------------------*/
+/** Find devman handle and speed assigned to USB address.
+ * Intentionally refuse to work on default address.
  *
  * @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_manager_find_by_address(usb_device_manager_t *instance,
-    usb_address_t address, devman_handle_t *handle)
-{
-        assert(instance);
-        fibril_mutex_lock(&instance->guard);
+ * @param[out] speed Assigned speed.
+ * @return Error code.
+ */
+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)
+{
+        assert(instance);
         if ((address <= 0) || (address >= USB_ADDRESS_COUNT)) {
-                fibril_mutex_unlock(&instance->guard);
-                return false;
-        }
+                return EINVAL;
+        }
+
+        fibril_mutex_lock(&instance->guard);
         if (!instance->devices[address].occupied) {
                 fibril_mutex_unlock(&instance->guard);
-                return false;
+                return ENOENT;
         }
 
@@ -183 +201 @@
                 *handle = instance->devices[address].handle;
         }
-
-        fibril_mutex_unlock(&instance->guard);
-        return true;
-}
-
-/*----------------------------------------------------------------------------*/
-/** Get speed associated with the address
- *
- * @param[in] instance Device manager structure to use.
- * @param[in] address Address of the device.
- * @return USB speed.
- */
-usb_speed_t usb_device_manager_get_speed(
-    usb_device_manager_t *instance, usb_address_t address)
-{
-        assert(instance);
-        assert(address >= 0);
-        assert(address <= USB11_ADDRESS_MAX);
-
-        return instance->devices[address].speed;
+        if (speed != NULL) {
+                *speed = instance->devices[address].speed;
+        }
+
+        fibril_mutex_unlock(&instance->guard);
+        return EOK;
 }
 /**