Changeset 9d15d1b in mainline

Timestamp:

2013-08-02T13:04:47Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8e4219ab

Parents:

7c10198

Message:

libdrv: add device handle query

Location:

uspace/lib/drv

Files:

• generic/remote_usb.c (modified) (5 diffs)
• include/usb_iface.h (modified) (2 diffs)

uspace/lib/drv/generic/remote_usb.c

@@ -70 +70 @@
         IPC_M_USB_GET_MY_INTERFACE,
         IPC_M_USB_GET_HOST_CONTROLLER_HANDLE,
+        IPC_M_USB_GET_DEVICE_HANDLE,
         IPC_M_USB_RESERVE_DEFAULT_ADDRESS,
         IPC_M_USB_RELEASE_DEFAULT_ADDRESS,
@@ -131 +132 @@
 }
 
+/** Tell devman handle of the usb device function.
+ * @param[in] exch IPC communication exchange
+ * @param[out] handle devman handle of the HC used by the target device.
+ * @return Error code.
+ */
+int usb_get_device_handle(async_exch_t *exch, devman_handle_t *handle)
+{
+        devman_handle_t h = 0;
+        const int ret = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
+            IPC_M_USB_GET_DEVICE_HANDLE, &h);
+        if (ret == EOK && handle)
+                *handle = (devman_handle_t)h;
+        return ret;
+}
+
 /** Reserve default USB address.
  * @param[in] exch IPC communication exchange
@@ -213 +229 @@
 static void remote_usb_get_my_interface(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usb_get_hc_handle(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_usb_get_device_handle(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 
 static void remote_usb_reserve_default_address(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
@@ -226 +243 @@
         [IPC_M_USB_GET_MY_INTERFACE] = remote_usb_get_my_interface,
         [IPC_M_USB_GET_HOST_CONTROLLER_HANDLE] = remote_usb_get_hc_handle,
+        [IPC_M_USB_GET_DEVICE_HANDLE] = remote_usb_get_device_handle,
         [IPC_M_USB_RESERVE_DEFAULT_ADDRESS] = remote_usb_reserve_default_address,
         [IPC_M_USB_RELEASE_DEFAULT_ADDRESS] = remote_usb_release_default_address,
@@ -299 +317 @@
 }
 
+void remote_usb_get_device_handle(ddf_fun_t *fun, void *iface,
+    ipc_callid_t callid, ipc_call_t *call)
+{
+        const usb_iface_t *usb_iface = (usb_iface_t *) iface;
+
+        if (usb_iface->get_device_handle == NULL) {
+                async_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        devman_handle_t handle;
+        const int ret = usb_iface->get_device_handle(fun, &handle);
+        if (ret != EOK) {
+                async_answer_0(callid, ret);
+        }
+
+        async_answer_1(callid, EOK, (sysarg_t) handle);
+}
+
 void remote_usb_reserve_default_address(ddf_fun_t *fun, void *iface,
     ipc_callid_t callid, ipc_call_t *call)

uspace/lib/drv/include/usb_iface.h

@@ -55 +55 @@
 int usb_get_my_interface(async_exch_t *, int *);
 int usb_get_hc_handle(async_exch_t *, devman_handle_t *);
+int usb_get_device_handle(async_exch_t *, devman_handle_t *);
 
 int usb_reserve_default_address(async_exch_t *, usb_speed_t);
@@ -72 +73 @@
         int (*get_hc_handle)(ddf_fun_t *, devman_handle_t *);
 
+        int (*get_device_handle)(ddf_fun_t *, devman_handle_t *);
+
         int (*reserve_default_address)(ddf_fun_t *, usb_speed_t);
         int (*release_default_address)(ddf_fun_t *);