Changeset 059d507 in mainline

Timestamp:

2013-07-26T13:40:58Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2838486

Parents:

b0fc92c

Message:

libusbhost: Remove devman handle information from usb_device_manager.

Location:

uspace/lib/usbhost

Files:

• include/usb/host/usb_device_manager.h (modified) (2 diffs)
• src/ddf_helpers.c (modified) (2 diffs)
• src/hcd.c (modified) (1 diff)
• src/usb_device_manager.c (modified) (5 diffs)

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

@@ -57 +57 @@
                 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. */
@@ -73 +72 @@
     usb_address_t *address, bool strict, usb_speed_t speed);
 
-int usb_device_manager_bind_address(usb_device_manager_t *instance,
-    usb_address_t address, devman_handle_t handle);
-
 int usb_device_manager_release_address(usb_device_manager_t *instance,
     usb_address_t address);
 
-usb_address_t usb_device_manager_find_address(usb_device_manager_t *instance,
-    devman_handle_t handle);
-
 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);
+    usb_address_t address, usb_speed_t *speed);
 #endif
 /**

uspace/lib/usbhost/src/ddf_helpers.c

@@ -301 +301 @@
                 return ret;
         }
-
-        ret = usb_device_manager_bind_address(&dev_to_hcd(parent)->dev_manager,
-            address, ddf_fun_get_handle(fun));
-        if (ret != EOK)
-                usb_log_warning("Failed to bind address: %s.\n",
-                    str_error(ret));
 
         list_append(&info->link, &hc_dev->devices);
@@ -408 +402 @@
         /* This checks whether the default address is reserved and gets speed */
         int ret = usb_device_manager_get_info_by_address(&hcd->dev_manager,
-                USB_ADDRESS_DEFAULT, NULL, &speed);
+                USB_ADDRESS_DEFAULT, &speed);
         if (ret != EOK) {
                 return ret;

uspace/lib/usbhost/src/hcd.c

@@ -138 +138 @@
         usb_speed_t speed = USB_SPEED_MAX;
         const int ret = usb_device_manager_get_info_by_address(
-            &hcd->dev_manager, target.address, NULL, &speed);
+            &hcd->dev_manager, target.address, &speed);
         if (ret != EOK) {
                 return ret;

uspace/lib/usbhost/src/usb_device_manager.c

@@ -75 +75 @@
         for (unsigned i = 0; i < USB_ADDRESS_COUNT; ++i) {
                 instance->devices[i].occupied = false;
-                instance->devices[i].handle = 0;
                 instance->devices[i].speed = USB_SPEED_MAX;
         }
@@ -115 +114 @@
         }
         assert(instance->devices[*address].occupied == false);
-        assert(instance->devices[*address].handle == 0);
         assert(*address != USB_ADDRESS_DEFAULT || strict);
 
@@ -121 +119 @@
         instance->devices[*address].speed = speed;
 
-        fibril_mutex_unlock(&instance->guard);
-        return EOK;
-}
-
-/** Bind USB address to devman handle.
- *
- * @param[in] instance Device manager structure to use.
- * @param[in] address Device address
- * @param[in] handle Devman handle of the device.
- * @return Error code.
- * @note Won't accept binding for default address.
- */
-int usb_device_manager_bind_address(usb_device_manager_t *instance,
-    usb_address_t address, devman_handle_t handle)
-{
-        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;
@@ -178 +144 @@
 
         instance->devices[address].occupied = false;
-        instance->devices[address].handle = 0;
         fibril_mutex_unlock(&instance->guard);
         return EOK;
 }
 
-/** Find USB address associated with the device.
- *
- * @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_manager_find_address(
-    usb_device_manager_t *instance, devman_handle_t handle)
-{
-        assert(instance);
-        fibril_mutex_lock(&instance->guard);
-        for (usb_address_t address = 1; address <= USB11_ADDRESS_MAX; ++address)
-        {
-                if (instance->devices[address].handle == handle) {
-                        assert(instance->devices[address].occupied);
-                        fibril_mutex_unlock(&instance->guard);
-                        return address;
-                }
-        }
-        fibril_mutex_unlock(&instance->guard);
-        return ENOENT;
-}
-
-/** Find devman handle and speed assigned to USB address.
+/** Get speed assigned to USB 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.
  * @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)
+    usb_address_t address, usb_speed_t *speed)
 {
         assert(instance);
@@ -228 +169 @@
         }
 
-        if (handle != NULL) {
-                *handle = instance->devices[address].handle;
-        }
         if (speed != NULL) {
                 *speed = instance->devices[address].speed;