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

Timestamp:

2011-02-23T10:28:21Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

eb48f61

Parents:

e936e8e (diff), eb1a2f4 (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 mainline changes

File:

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

uspace/lib/drv/generic/remote_usb.c

@@ -37 +37 @@
 
 #include "usb_iface.h"
-#include "driver.h"
+#include "ddf/driver.h"
 
 
-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_get_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(device_t *, void *, ipc_callid_t, ipc_call_t *);
 
@@ -61 +61 @@
 
 
-void remote_usb_get_address(device_t *device, void *iface,
+void remote_usb_get_address(ddf_fun_t *fun, void *iface,
     ipc_callid_t callid, ipc_call_t *call)
 {
@@ -74 +74 @@
 
         usb_address_t address;
-        int rc = usb_iface->get_address(device, handle, &address);
+        int rc = usb_iface->get_address(fun, handle, &address);
         if (rc != EOK) {
                 async_answer_0(callid, rc);
@@ -82 +82 @@
 }
 
-void remote_usb_get_interface(device_t *device, void *iface,
+void remote_usb_get_interface(ddf_fun_t *fun, void *iface,
     ipc_callid_t callid, ipc_call_t *call)
 {
@@ -95 +95 @@
 
         int iface_no;
-        int rc = usb_iface->get_interface(device, handle, &iface_no);
+        int rc = usb_iface->get_interface(fun, handle, &iface_no);
         if (rc != EOK) {
                 async_answer_0(callid, rc);
@@ -103 +103 @@
 }
 
-void remote_usb_get_hc_handle(device_t *device, void *iface,
+void remote_usb_get_hc_handle(ddf_fun_t *fun, void *iface,
     ipc_callid_t callid, ipc_call_t *call)
 {
@@ -114 +114 @@
 
         devman_handle_t handle;
-        int rc = usb_iface->get_hc_handle(device, &handle);
+        int rc = usb_iface->get_hc_handle(fun, &handle);
         if (rc != EOK) {
                 async_answer_0(callid, rc);