Changeset 12573db in mainline for uspace/lib/drv/generic/remote_char_dev.c

Timestamp:

2011-01-31T20:32:33Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

37cf3792

Parents:

4fe94c66 (diff), 197ef43 (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_char_dev.c (modified) (9 diffs)

uspace/lib/drv/generic/remote_char_dev.c

@@ -33 +33 @@
  */
 
-#include <ipc/ipc.h>
 #include <async.h>
 #include <errno.h>
@@ -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;
         }
@@ -100 +99 @@
                 /* 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);
 }
 
@@ -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;
         }
@@ -148 +147 @@
         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);
         }
 }