Changeset 8b1e15ac in mainline for uspace/drv/test1

Timestamp:

2011-02-11T22:26:36Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

68414f4a

Parents:

1b367b4

Message:

Finish splitting device node: devman client in C library, drv library. Update device drivers accordingly.

Location:

uspace/drv/test1

Files:

• char.c (modified) (1 diff)
• test1.c (modified) (2 diffs)

uspace/drv/test1/char.c

@@ -37 +37 @@
 #include "test1.h"
 
-static int impl_char_read(device_t *dev, char *buf, size_t count) {
+static int impl_char_read(function_t *fun, char *buf, size_t count) {
         memset(buf, 0, count);
         return count;
 }
 
-static int imp_char_write(device_t *dev, char *buf, size_t count) {
+static int imp_char_write(function_t *fun, char *buf, size_t count) {
         return count;
 }

uspace/drv/test1/test1.c

@@ -61 +61 @@
            name, message);
 
-        int rc = child_device_register_wrapper(parent, name,
+        int rc = register_function_wrapper(parent, name,
             match_id, match_score);
 
         if (rc == EOK) {
-                printf(NAME ": registered child device `%s'.\n", name);
+                printf(NAME ": registered function `%s'.\n", name);
         } else {
-                printf(NAME ": failed to register child `%s' (%s).\n",
+                printf(NAME ": failed to register function `%s' (%s).\n",
                     name, str_error(rc));
         }
@@ -91 +91 @@
 static int add_device(device_t *dev)
 {
+        function_t *fun_a;
+
         printf(NAME ": add_device(name=\"%s\", handle=%d)\n",
             dev->name, (int) dev->handle);
 
-        add_device_to_class(dev, "virtual");
+        fun_a = create_function();
+        fun_a->ftype = fun_exposed;
+        fun_a->name = "a";
+
+        register_function(fun_a, dev);
+
+        add_function_to_class(fun_a, "virtual");
 
         if (str_cmp(dev->name, "null") == 0) {
-                dev->ops = &char_device_ops;
-                add_device_to_class(dev, "virt-null");
-        } else if (dev->parent == NULL) {
+                fun_a->ops = &char_device_ops;
+                add_function_to_class(fun_a, "virt-null");
+        } else if (str_cmp(dev->name, "test1") == 0) {
                 register_child_verbose(dev, "cloning myself ;-)", "clone",
                     "virtual&test1", 10);