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

Timestamp:

2011-01-14T10:08:47Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

f40a1e2

Parents:

44bb20b (diff), 6610565b (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 from /usb/development

File:

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

uspace/lib/drv/generic/remote_char_dev.c

@@ -37 +37 @@
 #include <errno.h>
 
-#include "char.h"
+#include "ops/char_dev.h"
 #include "driver.h"
 
@@ -46 +46 @@
 
 /** 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 +56 @@
  * 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 +69 @@
  *
  * @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;
         
@@ -85 +85 @@
         }
         
-        if (!char_iface->read) {
+        if (!char_dev_ops->read) {
                 async_data_read_finalize(cid, NULL, 0);
                 ipc_answer_0(callid, ENOTSUP);
@@ -95 +95 @@
         
         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) {
@@ -116 +116 @@
  *
  * @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;
@@ -132 +132 @@
         }
         
-        if (!char_iface->write) {
+        if (!char_dev_ops->write) {
                 async_data_write_finalize(cid, NULL, 0);
                 ipc_answer_0(callid, ENOTSUP);
                 return;
-        }       
+        }
         
         if (len > MAX_CHAR_RW_COUNT)
@@ -145 +145 @@
         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. */