Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 317a463 in mainline


Ignore:
Timestamp:
2011-11-25T15:11:22Z (10 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master
Children:
56bdd9a4
Parents:
fb48a0e
Message:

usb: Drop unused `handle' parameter.

Rename get_interface ⇒ get_my_interface.

Location:
uspace
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/bus/usb/usbmid/usbmid.c

    rfb48a0e r317a463  
    4545
    4646/** Callback for DDF USB interface. */
    47 static int usb_iface_get_interface_impl(ddf_fun_t *fun, devman_handle_t handle,
    48     int *iface_no)
     47static int usb_iface_get_interface_impl(ddf_fun_t *fun, int *iface_no)
    4948{
    5049        assert(fun);
     
    6463        .get_hc_handle = usb_iface_get_hc_handle_device_impl,
    6564        .get_my_address = usb_iface_get_my_address_forward_impl,
    66         .get_interface = usb_iface_get_interface_impl,
     65        .get_my_interface = usb_iface_get_interface_impl,
    6766};
    6867
  • uspace/lib/drv/generic/remote_usb.c

    rfb48a0e r317a463  
    4141
    4242static void remote_usb_get_my_address(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
    43 static void remote_usb_get_interface(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
     43static void remote_usb_get_my_interface(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
    4444static void remote_usb_get_hc_handle(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
    45 //static void remote_usb(device_t *, void *, ipc_callid_t, ipc_call_t *);
    4645
    4746/** Remote USB interface operations. */
    4847static remote_iface_func_ptr_t remote_usb_iface_ops [] = {
    4948        [IPC_M_USB_GET_MY_ADDRESS] = remote_usb_get_my_address,
    50         [IPC_M_USB_GET_INTERFACE] = remote_usb_get_interface,
     49        [IPC_M_USB_GET_MY_INTERFACE] = remote_usb_get_my_interface,
    5150        [IPC_M_USB_GET_HOST_CONTROLLER_HANDLE] = remote_usb_get_hc_handle,
    5251};
     
    8079}
    8180
    82 void remote_usb_get_interface(ddf_fun_t *fun, void *iface,
     81void remote_usb_get_my_interface(ddf_fun_t *fun, void *iface,
    8382    ipc_callid_t callid, ipc_call_t *call)
    8483{
    8584        usb_iface_t *usb_iface = (usb_iface_t *) iface;
    8685
    87         if (usb_iface->get_interface == NULL) {
     86        if (usb_iface->get_my_interface == NULL) {
    8887                async_answer_0(callid, ENOTSUP);
    8988                return;
    9089        }
    9190
    92         devman_handle_t handle = DEV_IPC_GET_ARG1(*call);
    93 
    9491        int iface_no;
    95         int rc = usb_iface->get_interface(fun, handle, &iface_no);
     92        int rc = usb_iface->get_my_interface(fun, &iface_no);
    9693        if (rc != EOK) {
    9794                async_answer_0(callid, rc);
  • uspace/lib/drv/include/usb_iface.h

    rfb48a0e r317a463  
    7474         * - EOK - operation okay, first parameter contains interface number
    7575         */
    76         IPC_M_USB_GET_INTERFACE,
     76        IPC_M_USB_GET_MY_INTERFACE,
    7777
    7878        /** Tell devman handle of device host controller.
     
    9191typedef struct {
    9292        int (*get_my_address)(ddf_fun_t *, usb_address_t *);
    93         int (*get_interface)(ddf_fun_t *, devman_handle_t, int *);
     93        int (*get_my_interface)(ddf_fun_t *, int *);
    9494        int (*get_hc_handle)(ddf_fun_t *, devman_handle_t *);
    9595} usb_iface_t;
  • uspace/lib/usbdev/src/pipes.c

    rfb48a0e r317a463  
    8585       
    8686        sysarg_t iface_no;
    87         int rc = async_req_2_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
    88             IPC_M_USB_GET_INTERFACE, device->handle, &iface_no);
     87        int rc = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
     88            IPC_M_USB_GET_MY_INTERFACE, &iface_no);
    8989       
    9090        async_exchange_end(exch);
Note: See TracChangeset for help on using the changeset viewer.