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

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (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

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

• uspace/lib/drv/generic/remote_char_dev.c (moved) (moved from uspace/lib/drv/generic/remote_char.c ) (11 diffs)

uspace/lib/drv/generic/remote_char_dev.c

@@ -33 +33 @@
  */
 
-#include <ipc/ipc.h>
 #include <async.h>
 #include <errno.h>
 
-#include "char.h"
+#include "ops/char_dev.h"
 #include "driver.h"
 
@@ -46 +45 @@
 
 /** Remote character interface operations. */
-static remote_iface_func_ptr_t remote_char_iface_ops [] = {
+static remote_iface_func_ptr_t remote_char_dev_iface_ops[] = {
         &remote_char_read,
         &remote_char_write
@@ -56 +55 @@
  * character interface.
  */
-remote_iface_t remote_char_iface = {
-        .method_count = sizeof(remote_char_iface_ops) /
+remote_iface_t remote_char_dev_iface = {
+        .method_count = sizeof(remote_char_dev_iface_ops) /
             sizeof(remote_iface_func_ptr_t),
-        .methods = remote_char_iface_ops
+        .methods = remote_char_dev_iface_ops
 };
 
@@ -69 +68 @@
  *
  * @param dev           The device from which the data are read.
- * @param iface         The local interface structure.
+ * @param ops           The local ops structure.
  */
 static void
-remote_char_read(device_t *dev, void *iface, ipc_callid_t callid,
+remote_char_read(device_t *dev, void *ops, ipc_callid_t callid,
     ipc_call_t *call)
-{       
-        char_iface_t *char_iface = (char_iface_t *) iface;
+{
+        char_dev_ops_t *char_dev_ops = (char_dev_ops_t *) ops;
         ipc_callid_t cid;
         
@@ -81 +80 @@
         if (!async_data_read_receive(&cid, &len)) {
                 /* TODO handle protocol error. */
-                ipc_answer_0(callid, EINVAL);
+                async_answer_0(callid, EINVAL);
                 return;
         }
         
-        if (!char_iface->read) {
+        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_iface->read)(dev, buf, len);
+        int ret = (*char_dev_ops->read)(dev, 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);
 }
 
@@ -116 +115 @@
  *
  * @param dev           The device to which the data are written.
- * @param iface         The local interface structure.
+ * @param ops           The local ops structure.
  */
 static void
-remote_char_write(device_t *dev, void *iface, ipc_callid_t callid,
+remote_char_write(device_t *dev, void *ops, ipc_callid_t callid,
     ipc_call_t *call)
 {
-        char_iface_t *char_iface = (char_iface_t *) iface;
+        char_dev_ops_t *char_dev_ops = (char_dev_ops_t *) ops;
         ipc_callid_t cid;
         size_t len;
@@ -128 +127 @@
         if (!async_data_write_receive(&cid, &len)) {
                 /* TODO handle protocol error. */
-                ipc_answer_0(callid, EINVAL);
+                async_answer_0(callid, EINVAL);
                 return;
         }
         
-        if (!char_iface->write) {
+        if (!char_dev_ops->write) {
                 async_data_write_finalize(cid, NULL, 0);
-                ipc_answer_0(callid, ENOTSUP);
+                async_answer_0(callid, ENOTSUP);
                 return;
-        }       
+        }
         
         if (len > MAX_CHAR_RW_COUNT)
@@ -145 +144 @@
         async_data_write_finalize(cid, buf, len);
         
-        int ret = (*char_iface->write)(dev, buf, len);
+        int ret = (*char_dev_ops->write)(dev, 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);
         }
 }