Changeset 233e68d in mainline for uspace/lib/drv/generic/remote_char_dev.c

Timestamp:

2011-02-23T18:28:41Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e9e58ea3

Parents:

deece2f (diff), a9c674e0 (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:

Devel changes

File:

• uspace/lib/drv/generic/remote_char_dev.c (modified) (5 diffs)

uspace/lib/drv/generic/remote_char_dev.c

@@ -37 +37 @@
 
 #include "ops/char_dev.h"
-#include "driver.h"
+#include "ddf/driver.h"
 
 #define MAX_CHAR_RW_COUNT 256
 
-static void remote_char_read(device_t *, void *, ipc_callid_t, ipc_call_t *);
-static void remote_char_write(device_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_char_read(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_char_write(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 
 /** Remote character interface operations. */
@@ -67 +67 @@
  * local interface to the remote client.
  *
- * @param dev           The device from which the data are read.
+ * @param fun           The function from which the data are read.
  * @param ops           The local ops structure.
  */
 static void
-remote_char_read(device_t *dev, void *ops, ipc_callid_t callid,
+remote_char_read(ddf_fun_t *fun, void *ops, ipc_callid_t callid,
     ipc_call_t *call)
 {
@@ -94 +94 @@
         
         char buf[MAX_CHAR_RW_COUNT];
-        int ret = (*char_dev_ops->read)(dev, buf, len);
+        int ret = (*char_dev_ops->read)(fun, buf, len);
         
         if (ret < 0) {
@@ -114 +114 @@
  * local interface to the remote client.
  *
- * @param dev           The device to which the data are written.
+ * @param fun           The function to which the data are written.
  * @param ops           The local ops structure.
  */
 static void
-remote_char_write(device_t *dev, void *ops, ipc_callid_t callid,
+remote_char_write(ddf_fun_t *fun, void *ops, ipc_callid_t callid,
     ipc_call_t *call)
 {
@@ -144 +144 @@
         async_data_write_finalize(cid, buf, len);
         
-        int ret = (*char_dev_ops->write)(dev, buf, len);
+        int ret = (*char_dev_ops->write)(fun, buf, len);
         if (ret < 0) {
                 /* Some error occured. */