Index: uspace/lib/drv/generic/remote_usbhc.c =================================================================== --- uspace/lib/drv/generic/remote_usbhc.c (revision ef4e8ebd75646b8bbaae1cb095cb149bfdd9d744) +++ uspace/lib/drv/generic/remote_usbhc.c (revision ef4043421c5f5a6e3e61bddcbe9ae96bc6bc7fb5) @@ -84,25 +84,4 @@ */ typedef enum { - /** Asks for address assignment by host controller. - * Answer: - * - ELIMIT - host controller run out of address - * - EOK - address assigned - * Answer arguments: - * - assigned address - * - * The address must be released by via IPC_M_USBHC_RELEASE_ADDRESS. - */ - IPC_M_USBHC_REQUEST_ADDRESS, - - /** Bind USB address with devman handle. - * Parameters: - * - USB address - * - devman handle - * Answer: - * - EOK - address binded - * - ENOENT - address is not in use - */ - IPC_M_USBHC_BIND_ADDRESS, - /** Get handle binded with given USB address. * Parameters @@ -113,13 +92,4 @@ */ IPC_M_USBHC_GET_HANDLE_BY_ADDRESS, - - /** Release address in use. - * Arguments: - * - address to be released - * Answer: - * - ENOENT - address not in use - * - EPERM - trying to release default USB address - */ - IPC_M_USBHC_RELEASE_ADDRESS, /** Register endpoint attributes at host controller. @@ -161,25 +131,5 @@ } usbhc_iface_funcs_t; -int usbhc_request_address(async_exch_t *exch, usb_address_t *address, - bool strict, usb_speed_t speed) -{ - if (!exch || !address) - return EBADMEM; - sysarg_t new_address; - const int ret = async_req_4_1(exch, DEV_IFACE_ID(USBHC_DEV_IFACE), - IPC_M_USBHC_REQUEST_ADDRESS, *address, strict, speed, &new_address); - if (ret == EOK) - *address = (usb_address_t)new_address; - return ret; -} - -int usbhc_bind_address(async_exch_t *exch, usb_address_t address, - devman_handle_t handle) -{ - if (!exch) - return EBADMEM; - return async_req_3_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE), - IPC_M_USBHC_BIND_ADDRESS, address, handle); -} + int usbhc_get_handle(async_exch_t *exch, usb_address_t address, @@ -196,12 +146,4 @@ } -int usbhc_release_address(async_exch_t *exch, usb_address_t address) -{ - if (!exch) - return EBADMEM; - return async_req_2_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE), - IPC_M_USBHC_RELEASE_ADDRESS, address); -} - int usbhc_register_endpoint(async_exch_t *exch, usb_address_t address, usb_endpoint_t endpoint, usb_transfer_type_t type, @@ -323,8 +265,5 @@ -static void remote_usbhc_request_address(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); -static void remote_usbhc_bind_address(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); static void remote_usbhc_get_handle(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); -static void remote_usbhc_release_address(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 *); @@ -335,7 +274,4 @@ /** Remote USB host controller interface operations. */ static remote_iface_func_ptr_t remote_usbhc_iface_ops[] = { - [IPC_M_USBHC_REQUEST_ADDRESS] = remote_usbhc_request_address, - [IPC_M_USBHC_RELEASE_ADDRESS] = remote_usbhc_release_address, - [IPC_M_USBHC_BIND_ADDRESS] = remote_usbhc_bind_address, [IPC_M_USBHC_GET_HANDLE_BY_ADDRESS] = remote_usbhc_get_handle, @@ -387,42 +323,4 @@ } -void remote_usbhc_request_address(ddf_fun_t *fun, void *iface, - ipc_callid_t callid, ipc_call_t *call) -{ - const usbhc_iface_t *usb_iface = iface; - - if (!usb_iface->request_address) { - async_answer_0(callid, ENOTSUP); - return; - } - - usb_address_t address = DEV_IPC_GET_ARG1(*call); - const bool strict = DEV_IPC_GET_ARG2(*call); - const usb_speed_t speed = DEV_IPC_GET_ARG3(*call); - - const int rc = usb_iface->request_address(fun, &address, strict, speed); - if (rc != EOK) { - async_answer_0(callid, rc); - } else { - async_answer_1(callid, EOK, (sysarg_t) address); - } -} - -void remote_usbhc_bind_address(ddf_fun_t *fun, void *iface, - ipc_callid_t callid, ipc_call_t *call) -{ - const usbhc_iface_t *usb_iface = iface; - - if (!usb_iface->bind_address) { - async_answer_0(callid, ENOTSUP); - return; - } - - const usb_address_t address = (usb_address_t) DEV_IPC_GET_ARG1(*call); - const devman_handle_t handle = (devman_handle_t) DEV_IPC_GET_ARG2(*call); - - const int ret = usb_iface->bind_address(fun, address, handle); - async_answer_0(callid, ret); -} void remote_usbhc_get_handle(ddf_fun_t *fun, void *iface, @@ -447,19 +345,4 @@ } -void remote_usbhc_release_address(ddf_fun_t *fun, void *iface, - ipc_callid_t callid, ipc_call_t *call) -{ - const usbhc_iface_t *usb_iface = iface; - - if (!usb_iface->release_address) { - async_answer_0(callid, ENOTSUP); - return; - } - - const usb_address_t address = (usb_address_t) DEV_IPC_GET_ARG1(*call); - - const int ret = usb_iface->release_address(fun, address); - 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 ef4e8ebd75646b8bbaae1cb095cb149bfdd9d744) +++ uspace/lib/drv/include/usbhc_iface.h (revision ef4043421c5f5a6e3e61bddcbe9ae96bc6bc7fb5) @@ -44,8 +44,5 @@ #include -int usbhc_request_address(async_exch_t *, usb_address_t *, bool, usb_speed_t); -int usbhc_bind_address(async_exch_t *, usb_address_t, devman_handle_t); int usbhc_get_handle(async_exch_t *, usb_address_t, devman_handle_t *); -int usbhc_release_address(async_exch_t *, usb_address_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); @@ -65,12 +62,7 @@ /** USB host controller communication interface. */ typedef struct { - int (*request_address)(ddf_fun_t *, usb_address_t *, bool, usb_speed_t); - int (*bind_address)(ddf_fun_t *, usb_address_t, devman_handle_t); - int (*get_handle)(ddf_fun_t *, usb_address_t, - devman_handle_t *); - int (*release_address)(ddf_fun_t *, usb_address_t); + int (*get_handle)(ddf_fun_t *, usb_address_t, devman_handle_t *); - int (*register_endpoint)(ddf_fun_t *, - usb_address_t, usb_endpoint_t, + int (*register_endpoint)(ddf_fun_t *, usb_address_t, usb_endpoint_t, usb_transfer_type_t, usb_direction_t, size_t, unsigned int); int (*unregister_endpoint)(ddf_fun_t *, usb_address_t, usb_endpoint_t, Index: uspace/lib/usbhost/src/iface.c =================================================================== --- uspace/lib/usbhost/src/iface.c (revision ef4e8ebd75646b8bbaae1cb095cb149bfdd9d744) +++ uspace/lib/usbhost/src/iface.c (revision ef4043421c5f5a6e3e61bddcbe9ae96bc6bc7fb5) @@ -42,45 +42,4 @@ #include "ddf_helpers.h" -/** Request address interface function. - * - * @param[in] fun DDF function that was called. - * @param[in] address Pointer to preferred USB address. - * @param[out] address Place to write a new address. - * @param[in] strict Fail if the preferred address is not available. - * @param[in] speed Speed to associate with the new default address. - * @return Error code. - */ -static int request_address( - ddf_fun_t *fun, usb_address_t *address, bool strict, usb_speed_t speed) -{ - assert(fun); - hcd_t *hcd = dev_to_hcd(ddf_fun_get_dev(fun)); - assert(hcd); - assert(address); - usb_log_debug("Address request: speed: %s, address: %d, strict: %s.\n", - usb_str_speed(speed), *address, strict ? "YES" : "NO"); - return usb_device_manager_request_address( - &hcd->dev_manager, address, strict, speed); -} - -/** Bind address interface function. - * - * @param[in] fun DDF function that was called. - * @param[in] address Address of the device - * @param[in] handle Devman handle of the device driver. - * @return Error code. - */ -static int bind_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); - - usb_log_debug("Address bind %d-%" PRIun ".\n", address, handle); - return usb_device_manager_bind_address( - &hcd->dev_manager, address, handle); -} - /** Find device handle by address interface function. * @@ -98,18 +57,4 @@ return usb_device_manager_get_info_by_address( &hcd->dev_manager, address, handle, NULL); -} - -/** Release address interface function. - * - * @param[in] fun DDF function that was called. - * @param[in] address USB address to be released. - * @return Error code. - */ -static int release_address(ddf_fun_t *fun, usb_address_t address) -{ - assert(fun); - hcd_t *hcd = dev_to_hcd(ddf_fun_get_dev(fun)); - usb_log_debug("Address release %d.\n", address); - return hcd_release_address(hcd, address); } @@ -134,5 +79,5 @@ const size_t size = max_packet_size; const usb_target_t target = {{.address = address, .endpoint = endpoint}}; - + usb_log_debug("Register endpoint %d:%d %s-%s %zuB %ums.\n", address, endpoint, usb_str_transfer_type(transfer_type), @@ -203,8 +148,5 @@ /** usbhc Interface implementation using hcd_t from libusbhost library. */ usbhc_iface_t hcd_iface = { - .request_address = request_address, - .bind_address = bind_address, .get_handle = find_by_address, - .release_address = release_address, .register_endpoint = register_endpoint,