Changeset 7c10198 in mainline

Timestamp:

2013-08-02T11:27:51Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9d15d1b

Parents:

fdec59b

Message:

libdrv: Remove usb enpoint register/unregister from usb hc iface

nothing is using this, and nothing should

Location:

uspace/lib/drv

Files:

• generic/remote_usbhc.c (modified) (4 diffs)
• include/usbhc_iface.h (modified) (2 diffs)

uspace/lib/drv/generic/remote_usbhc.c

@@ -84 +84 @@
  */
 typedef enum {
-        /** Register endpoint attributes at host controller.
-         * This is used to reserve portion of USB bandwidth.
-         * When speed is invalid, speed of the device is used.
-         * Parameters:
-         * - USB address + endpoint number
-         *   - packed as ADDR << 16 + EP
-         * - speed + transfer type + direction
-         *   - packed as ( SPEED << 8 + TYPE ) << 8 + DIR
-         * - maximum packet size + interval (in milliseconds)
-         *   - packed as MPS << 16 + INT
-         * Answer:
-         * - EOK - reservation successful
-         * - ELIMIT - not enough bandwidth to satisfy the request
-         */
-        IPC_M_USBHC_REGISTER_ENDPOINT,
-
-        /** Revert endpoint registration.
-         * Parameters:
-         * - USB address
-         * - endpoint number
-         * - data direction
-         * Answer:
-         * - EOK - endpoint unregistered
-         * - ENOENT - unknown endpoint
-         */
-        IPC_M_USBHC_UNREGISTER_ENDPOINT,
-
         /** Get data from device.
          * See explanation at usb_iface_funcs_t (IN transaction).
@@ -121 +94 @@
         IPC_M_USBHC_WRITE,
 } usbhc_iface_funcs_t;
-
-int usbhc_register_endpoint(async_exch_t *exch, usb_address_t address,
-    usb_endpoint_t endpoint, usb_transfer_type_t type,
-    usb_direction_t direction, size_t mps, unsigned interval)
-{
-        if (!exch)
-                return EBADMEM;
-        const usb_target_t target =
-            {{ .address = address, .endpoint = endpoint }};
-#define _PACK2(high, low) (((high & 0xffff) << 16) | (low & 0xffff))
-
-        return async_req_4_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
-            IPC_M_USBHC_REGISTER_ENDPOINT, target.packed,
-            _PACK2(type, direction), _PACK2(mps, interval));
-
-#undef _PACK2
-}
-
-int usbhc_unregister_endpoint(async_exch_t *exch, usb_address_t address,
-    usb_endpoint_t endpoint, usb_direction_t direction)
-{
-        if (!exch)
-                return EBADMEM;
-        return async_req_4_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
-            IPC_M_USBHC_UNREGISTER_ENDPOINT, address, endpoint, direction);
-}
 
 int usbhc_read(async_exch_t *exch, usb_address_t address,
@@ -240 +187 @@
 }
 
-
-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 *);
 static void remote_usbhc_read(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_write(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
-//static void remote_usbhc(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 
 /** Remote USB host controller interface operations. */
 static remote_iface_func_ptr_t remote_usbhc_iface_ops[] = {
-        [IPC_M_USBHC_REGISTER_ENDPOINT] = remote_usbhc_register_endpoint,
-        [IPC_M_USBHC_UNREGISTER_ENDPOINT] = remote_usbhc_unregister_endpoint,
-
         [IPC_M_USBHC_READ] = remote_usbhc_read,
         [IPC_M_USBHC_WRITE] = remote_usbhc_write,
@@ -328 +268 @@
 }
 
-void remote_usbhc_register_endpoint(ddf_fun_t *fun, void *iface,
-    ipc_callid_t callid, ipc_call_t *call)
-{
-        usbhc_iface_t *usb_iface = (usbhc_iface_t *) iface;
-
-        if (!usb_iface->register_endpoint) {
-                async_answer_0(callid, ENOTSUP);
-                return;
-        }
-
-#define _INIT_FROM_HIGH_DATA2(type, var, arg_no) \
-        type var = (type) (DEV_IPC_GET_ARG##arg_no(*call) >> 16)
-#define _INIT_FROM_LOW_DATA2(type, var, arg_no) \
-        type var = (type) (DEV_IPC_GET_ARG##arg_no(*call) & 0xffff)
-
-        const usb_target_t target = { .packed = DEV_IPC_GET_ARG1(*call) };
-
-        _INIT_FROM_HIGH_DATA2(usb_transfer_type_t, transfer_type, 2);
-        _INIT_FROM_LOW_DATA2(usb_direction_t, direction, 2);
-
-        _INIT_FROM_HIGH_DATA2(size_t, max_packet_size, 3);
-        _INIT_FROM_LOW_DATA2(unsigned int, interval, 3);
-
-#undef _INIT_FROM_HIGH_DATA2
-#undef _INIT_FROM_LOW_DATA2
-
-        int rc = usb_iface->register_endpoint(fun, target.address,
-            target.endpoint, transfer_type, direction, max_packet_size, interval);
-
-        async_answer_0(callid, rc);
-}
-
-void remote_usbhc_unregister_endpoint(ddf_fun_t *fun, void *iface,
-    ipc_callid_t callid, ipc_call_t *call)
-{
-        usbhc_iface_t *usb_iface = (usbhc_iface_t *) iface;
-
-        if (!usb_iface->unregister_endpoint) {
-                async_answer_0(callid, ENOTSUP);
-                return;
-        }
-
-        usb_address_t address = (usb_address_t) DEV_IPC_GET_ARG1(*call);
-        usb_endpoint_t endpoint = (usb_endpoint_t) DEV_IPC_GET_ARG2(*call);
-        usb_direction_t direction = (usb_direction_t) DEV_IPC_GET_ARG3(*call);
-
-        int rc = usb_iface->unregister_endpoint(fun,
-            address, endpoint, direction);
-
-        async_answer_0(callid, rc);
-}
-
 void remote_usbhc_read(
     ddf_fun_t *fun, void *iface, ipc_callid_t callid, ipc_call_t *call)

uspace/lib/drv/include/usbhc_iface.h

@@ -44 +44 @@
 #include <stdbool.h>
 
-int usbhc_register_endpoint(async_exch_t *, usb_address_t, usb_endpoint_t,
-    usb_transfer_type_t, usb_direction_t, size_t, unsigned int);
-int usbhc_unregister_endpoint(async_exch_t *, usb_address_t, usb_endpoint_t,
-    usb_direction_t);
 int usbhc_read(async_exch_t *, usb_address_t, usb_endpoint_t,
     uint64_t, void *, size_t, size_t *);
@@ -61 +57 @@
 /** USB host controller communication interface. */
 typedef struct {
-        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,
-            usb_direction_t);
-
         int (*read)(ddf_fun_t *, usb_target_t, uint64_t, uint8_t *, size_t,
             usbhc_iface_transfer_in_callback_t, void *);