Changeset bab6388 in mainline for uspace/drv/test1/test1.c

Timestamp:

2011-02-13T20:23:37Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7df0477e

Parents:

68414f4a

Message:

Small additional cleanup.

File:

• uspace/drv/test1/test1.c (modified) (5 diffs)

uspace/drv/test1/test1.c

@@ -36 +36 @@
 #include "test1.h"
 
-static int add_device(device_t *dev);
+static int test1_add_device(device_t *dev);
 
 static driver_ops_t driver_ops = {
-        .add_device = &add_device
+        .add_device = &test1_add_device
 };
 
-static driver_t the_driver = {
+static driver_t test1_driver = {
         .name = NAME,
         .driver_ops = &driver_ops
@@ -55 +55 @@
  * @param score Device match score.
  */
-static void register_child_verbose(device_t *parent, const char *message,
+static void register_fun_verbose(device_t *parent, const char *message,
     const char *name, const char *match_id, int match_score)
 {
@@ -89 +89 @@
  * @return Error code reporting success of the operation.
  */
-static int add_device(device_t *dev)
+static int test1_add_device(device_t *dev)
 {
         function_t *fun_a;
@@ -108 +108 @@
                 add_function_to_class(fun_a, "virt-null");
         } else if (str_cmp(dev->name, "test1") == 0) {
-                register_child_verbose(dev, "cloning myself ;-)", "clone",
+                register_fun_verbose(dev, "cloning myself ;-)", "clone",
                     "virtual&test1", 10);
         } else if (str_cmp(dev->name, "clone") == 0) {
-                register_child_verbose(dev, "run by the same task", "child",
+                register_fun_verbose(dev, "run by the same task", "child",
                     "virtual&test1&child", 10);
         }
@@ -123 +123 @@
 {
         printf(NAME ": HelenOS test1 virtual device driver\n");
-        return driver_main(&the_driver);
+        return driver_main(&test1_driver);
 }