Changes in uspace/drv/root/root.c [fc51296:af6b5157] in mainline

File:

• uspace/drv/root/root.c (modified) (12 diffs)

uspace/drv/root/root.c

@@ -52 +52 @@
 
 #include <ddf/driver.h>
-#include <ddf/log.h>
 #include <devman.h>
 #include <ipc/devman.h>
@@ -90 +89 @@
         int rc;
 
-        ddf_msg(LVL_DEBUG, "Adding new function for virtual devices. "
-            "Function node is `%s' (%d %s)\n", name,
+        printf(NAME ": adding new function for virtual devices.\n");
+        printf(NAME ":   function node is `%s' (%d %s)\n", name,
             VIRTUAL_FUN_MATCH_SCORE, VIRTUAL_FUN_MATCH_ID);
 
         fun = ddf_fun_create(dev, fun_inner, name);
         if (fun == NULL) {
-                ddf_msg(LVL_ERROR, "Failed creating function %s\n", name);
+                printf(NAME ": error creating function %s\n", name);
                 return ENOMEM;
         }
@@ -103 +102 @@
             VIRTUAL_FUN_MATCH_SCORE);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed adding match IDs to function %s\n", name);
+                printf(NAME ": error adding match IDs to function %s\n", name);
                 ddf_fun_destroy(fun);
                 return rc;
@@ -110 +109 @@
         rc = ddf_fun_bind(fun);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed binding function %s: %s\n", name,
+                printf(NAME ": error binding function %s: %s\n", name,
                     str_error(rc));
                 ddf_fun_destroy(fun);
@@ -137 +136 @@
         platform = sysinfo_get_data("platform", &platform_size);
         if (platform == NULL) {
-                ddf_msg(LVL_ERROR, "Failed to obtain platform name.\n");
+                printf(NAME ": Failed to obtain platform name.\n");
                 return ENOENT;
         }
@@ -144 +143 @@
         platform = realloc(platform, platform_size + 1);
         if (platform == NULL) {
-                ddf_msg(LVL_ERROR, "Memory allocation failed.\n");
+                printf(NAME ": Memory allocation failed.\n");
                 return ENOMEM;
         }
@@ -152 +151 @@
         /* Construct match ID. */
         if (asprintf(&match_id, PLATFORM_FUN_MATCH_ID_FMT, platform) == -1) {
-                ddf_msg(LVL_ERROR, "Memory allocation failed.\n");
+                printf(NAME ": Memory allocation failed.\n");
                 return ENOMEM;
         }
 
         /* Add function. */
-        ddf_msg(LVL_DEBUG, "Adding platform function. Function node is `%s' "
-            " (%d %s)\n", PLATFORM_FUN_NAME, PLATFORM_FUN_MATCH_SCORE,
-            match_id);
+        printf(NAME ": adding platform function\n");
+        printf(NAME ":   function node is `%s' (%d %s)\n", PLATFORM_FUN_NAME,
+            PLATFORM_FUN_MATCH_SCORE, match_id);
 
         fun = ddf_fun_create(dev, fun_inner, name);
         if (fun == NULL) {
-                ddf_msg(LVL_ERROR, "Error creating function %s\n", name);
+                printf(NAME ": error creating function %s\n", name);
                 return ENOMEM;
         }
@@ -169 +168 @@
         rc = ddf_fun_add_match_id(fun, match_id, PLATFORM_FUN_MATCH_SCORE);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed adding match IDs to function %s\n",
-                    name);
+                printf(NAME ": error adding match IDs to function %s\n", name);
                 ddf_fun_destroy(fun);
                 return rc;
@@ -177 +175 @@
         rc = ddf_fun_bind(fun);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed binding function %s: %s\n", name,
+                printf(NAME ": error binding function %s: %s\n", name,
                     str_error(rc));
                 ddf_fun_destroy(fun);
@@ -193 +191 @@
 static int root_add_device(ddf_dev_t *dev)
 {
-        ddf_msg(LVL_DEBUG, "root_add_device, device handle=%" PRIun "\n",
+        printf(NAME ": root_add_device, device handle=%" PRIun "\n",
             dev->handle);
 
@@ -206 +204 @@
         int res = add_platform_fun(dev);
         if (EOK != res)
-                ddf_msg(LVL_ERROR, "Failed adding child device for platform.\n");
+                printf(NAME ": failed to add child device for platform.\n");
 
         return res;
@@ -214 +212 @@
 {
         printf(NAME ": HelenOS root device driver\n");
-
-        ddf_log_init(NAME, LVL_ERROR);
         return ddf_driver_main(&root_driver);
 }