Changeset b04967a in mainline for uspace/drv/rootvirt/rootvirt.c

Timestamp:

2011-04-07T15:53:46Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

c156c2d

Parents:

64dbc83 (diff), a82889e (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:

development merge

File:

• uspace/drv/rootvirt/rootvirt.c (modified) (6 diffs)

uspace/drv/rootvirt/rootvirt.c

@@ -40 +40 @@
 #include <str_error.h>
 #include <ddf/driver.h>
+#include <ddf/log.h>
 
 #define NAME "rootvirt"
@@ -83 +84 @@
         int rc;
 
-        printf(NAME ": registering function `%s' (match \"%s\")\n",
+        ddf_msg(LVL_DEBUG, "Registering function `%s' (match \"%s\")",
             vfun->name, vfun->match_id);
 
         fun = ddf_fun_create(vdev, fun_inner, vfun->name);
         if (fun == NULL) {
-                printf(NAME ": error creating function %s\n", vfun->name);
+                ddf_msg(LVL_ERROR, "Failed creating function %s", vfun->name);
                 return ENOMEM;
         }
@@ -94 +95 @@
         rc = ddf_fun_add_match_id(fun, vfun->match_id, 10);
         if (rc != EOK) {
-                printf(NAME ": error adding match IDs to function %s\n",
+                ddf_msg(LVL_ERROR, "Failed adding match IDs to function %s",
                     vfun->name);
                 ddf_fun_destroy(fun);
@@ -102 +103 @@
         rc = ddf_fun_bind(fun);
         if (rc != EOK) {
-                printf(NAME ": error binding function %s: %s\n", vfun->name,
-                    str_error(rc));
+                ddf_msg(LVL_ERROR, "Failed binding function %s: %s",
+                    vfun->name, str_error(rc));
                 ddf_fun_destroy(fun);
                 return rc;
         }
 
-        printf(NAME ": registered child device `%s'\n", vfun->name);
+        ddf_msg(LVL_NOTE, "Registered child device `%s'", vfun->name);
         return EOK;
 }
@@ -124 +125 @@
         }
 
-        printf(NAME ": add_device(handle=%d)\n", (int)dev->handle);
+        ddf_msg(LVL_DEBUG, "add_device(handle=%d)", (int)dev->handle);
 
         /*
@@ -142 +143 @@
 {
         printf(NAME ": HelenOS virtual devices root driver\n");
+
+        ddf_log_init(NAME, LVL_ERROR);
         return ddf_driver_main(&rootvirt_driver);
 }