Index: uspace/lib/drv/generic/remote_usbhc.c =================================================================== --- uspace/lib/drv/generic/remote_usbhc.c (revision f3922c24c834e6340915df177133dd6ad8afa309) +++ uspace/lib/drv/generic/remote_usbhc.c (revision b0fc92c51f81f569086cf49f631e3011959cbd53) @@ -84,13 +84,4 @@ */ typedef enum { - /** Get handle binded with given USB address. - * Parameters - * - USB address - * Answer: - * - EOK - address binded, first parameter is the devman handle - * - ENOENT - address is not in use at the moment - */ - IPC_M_USBHC_GET_HANDLE_BY_ADDRESS, - /** Register endpoint attributes at host controller. * This is used to reserve portion of USB bandwidth. @@ -131,19 +122,4 @@ } usbhc_iface_funcs_t; - - -int usbhc_get_handle(async_exch_t *exch, usb_address_t address, - devman_handle_t *handle) -{ - if (!exch) - return EBADMEM; - sysarg_t h; - const int ret = async_req_2_1(exch, DEV_IFACE_ID(USBHC_DEV_IFACE), - IPC_M_USBHC_GET_HANDLE_BY_ADDRESS, address, &h); - if (ret == EOK && handle) - *handle = (devman_handle_t)h; - return ret; -} - int usbhc_register_endpoint(async_exch_t *exch, usb_address_t address, usb_endpoint_t endpoint, usb_transfer_type_t type, @@ -265,5 +241,4 @@ -static void remote_usbhc_get_handle(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); static void remote_usbhc_register_endpoint(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); static void remote_usbhc_unregister_endpoint(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); @@ -274,6 +249,4 @@ /** Remote USB host controller interface operations. */ static remote_iface_func_ptr_t remote_usbhc_iface_ops[] = { - [IPC_M_USBHC_GET_HANDLE_BY_ADDRESS] = remote_usbhc_get_handle, - [IPC_M_USBHC_REGISTER_ENDPOINT] = remote_usbhc_register_endpoint, [IPC_M_USBHC_UNREGISTER_ENDPOINT] = remote_usbhc_unregister_endpoint, @@ -322,27 +295,4 @@ return trans; } - - -void remote_usbhc_get_handle(ddf_fun_t *fun, void *iface, - ipc_callid_t callid, ipc_call_t *call) -{ - const usbhc_iface_t *usb_iface = iface; - - if (!usb_iface->get_handle) { - async_answer_0(callid, ENOTSUP); - return; - } - - const usb_address_t address = (usb_address_t) DEV_IPC_GET_ARG1(*call); - devman_handle_t handle; - const int ret = usb_iface->get_handle(fun, address, &handle); - - if (ret == EOK) { - async_answer_1(callid, ret, handle); - } else { - async_answer_0(callid, ret); - } -} - static void callback_out(int outcome, void *arg) Index: uspace/lib/drv/include/usbhc_iface.h =================================================================== --- uspace/lib/drv/include/usbhc_iface.h (revision f3922c24c834e6340915df177133dd6ad8afa309) +++ uspace/lib/drv/include/usbhc_iface.h (revision b0fc92c51f81f569086cf49f631e3011959cbd53) @@ -44,5 +44,4 @@ #include -int usbhc_get_handle(async_exch_t *, usb_address_t, devman_handle_t *); int usbhc_register_endpoint(async_exch_t *, usb_address_t, usb_endpoint_t, usb_transfer_type_t, usb_direction_t, size_t, unsigned int); @@ -62,6 +61,4 @@ /** USB host controller communication interface. */ typedef struct { - int (*get_handle)(ddf_fun_t *, usb_address_t, devman_handle_t *); - int (*register_endpoint)(ddf_fun_t *, usb_address_t, usb_endpoint_t, usb_transfer_type_t, usb_direction_t, size_t, unsigned int); @@ -71,5 +68,4 @@ int (*read)(ddf_fun_t *, usb_target_t, uint64_t, uint8_t *, size_t, usbhc_iface_transfer_in_callback_t, void *); - int (*write)(ddf_fun_t *, usb_target_t, uint64_t, const uint8_t *, size_t, usbhc_iface_transfer_out_callback_t, void *); Index: uspace/lib/usb/include/usb/hc.h =================================================================== --- uspace/lib/usb/include/usb/hc.h (revision f3922c24c834e6340915df177133dd6ad8afa309) +++ uspace/lib/usb/include/usb/hc.h (revision b0fc92c51f81f569086cf49f631e3011959cbd53) @@ -84,7 +84,4 @@ int usb_hc_connection_close(usb_hc_connection_t *); -int usb_hc_get_handle_by_address(usb_hc_connection_t *, usb_address_t, - devman_handle_t *); - int usb_hc_read(usb_hc_connection_t *, usb_address_t, usb_endpoint_t, uint64_t, void *, size_t, size_t *); Index: uspace/lib/usb/src/hc.c =================================================================== --- uspace/lib/usb/src/hc.c (revision f3922c24c834e6340915df177133dd6ad8afa309) +++ uspace/lib/usb/src/hc.c (revision b0fc92c51f81f569086cf49f631e3011959cbd53) @@ -144,24 +144,4 @@ } - -/** Get handle of USB device with given address. - * - * @param[in] connection Opened connection to host controller. - * @param[in] address Address of device in question. - * @param[out] handle Where to write the device handle. - * @return Error code. - */ -int usb_hc_get_handle_by_address(usb_hc_connection_t *connection, - usb_address_t address, devman_handle_t *handle) -{ - async_exch_t *exch; - EXCH_INIT(connection, exch); - - const int ret = usbhc_get_handle(exch, address, handle); - - EXCH_FINI(connection, exch); - return ret; -} - int usb_hc_read(usb_hc_connection_t *connection, usb_address_t address, usb_endpoint_t endpoint, uint64_t setup, void *data, size_t size, Index: uspace/lib/usbhost/src/iface.c =================================================================== --- uspace/lib/usbhost/src/iface.c (revision f3922c24c834e6340915df177133dd6ad8afa309) +++ uspace/lib/usbhost/src/iface.c (revision b0fc92c51f81f569086cf49f631e3011959cbd53) @@ -41,21 +41,4 @@ #include #include "ddf_helpers.h" - -/** Find device handle by address interface function. - * - * @param[in] fun DDF function that was called. - * @param[in] address Address in question. - * @param[out] handle Where to store device handle if found. - * @return Error code. - */ -static int find_by_address(ddf_fun_t *fun, usb_address_t address, - devman_handle_t *handle) -{ - assert(fun); - hcd_t *hcd = dev_to_hcd(ddf_fun_get_dev(fun)); - assert(hcd); - return usb_device_manager_get_info_by_address( - &hcd->dev_manager, address, handle, NULL); -} /** Register endpoint interface function. @@ -148,6 +131,4 @@ /** usbhc Interface implementation using hcd_t from libusbhost library. */ usbhc_iface_t hcd_iface = { - .get_handle = find_by_address, - .register_endpoint = register_endpoint, .unregister_endpoint = unregister_endpoint,