Changeset 73aec008 in mainline for uspace/drv/test1/test1.c

Timestamp:

2011-03-31T18:23:41Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a30e435

Parents:

917a8c8 (diff), 3acb285 (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 devman and driver logging improvements. Devman started by default.

File:

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

uspace/drv/test1/test1.c

@@ -35 +35 @@
 #include <str_error.h>
 #include <ddf/driver.h>
+#include <ddf/log.h>
 
 #include "test1.h"
@@ -63 +64 @@
         int rc;
 
-        printf(NAME ": registering function `%s': %s.\n", name, message);
+        ddf_msg(LVL_DEBUG, "Registering function `%s': %s.\n", name, message);
 
         fun = ddf_fun_create(parent, fun_inner, name);
         if (fun == NULL) {
-                printf(NAME ": error creating function %s\n", name);
+                ddf_msg(LVL_ERROR, "Failed creating function %s\n", name);
                 return ENOMEM;
         }
@@ -73 +74 @@
         rc = ddf_fun_add_match_id(fun, match_id, match_score);
         if (rc != EOK) {
-                printf(NAME ": error adding match IDs to function %s\n", name);
+                ddf_msg(LVL_ERROR, "Failed adding match IDs to function %s\n",
+                    name);
                 ddf_fun_destroy(fun);
                 return rc;
@@ -80 +82 @@
         rc = ddf_fun_bind(fun);
         if (rc != EOK) {
-                printf(NAME ": error binding function %s: %s\n", name,
+                ddf_msg(LVL_ERROR, "Failed binding function %s: %s\n", name,
                     str_error(rc));
                 ddf_fun_destroy(fun);
@@ -86 +88 @@
         }
 
-        printf(NAME ": registered child device `%s'\n", name);
+        ddf_msg(LVL_NOTE, "Registered child device `%s'\n", name);
         return EOK;
 }
@@ -112 +114 @@
         int rc;
 
-        printf(NAME ": add_device(name=\"%s\", handle=%d)\n",
+        ddf_msg(LVL_DEBUG, "add_device(name=\"%s\", handle=%d)\n",
             dev->name, (int) dev->handle);
 
         fun_a = ddf_fun_create(dev, fun_exposed, "a");
         if (fun_a == NULL) {
-                printf(NAME ": error creating function 'a'.\n");
+                ddf_msg(LVL_ERROR, "Failed creating function 'a'.\n");
                 return ENOMEM;
         }
@@ -123 +125 @@
         rc = ddf_fun_bind(fun_a);
         if (rc != EOK) {
-                printf(NAME ": error binding function 'a'.\n");
+                ddf_msg(LVL_ERROR, "Failed binding function 'a'.\n");
                 return rc;
         }
@@ -140 +142 @@
         }
 
-        printf(NAME ": device `%s' accepted.\n", dev->name);
+        ddf_msg(LVL_DEBUG, "Device `%s' accepted.\n", dev->name);
 
         return EOK;
@@ -148 +150 @@
 {
         printf(NAME ": HelenOS test1 virtual device driver\n");
+        ddf_log_init(NAME, LVL_ERROR);
         return ddf_driver_main(&test1_driver);
 }