Changeset 92574f4 in mainline for uspace/lib/drv/generic/remote_char_dev.c

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

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

uspace/lib/drv/generic/remote_char_dev.c

@@ -33 +33 @@
  */
 
-#include <ipc/ipc.h>
 #include <async.h>
 #include <errno.h>
 
 #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. */
@@ -68 +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)
 {
@@ -81 +80 @@
         if (!async_data_read_receive(&cid, &len)) {
                 /* TODO handle protocol error. */
-                ipc_answer_0(callid, EINVAL);
+                async_answer_0(callid, EINVAL);
                 return;
         }
@@ -87 +86 @@
         if (!char_dev_ops->read) {
                 async_data_read_finalize(cid, NULL, 0);
-                ipc_answer_0(callid, ENOTSUP);
+                async_answer_0(callid, ENOTSUP);
                 return;
         }
@@ -95 +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) {
                 /* Some error occured. */
                 async_data_read_finalize(cid, buf, 0);
-                ipc_answer_0(callid, ret);
+                async_answer_0(callid, ret);
                 return;
         }
@@ -106 +105 @@
         /* The operation was successful, return the number of data read. */
         async_data_read_finalize(cid, buf, ret);
-        ipc_answer_1(callid, EOK, ret);
+        async_answer_1(callid, EOK, ret);
 }
 
@@ -115 +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)
 {
@@ -128 +127 @@
         if (!async_data_write_receive(&cid, &len)) {
                 /* TODO handle protocol error. */
-                ipc_answer_0(callid, EINVAL);
+                async_answer_0(callid, EINVAL);
                 return;
         }
@@ -134 +133 @@
         if (!char_dev_ops->write) {
                 async_data_write_finalize(cid, NULL, 0);
-                ipc_answer_0(callid, ENOTSUP);
+                async_answer_0(callid, ENOTSUP);
                 return;
         }
@@ -145 +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. */
-                ipc_answer_0(callid, ret);
+                async_answer_0(callid, ret);
         } else {
                 /*
@@ -154 +153 @@
                  * written.
                  */
-                ipc_answer_1(callid, EOK, ret);
+                async_answer_1(callid, EOK, ret);
         }
 }