Changes in uspace/lib/drv/generic/remote_usb.c [27ed734c:95120c3] in mainline

File:

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

uspace/lib/drv/generic/remote_usb.c

@@ -37 +37 @@
 
 #include "usb_iface.h"
-#include "ddf/driver.h"
+#include "driver.h"
 
 
-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 *);
+static void remote_usb_get_address(device_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_usb_get_interface(device_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_usb_get_hc_handle(device_t *, void *, ipc_callid_t, ipc_call_t *);
 //static void remote_usb(device_t *, void *, ipc_callid_t, ipc_call_t *);
 
 /** 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_INTERFACE] = remote_usb_get_interface,
-        [IPC_M_USB_GET_HOST_CONTROLLER_HANDLE] = remote_usb_get_hc_handle,
+        remote_usb_get_address,
+        remote_usb_get_interface,
+        remote_usb_get_hc_handle
 };
 
@@ -61 +61 @@
 
 
-void remote_usb_get_my_address(ddf_fun_t *fun, void *iface,
+void remote_usb_get_address(device_t *device, void *iface,
     ipc_callid_t callid, ipc_call_t *call)
 {
         usb_iface_t *usb_iface = (usb_iface_t *) iface;
 
-        if (usb_iface->get_my_address == NULL) {
+        if (usb_iface->get_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_my_address(fun, &address);
+        int rc = usb_iface->get_address(device, handle, &address);
         if (rc != EOK) {
                 async_answer_0(callid, rc);
@@ -80 +82 @@
 }
 
-void remote_usb_get_interface(ddf_fun_t *fun, void *iface,
+void remote_usb_get_interface(device_t *device, void *iface,
     ipc_callid_t callid, ipc_call_t *call)
 {
@@ -93 +95 @@
 
         int iface_no;
-        int rc = usb_iface->get_interface(fun, handle, &iface_no);
+        int rc = usb_iface->get_interface(device, handle, &iface_no);
         if (rc != EOK) {
                 async_answer_0(callid, rc);
@@ -101 +103 @@
 }
 
-void remote_usb_get_hc_handle(ddf_fun_t *fun, void *iface,
+void remote_usb_get_hc_handle(device_t *device, void *iface,
     ipc_callid_t callid, ipc_call_t *call)
 {
@@ -112 +114 @@
 
         devman_handle_t handle;
-        int rc = usb_iface->get_hc_handle(fun, &handle);
+        int rc = usb_iface->get_hc_handle(device, &handle);
         if (rc != EOK) {
                 async_answer_0(callid, rc);