Changeset 5514cf7 in mainline

Timestamp:

2013-08-07T09:16:57Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

3121b5f

Parents:

4b8ecff

Message:

libdrv: Remove old hc handle based functions

Location:

uspace/lib/drv

Files:

• generic/remote_usb.c (modified) (7 diffs)
• include/usb_iface.h (modified) (2 diffs)

uspace/lib/drv/generic/remote_usb.c

@@ -64 +64 @@
 
 typedef enum {
-        IPC_M_USB_GET_MY_ADDRESS,
         IPC_M_USB_GET_MY_INTERFACE,
-        IPC_M_USB_GET_HOST_CONTROLLER_HANDLE,
         IPC_M_USB_GET_DEVICE_HANDLE,
         IPC_M_USB_RESERVE_DEFAULT_ADDRESS,
@@ -78 +76 @@
 } usb_iface_funcs_t;
 
-/** Tell USB address assigned to device.
- * @param exch Vaid IPC exchange
- * @param address Pointer to address storage place.
- * @return Error code.
- *
- * Exch param is an open communication to device implementing usb_iface.
- */
-int usb_get_my_address(async_exch_t *exch, usb_address_t *address)
-{
-        sysarg_t addr;
-        const int ret = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
-            IPC_M_USB_GET_MY_ADDRESS, &addr);
-
-        if (ret == EOK && address != NULL)
-                *address = (usb_address_t) addr;
-        return ret;
-}
-
 /** Tell interface number given device can use.
  * @param[in] exch IPC communication exchange
@@ -111 +91 @@
         if (ret == EOK && usb_iface)
                 *usb_iface = (int)iface_no;
-        return ret;
-}
-
-/** Tell devman handle of device host controller.
- * @param[in] exch IPC communication exchange
- * @param[out] hc_handle devman handle of the HC used by the target device.
- * @return Error code.
- */
-int usb_get_hc_handle(async_exch_t *exch, devman_handle_t *hc_handle)
-{
-        if (!exch)
-                return EBADMEM;
-        devman_handle_t h;
-        const int ret = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
-            IPC_M_USB_GET_HOST_CONTROLLER_HANDLE, &h);
-        if (ret == EOK && hc_handle)
-                *hc_handle = (devman_handle_t)h;
         return ret;
 }
@@ -309 +272 @@
 }
 
-static void remote_usb_get_my_address(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usb_get_my_interface(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
-static void remote_usb_get_hc_handle(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usb_get_device_handle(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
-
 static void remote_usb_reserve_default_address(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usb_release_default_address(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
@@ -321 +281 @@
 static void remote_usb_unregister_endpoint(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usb_read(ddf_fun_t *fun, void *iface, ipc_callid_t callid, ipc_call_t *call);
-
 static void remote_usb_write(ddf_fun_t *fun, void *iface, ipc_callid_t callid, ipc_call_t *call);
 
 /** Remote USB interface operations. */
 static remote_iface_func_ptr_t remote_usb_iface_ops [] = {
-        [IPC_M_USB_GET_MY_ADDRESS] = remote_usb_get_my_address,
         [IPC_M_USB_GET_MY_INTERFACE] = remote_usb_get_my_interface,
-        [IPC_M_USB_GET_HOST_CONTROLLER_HANDLE] = remote_usb_get_hc_handle,
         [IPC_M_USB_GET_DEVICE_HANDLE] = remote_usb_get_device_handle,
         [IPC_M_USB_RESERVE_DEFAULT_ADDRESS] = remote_usb_reserve_default_address,
@@ -347 +304 @@
 };
 
-
-void remote_usb_get_my_address(ddf_fun_t *fun, void *iface,
-    ipc_callid_t callid, ipc_call_t *call)
-{
-        const usb_iface_t *usb_iface = (usb_iface_t *) iface;
-
-        if (usb_iface->get_my_address == NULL) {
-                async_answer_0(callid, ENOTSUP);
-                return;
-        }
-
-        usb_address_t address;
-        const int ret = usb_iface->get_my_address(fun, &address);
-        if (ret != EOK) {
-                async_answer_0(callid, ret);
-        } else {
-                async_answer_1(callid, EOK, address);
-        }
-}
-
 void remote_usb_get_my_interface(ddf_fun_t *fun, void *iface,
     ipc_callid_t callid, ipc_call_t *call)
@@ -386 +323 @@
 }
 
-void remote_usb_get_hc_handle(ddf_fun_t *fun, void *iface,
-    ipc_callid_t callid, ipc_call_t *call)
-{
-        const usb_iface_t *usb_iface = (usb_iface_t *) iface;
-
-        if (usb_iface->get_hc_handle == NULL) {
-                async_answer_0(callid, ENOTSUP);
-                return;
-        }
-
-        devman_handle_t handle;
-        const int ret = usb_iface->get_hc_handle(fun, &handle);
-        if (ret != EOK) {
-                async_answer_0(callid, ret);
-        }
-
-        async_answer_1(callid, EOK, (sysarg_t) handle);
-}
-
 void remote_usb_get_device_handle(ddf_fun_t *fun, void *iface,
     ipc_callid_t callid, ipc_call_t *call)

uspace/lib/drv/include/usb_iface.h

@@ -52 +52 @@
 void usb_dev_disconnect(usb_dev_session_t *);
 
-int usb_get_my_address(async_exch_t *, usb_address_t *);
 int usb_get_my_interface(async_exch_t *, int *);
-int usb_get_hc_handle(async_exch_t *, devman_handle_t *);
 int usb_get_device_handle(async_exch_t *, devman_handle_t *);
 
@@ -77 +75 @@
 /** USB device communication interface. */
 typedef struct {
-        int (*get_my_address)(ddf_fun_t *, usb_address_t *);
         int (*get_my_interface)(ddf_fun_t *, int *);
-        int (*get_hc_handle)(ddf_fun_t *, devman_handle_t *);
-
         int (*get_device_handle)(ddf_fun_t *, devman_handle_t *);
 
         int (*reserve_default_address)(ddf_fun_t *, usb_speed_t);
         int (*release_default_address)(ddf_fun_t *);
+
         int (*device_enumerate)(ddf_fun_t *, usb_device_handle_t *);
         int (*device_remove)(ddf_fun_t *, usb_device_handle_t);
+
         int (*register_endpoint)(ddf_fun_t *, usb_endpoint_t,
             usb_transfer_type_t, usb_direction_t, size_t, unsigned);
         int (*unregister_endpoint)(ddf_fun_t *, usb_endpoint_t,
             usb_direction_t);
+
         int (*read)(ddf_fun_t *, usb_endpoint_t, uint64_t, uint8_t *, size_t,
             usbhc_iface_transfer_in_callback_t, void *);