Changeset eb2f7dd in mainline

Timestamp:

2011-05-08T13:37:51Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

df25ab6

Parents:

84de606d

Message:

Add getting handle by address over USBHC iface

Location:

uspace/lib

Files:

• drv/generic/remote_usbhc.c (modified) (3 diffs)
• drv/include/usbhc_iface.h (modified) (2 diffs)
• usb/include/usb/hub.h (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/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/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/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;
 }