Changeset 83a2f43 in mainline for uspace/drv/test1

Timestamp:

2011-02-15T19:43:50Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

af6b5157

Parents:

34588a80

Message:

Rename bunch of stuff so that it starts with 'ddf_'.

Location:

uspace/drv/test1

Files:

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

uspace/drv/test1/char.c

@@ -37 +37 @@
 #include "test1.h"
 
-static int impl_char_read(function_t *fun, char *buf, size_t count) {
+static int impl_char_read(ddf_fun_t *fun, char *buf, size_t count) {
         memset(buf, 0, count);
         return count;
 }
 
-static int imp_char_write(function_t *fun, char *buf, size_t count) {
+static int imp_char_write(ddf_fun_t *fun, char *buf, size_t count) {
         return count;
 }
@@ -51 +51 @@
 };
 
-device_ops_t char_device_ops = {
+ddf_dev_ops_t char_device_ops = {
         .interfaces[CHAR_DEV_IFACE] = &char_dev_ops
 };

uspace/drv/test1/test1.c

@@ -36 +36 @@
 #include "test1.h"
 
-static int test1_add_device(device_t *dev);
+static int test1_add_device(ddf_dev_t *dev);
 
 static driver_ops_t driver_ops = {
@@ -55 +55 @@
  * @param score Device match score.
  */
-static int register_fun_verbose(device_t *parent, const char *message,
+static int register_fun_verbose(ddf_dev_t *parent, const char *message,
     const char *name, const char *match_id, int match_score)
 {
-        function_t *fun;
+        ddf_fun_t *fun;
         int rc;
 
@@ -105 +105 @@
  * @return Error code reporting success of the operation.
  */
-static int test1_add_device(device_t *dev)
+static int test1_add_device(ddf_dev_t *dev)
 {
-        function_t *fun_a;
+        ddf_fun_t *fun_a;
         int rc;
 
@@ -125 +125 @@
         }
 
-        add_function_to_class(fun_a, "virtual");
+        ddf_fun_add_to_class(fun_a, "virtual");
 
         if (str_cmp(dev->name, "null") == 0) {
                 fun_a->ops = &char_device_ops;
-                add_function_to_class(fun_a, "virt-null");
+                ddf_fun_add_to_class(fun_a, "virt-null");
         } else if (str_cmp(dev->name, "test1") == 0) {
                 (void) register_fun_verbose(dev, "cloning myself ;-)", "clone",
@@ -146 +146 @@
 {
         printf(NAME ": HelenOS test1 virtual device driver\n");
-        return driver_main(&test1_driver);
+        return ddf_driver_main(&test1_driver);
 }
 

uspace/drv/test1/test1.h

@@ -36 +36 @@
 #define NAME "test1"
 
-extern device_ops_t char_device_ops;
+extern ddf_dev_ops_t char_device_ops;
 
 #endif