Changeset f50f722 in mainline for uspace/lib/usb/src

Timestamp:

2011-05-08T16:04:05Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

1989cdf

Parents:

68b614e (diff), 7b6f116 (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:

merged development changes

Location:

uspace/lib/usb/src

Files:

• host/device_keeper.c (modified) (1 diff)
• hub.c (modified) (1 diff)

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

@@ -157 +157 @@
         return ENOENT;
 }
+
+/** Find devman handled assigned to USB address.
+ *
+ * @param[in] instance Device keeper 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,
+    usb_address_t address, devman_handle_t *handle)
+{
+        assert(instance);
+        fibril_mutex_lock(&instance->guard);
+        if ((address < 0) || (address >= USB_ADDRESS_COUNT)) {
+                fibril_mutex_unlock(&instance->guard);
+                return false;
+        }
+        if (!instance->devices[address].occupied) {
+                fibril_mutex_unlock(&instance->guard);
+                return false;
+        }
+
+        if (handle != NULL) {
+                *handle = instance->devices[address].handle;
+        }
+
+        fibril_mutex_unlock(&instance->guard);
+        return true;
+}
+
 /*----------------------------------------------------------------------------*/
 /** Get speed associated with the address

uspace/lib/usb/src/hub.c

@@ -117 +117 @@
             DEV_IFACE_ID(USBHC_DEV_IFACE),
             IPC_M_USBHC_RELEASE_ADDRESS, address);
+}
+
+/** Get handle of USB device with given address.
+ *
+ * @param[in] connection Opened connection to host controller.
+ * @param[in] address Address of device in question.
+ * @param[out] handle Where to write the device handle.
+ * @return Error code.
+ */
+int usb_hc_get_handle_by_address(usb_hc_connection_t *connection,
+    usb_address_t address, devman_handle_t *handle)
+{
+        CHECK_CONNECTION(connection);
+
+        sysarg_t tmp;
+        int rc = async_req_2_1(connection->hc_phone,
+            DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_GET_HANDLE_BY_ADDRESS,
+            address, &tmp);
+        if ((rc == EOK) && (handle != NULL)) {
+                *handle = tmp;
+        }
+
+        return rc;
 }