Changeset b0fc92c in mainline

Timestamp:

2013-07-26T13:29:05Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

059d507

Parents:

f3922c2

Message:

libusb, libdrv, libusbhost: Remove searching for dev handle by usb address

Location:

uspace/lib

Files:

• drv/generic/remote_usbhc.c (modified) (5 diffs)
• drv/include/usbhc_iface.h (modified) (3 diffs)
• usb/include/usb/hc.h (modified) (1 diff)
• usb/src/hc.c (modified) (1 diff)
• usbhost/src/iface.c (modified) (2 diffs)

uspace/lib/drv/generic/remote_usbhc.c

@@ -84 +84 @@
  */
 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 +122 @@
 } 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 +241 @@
 
 
-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 +249 @@
 /** 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 +295 @@
         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)

uspace/lib/drv/include/usbhc_iface.h

@@ -44 +44 @@
 #include <stdbool.h>
 
-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 +61 @@
 /** 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 +68 @@
         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 *);

uspace/lib/usb/include/usb/hc.h

@@ -84 +84 @@
 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 *);

uspace/lib/usb/src/hc.c

@@ -144 +144 @@
 }
 
-
-/** 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,

uspace/lib/usbhost/src/iface.c

@@ -41 +41 @@
 #include <usb/host/hcd.h>
 #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 +131 @@
 /** 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,