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

Timestamp:

2011-01-09T18:00:14Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

80bffdb0

Parents:

0c70f7e (diff), 8871dba (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 mildly aggressive DDF cleanup (char_dev and hw_res interfaces, ops structures).

File:

• uspace/lib/drv/generic/remote_char_dev.c (moved) (moved from uspace/lib/drv/generic/remote_char.c ) (6 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
 };
 
@@ -74 +74 @@
 remote_char_read(device_t *dev, void *iface, ipc_callid_t callid,
     ipc_call_t *call)
-{       
-        char_iface_t *char_iface = (char_iface_t *) iface;
+{
+        char_dev_ops_t *char_iface = (char_dev_ops_t *) iface;
         ipc_callid_t cid;
         
@@ -122 +122 @@
     ipc_call_t *call)
 {
-        char_iface_t *char_iface = (char_iface_t *) iface;
+        char_dev_ops_t *char_iface = (char_dev_ops_t *) iface;
         ipc_callid_t cid;
         size_t len;
@@ -136 +136 @@
                 ipc_answer_0(callid, ENOTSUP);
                 return;
-        }       
+        }
         
         if (len > MAX_CHAR_RW_COUNT)