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

Changeset 3121b5f in mainline


Ignore:
Timestamp:
2013-08-07T09:51:53Z (7 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
master
Children:
e588d12
Parents:
5514cf7
Message:

rename get_device_handle ⇒ get_my_device_handle

Location:
uspace
Files:
5 edited

Legend:

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

    r5514cf7 r3121b5f  
    7373/** DDF interface of the child - USB functions. */
    7474static usb_iface_t child_usb_iface = {
    75         .get_device_handle = usb_iface_device_handle,
     75        .get_my_device_handle = usb_iface_device_handle,
    7676        .get_my_interface = usb_iface_iface_no,
    7777};
  • uspace/lib/drv/generic/remote_usb.c

    r5514cf7 r3121b5f  
    6565typedef enum {
    6666        IPC_M_USB_GET_MY_INTERFACE,
    67         IPC_M_USB_GET_DEVICE_HANDLE,
     67        IPC_M_USB_GET_MY_DEVICE_HANDLE,
    6868        IPC_M_USB_RESERVE_DEFAULT_ADDRESS,
    6969        IPC_M_USB_RELEASE_DEFAULT_ADDRESS,
     
    9999 * @return Error code.
    100100 */
    101 int usb_get_device_handle(async_exch_t *exch, devman_handle_t *handle)
     101int usb_get_my_device_handle(async_exch_t *exch, devman_handle_t *handle)
    102102{
    103103        devman_handle_t h = 0;
    104104        const int ret = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
    105             IPC_M_USB_GET_DEVICE_HANDLE, &h);
     105            IPC_M_USB_GET_MY_DEVICE_HANDLE, &h);
    106106        if (ret == EOK && handle)
    107107                *handle = (devman_handle_t)h;
     
    273273
    274274static void remote_usb_get_my_interface(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
    275 static void remote_usb_get_device_handle(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
     275static void remote_usb_get_my_device_handle(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
    276276static void remote_usb_reserve_default_address(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
    277277static void remote_usb_release_default_address(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
     
    286286static remote_iface_func_ptr_t remote_usb_iface_ops [] = {
    287287        [IPC_M_USB_GET_MY_INTERFACE] = remote_usb_get_my_interface,
    288         [IPC_M_USB_GET_DEVICE_HANDLE] = remote_usb_get_device_handle,
     288        [IPC_M_USB_GET_MY_DEVICE_HANDLE] = remote_usb_get_my_device_handle,
    289289        [IPC_M_USB_RESERVE_DEFAULT_ADDRESS] = remote_usb_reserve_default_address,
    290290        [IPC_M_USB_RELEASE_DEFAULT_ADDRESS] = remote_usb_release_default_address,
     
    323323}
    324324
    325 void remote_usb_get_device_handle(ddf_fun_t *fun, void *iface,
     325void remote_usb_get_my_device_handle(ddf_fun_t *fun, void *iface,
    326326    ipc_callid_t callid, ipc_call_t *call)
    327327{
    328328        const usb_iface_t *usb_iface = (usb_iface_t *) iface;
    329329
    330         if (usb_iface->get_device_handle == NULL) {
     330        if (usb_iface->get_my_device_handle == NULL) {
    331331                async_answer_0(callid, ENOTSUP);
    332332                return;
     
    334334
    335335        devman_handle_t handle;
    336         const int ret = usb_iface->get_device_handle(fun, &handle);
     336        const int ret = usb_iface->get_my_device_handle(fun, &handle);
    337337        if (ret != EOK) {
    338338                async_answer_0(callid, ret);
  • uspace/lib/drv/include/usb_iface.h

    r5514cf7 r3121b5f  
    5353
    5454int usb_get_my_interface(async_exch_t *, int *);
    55 int usb_get_device_handle(async_exch_t *, devman_handle_t *);
     55int usb_get_my_device_handle(async_exch_t *, devman_handle_t *);
    5656
    5757int usb_reserve_default_address(async_exch_t *, usb_speed_t);
     
    7676typedef struct {
    7777        int (*get_my_interface)(ddf_fun_t *, int *);
    78         int (*get_device_handle)(ddf_fun_t *, devman_handle_t *);
     78        int (*get_my_device_handle)(ddf_fun_t *, devman_handle_t *);
    7979
    8080        int (*reserve_default_address)(ddf_fun_t *, usb_speed_t);
  • uspace/lib/usbdev/src/devdrv.c

    r5514cf7 r3121b5f  
    443443        if (!exch)
    444444                return EPARTY;
    445         int ret = usb_get_device_handle(exch, handle);
     445        int ret = usb_get_my_device_handle(exch, handle);
    446446        if (ret == EOK) {
    447447                ret = usb_get_my_interface(exch, iface_no);
  • uspace/lib/usbhost/src/ddf_helpers.c

    r5514cf7 r3121b5f  
    182182}
    183183
    184 /** Gets handle of the respective hc (this device, hc function).
    185  *
    186  * @param[in] root_hub_fun Root hub function seeking hc handle.
     184/** Gets handle of the respective device.
     185 *
     186 * @param[in] fun Device function.
    187187 * @param[out] handle Place to write the handle.
    188188 * @return Error code.
    189189 */
    190 static int get_device_handle(ddf_fun_t *fun, devman_handle_t *handle)
     190static int get_my_device_handle(ddf_fun_t *fun, devman_handle_t *handle)
    191191{
    192192        assert(fun);
     
    250250/** Root hub USB interface */
    251251static usb_iface_t usb_iface = {
    252         .get_device_handle = get_device_handle,
     252        .get_my_device_handle = get_my_device_handle,
    253253
    254254        .reserve_default_address = reserve_default_address,
Note: See TracChangeset for help on using the changeset viewer.