Changeset ef40434 in mainline for uspace/lib/drv/generic/remote_usbhc.c

Timestamp:

2013-01-15T21:50:52Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0f4bff8

Parents:

ef4e8eb

Message:

usb: Drop deprecated usb hc interface functions.

File:

• uspace/lib/drv/generic/remote_usbhc.c (modified) (8 diffs)

uspace/lib/drv/generic/remote_usbhc.c

@@ -84 +84 @@
  */
 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 +92 @@
          */
         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 +131 @@
 } 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 +146 @@
 }
 
-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 +265 @@
 
 
-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 +274 @@
 /** 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 +323 @@
 }
 
-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 +345 @@
 }
 
-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)