Changeset c2245a3 in mainline for uspace/lib/drv/generic/remote_usb.c

Timestamp:

2011-11-10T20:03:48Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

fa76f81

Parents:

27ca3a3 (diff), 747ef72 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline

File:

• uspace/lib/drv/generic/remote_usb.c (modified) (3 diffs)

uspace/lib/drv/generic/remote_usb.c

@@ -40 +40 @@
 
 
-static void remote_usb_get_address(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_usb_get_my_address(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usb_get_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 *);
@@ -47 +47 @@
 /** Remote USB interface operations. */
 static remote_iface_func_ptr_t remote_usb_iface_ops [] = {
-        remote_usb_get_address,
-        remote_usb_get_interface,
-        remote_usb_get_hc_handle
+        [IPC_M_USB_GET_MY_ADDRESS] = remote_usb_get_my_address,
+        [IPC_M_USB_GET_INTERFACE] = remote_usb_get_interface,
+        [IPC_M_USB_GET_HOST_CONTROLLER_HANDLE] = remote_usb_get_hc_handle,
 };
 
@@ -61 +61 @@
 
 
-void remote_usb_get_address(ddf_fun_t *fun, void *iface,
+void remote_usb_get_my_address(ddf_fun_t *fun, void *iface,
     ipc_callid_t callid, ipc_call_t *call)
 {
         usb_iface_t *usb_iface = (usb_iface_t *) iface;
 
-        if (usb_iface->get_address == NULL) {
+        if (usb_iface->get_my_address == NULL) {
                 async_answer_0(callid, ENOTSUP);
                 return;
         }
 
-        devman_handle_t handle = DEV_IPC_GET_ARG1(*call);
-
         usb_address_t address;
-        int rc = usb_iface->get_address(fun, handle, &address);
+        int rc = usb_iface->get_my_address(fun, &address);
         if (rc != EOK) {
                 async_answer_0(callid, rc);