Changeset 317a463 in mainline

Timestamp:

2011-11-25T15:11:22Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

56bdd9a4

Parents:

fb48a0e

Message:

usb: Drop unused `handle' parameter.

Rename get_interface ⇒ get_my_interface.

Location:

uspace

Files:

• drv/bus/usb/usbmid/usbmid.c (modified) (2 diffs)
• lib/drv/generic/remote_usb.c (modified) (2 diffs)
• lib/drv/include/usb_iface.h (modified) (2 diffs)
• lib/usbdev/src/pipes.c (modified) (1 diff)

uspace/drv/bus/usb/usbmid/usbmid.c

@@ -45 +45 @@
 
 /** Callback for DDF USB interface. */
-static int usb_iface_get_interface_impl(ddf_fun_t *fun, devman_handle_t handle,
-    int *iface_no)
+static int usb_iface_get_interface_impl(ddf_fun_t *fun, int *iface_no)
 {
         assert(fun);
@@ -64 +63 @@
         .get_hc_handle = usb_iface_get_hc_handle_device_impl,
         .get_my_address = usb_iface_get_my_address_forward_impl,
-        .get_interface = usb_iface_get_interface_impl,
+        .get_my_interface = usb_iface_get_interface_impl,
 };
 

uspace/lib/drv/generic/remote_usb.c

@@ -41 +41 @@
 
 static void remote_usb_get_my_address(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
-static void remote_usb_get_interface(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
+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(device_t *, void *, ipc_callid_t, ipc_call_t *);
 
 /** Remote USB interface operations. */
 static remote_iface_func_ptr_t remote_usb_iface_ops [] = {
         [IPC_M_USB_GET_MY_ADDRESS] = remote_usb_get_my_address,
-        [IPC_M_USB_GET_INTERFACE] = remote_usb_get_interface,
+        [IPC_M_USB_GET_MY_INTERFACE] = remote_usb_get_my_interface,
         [IPC_M_USB_GET_HOST_CONTROLLER_HANDLE] = remote_usb_get_hc_handle,
 };
@@ -80 +79 @@
 }
 
-void remote_usb_get_interface(ddf_fun_t *fun, void *iface,
+void remote_usb_get_my_interface(ddf_fun_t *fun, 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) {
+        if (usb_iface->get_my_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(fun, handle, &iface_no);
+        int rc = usb_iface->get_my_interface(fun, &iface_no);
         if (rc != EOK) {
                 async_answer_0(callid, rc);

uspace/lib/drv/include/usb_iface.h

@@ -74 +74 @@
          * - EOK - operation okay, first parameter contains interface number
          */
-        IPC_M_USB_GET_INTERFACE,
+        IPC_M_USB_GET_MY_INTERFACE,
 
         /** Tell devman handle of device host controller.
@@ -91 +91 @@
 typedef struct {
         int (*get_my_address)(ddf_fun_t *, usb_address_t *);
-        int (*get_interface)(ddf_fun_t *, devman_handle_t, int *);
+        int (*get_my_interface)(ddf_fun_t *, int *);
         int (*get_hc_handle)(ddf_fun_t *, devman_handle_t *);
 } usb_iface_t;

uspace/lib/usbdev/src/pipes.c

@@ -85 +85 @@
         
         sysarg_t iface_no;
-        int rc = async_req_2_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
-            IPC_M_USB_GET_INTERFACE, device->handle, &iface_no);
+        int rc = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
+            IPC_M_USB_GET_MY_INTERFACE, &iface_no);
         
         async_exchange_end(exch);