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

File:

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

uspace/lib/drv/generic/remote_usb.c

@@ -33 +33 @@
  */
 
+#include <ipc/ipc.h>
 #include <async.h>
 #include <errno.h>
@@ -40 +41 @@
 
 
-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 *);
@@ -47 +46 @@
 /** 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
 };
@@ -61 +58 @@
 
 
-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_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(device, handle, &address);
-        if (rc != EOK) {
-                async_answer_0(callid, rc);
-        } else {
-                async_answer_1(callid, EOK, address);
-        }
-}
-
-void remote_usb_get_interface(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_interface == NULL) {
-                async_answer_0(callid, ENOTSUP);
-                return;
-        }
-
-        devman_handle_t handle = DEV_IPC_GET_ARG1(*call);
-
-        int iface_no;
-        int rc = usb_iface->get_interface(device, handle, &iface_no);
-        if (rc != EOK) {
-                async_answer_0(callid, rc);
-        } else {
-                async_answer_1(callid, EOK, iface_no);
-        }
-}
-
 void remote_usb_get_hc_handle(device_t *device, void *iface,
     ipc_callid_t callid, ipc_call_t *call)
@@ -109 +64 @@
 
         if (usb_iface->get_hc_handle == NULL) {
-                async_answer_0(callid, ENOTSUP);
+                ipc_answer_0(callid, ENOTSUP);
                 return;
         }
@@ -116 +71 @@
         int rc = usb_iface->get_hc_handle(device, &handle);
         if (rc != EOK) {
-                async_answer_0(callid, rc);
+                ipc_answer_0(callid, rc);
         }
 
-        async_answer_1(callid, EOK, (sysarg_t) handle);
+        ipc_answer_1(callid, EOK, (sysarg_t) handle);
 }