Changeset 95120c3 in mainline

Timestamp:

2011-02-20T17:00:54Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

27a0012

Parents:

b68b279

Message:

Add get_interface to USB interface

The get_interface shall be used by MID interface drivers to get
interface number they ought to drive.

Location:

uspace/lib/drv

Files:

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

uspace/lib/drv/generic/remote_usb.c

@@ -40 +40 @@
 
 
+static void remote_usb_get_address(device_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_usb_get_interface(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usb_get_hc_handle(device_t *, void *, ipc_callid_t, ipc_call_t *);
-static void remote_usb_get_address(device_t *, void *, ipc_callid_t, ipc_call_t *);
 //static void remote_usb(device_t *, void *, ipc_callid_t, ipc_call_t *);
 
@@ -47 +48 @@
 static remote_iface_func_ptr_t remote_usb_iface_ops [] = {
         remote_usb_get_address,
+        remote_usb_get_interface,
         remote_usb_get_hc_handle
 };
@@ -80 +82 @@
 }
 
+void remote_usb_get_interface(device_t *device, void *iface,
+    ipc_callid_t callid, ipc_call_t *call)
+{
+        usb_iface_t *usb_iface = (usb_iface_t *) iface;
+
+        if (usb_iface->get_interface == NULL) {
+                async_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        devman_handle_t handle = DEV_IPC_GET_ARG1(*call);
+
+        int iface_no;
+        int rc = usb_iface->get_interface(device, handle, &iface_no);
+        if (rc != EOK) {
+                async_answer_0(callid, rc);
+        } else {
+                async_answer_1(callid, EOK, iface_no);
+        }
+}
 
 void remote_usb_get_hc_handle(device_t *device, void *iface,

uspace/lib/drv/include/usb_iface.h

@@ -52 +52 @@
         IPC_M_USB_GET_ADDRESS,
 
+        /** Tell interface number given device can use.
+         * Parameters
+         * - devman handle id of the device
+         * Answer:
+         * - ENOTSUP - operation not supported (can also mean any interface)
+         * - EOK - operation okay, first parameter contains interface number
+         */
+        IPC_M_USB_GET_INTERFACE,
+
         /** Tell devman handle of device host controller.
          * Parameters:
@@ -67 +76 @@
 typedef struct {
         int (*get_address)(device_t *, devman_handle_t, usb_address_t *);
+        int (*get_interface)(device_t *, devman_handle_t, int *);
         int (*get_hc_handle)(device_t *, devman_handle_t *);
 } usb_iface_t;