Changeset 7b6f116 in mainline for uspace/lib

Timestamp:

2011-05-08T13:47:45Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

19065c7, 3a6e423, 511cfc8, ebf6a40, f50f722

Parents:

60b3bea (diff), 5dfee52 (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:

lsusb improvements

Location:

uspace/lib

Files:

• drv/generic/remote_usbhc.c (modified) (3 diffs)
• drv/include/usb_iface.h (modified) (1 diff)
• drv/include/usbhc_iface.h (modified) (2 diffs)
• usb/include/usb/host/device_keeper.h (modified) (1 diff)
• usb/include/usb/hub.h (modified) (1 diff)
• usb/src/host/device_keeper.c (modified) (1 diff)
• usb/src/hub.c (modified) (1 diff)

uspace/lib/drv/generic/remote_usbhc.c

@@ -52 +52 @@
 static void remote_usbhc_request_address(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_bind_address(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_usbhc_find_by_address(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_release_address(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_register_endpoint(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
@@ -61 +62 @@
         remote_usbhc_request_address,
         remote_usbhc_bind_address,
+        remote_usbhc_find_by_address,
         remote_usbhc_release_address,
 
@@ -161 +163 @@
 
         async_answer_0(callid, rc);
+}
+
+void remote_usbhc_find_by_address(ddf_fun_t *fun, void *iface,
+    ipc_callid_t callid, ipc_call_t *call)
+{
+        usbhc_iface_t *usb_iface = (usbhc_iface_t *) iface;
+
+        if (!usb_iface->find_by_address) {
+                async_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        usb_address_t address = (usb_address_t) DEV_IPC_GET_ARG1(*call);
+        devman_handle_t handle;
+        int rc = usb_iface->find_by_address(fun, address, &handle);
+
+        if (rc == EOK) {
+                async_answer_1(callid, EOK, handle);
+        } else {
+                async_answer_0(callid, rc);
+        }
 }
 

uspace/lib/drv/include/usb_iface.h

@@ -49 +49 @@
          * - arbitrary error code if returned by remote implementation
          * - EOK - handle found, first parameter contains the USB address
+         *
+         * The handle must be the one used for binding USB address with
+         * it (IPC_M_USBHC_BIND_ADDRESS), otherwise the host controller
+         * (that this request would eventually reach) would not be able
+         * to find it.
+         * The problem is that this handle is actually assigned to the
+         * function inside driver of the parent device (usually hub driver).
+         * To bypass this problem, the initial caller specify handle as
+         * zero and the first parent assigns the actual value.
+         * See usb_iface_get_address_hub_child_impl() implementation
+         * that could be assigned to device ops of a child device of in a
+         * hub driver.
+         * For example, the USB multi interface device driver (MID)
+         * passes this initial zero without any modification because the
+         * handle must be resolved by its parent.
          */
         IPC_M_USB_GET_ADDRESS,

uspace/lib/drv/include/usbhc_iface.h

@@ -105 +105 @@
         IPC_M_USBHC_BIND_ADDRESS,
 
+        /** Get handle binded with given USB address.
+         * Parameters
+         * - USB address
+         * Answer:
+         * - EOK - address binded, first parameter is the devman handle
+         * - ENOENT - address is not in use at the moment
+         */
+        IPC_M_USBHC_GET_HANDLE_BY_ADDRESS,
+
         /** Release address in use.
          * Arguments:
@@ -207 +216 @@
         int (*request_address)(ddf_fun_t *, usb_speed_t, usb_address_t *);
         int (*bind_address)(ddf_fun_t *, usb_address_t, devman_handle_t);
+        int (*find_by_address)(ddf_fun_t *, usb_address_t, devman_handle_t *);
         int (*release_address)(ddf_fun_t *, usb_address_t);
 

uspace/lib/usb/include/usb/host/device_keeper.h

@@ -80 +80 @@
     devman_handle_t handle);
 
+bool usb_device_keeper_find_by_address(usb_device_keeper_t *instance,
+    usb_address_t address, devman_handle_t *handle);
+
 usb_speed_t usb_device_keeper_get_speed(usb_device_keeper_t *instance,
     usb_address_t address);

uspace/lib/usb/include/usb/hub.h

@@ -63 +63 @@
     const usb_hc_attached_device_t *);
 int usb_hc_unregister_device(usb_hc_connection_t *, usb_address_t);
+int usb_hc_get_handle_by_address(usb_hc_connection_t *, usb_address_t,
+    devman_handle_t *);
 
 #endif

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;
 }