Changeset b910455 in mainline for uspace/drv/isa/isa.c

Timestamp:

2011-04-07T09:46:11Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6639ae1

Parents:

f6bffee (diff), 8e80d3f (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 mainline changes.

File:

• uspace/drv/isa/isa.c (modified) (14 diffs)

uspace/drv/isa/isa.c

@@ -53 +53 @@
 
 #include <ddf/driver.h>
+#include <ddf/log.h>
 #include <ops/hw_res.h>
 
@@ -82 +83 @@
 static bool isa_enable_fun_interrupt(ddf_fun_t *fnode)
 {
-        // TODO
+        /* TODO */
 
         return false;
@@ -134 +135 @@
         fd = open(conf_path, O_RDONLY);
         if (fd < 0) {
-                printf(NAME ": unable to open %s\n", conf_path);
+                ddf_msg(LVL_ERROR, "Unable to open %s", conf_path);
                 goto cleanup;
         }
@@ -141 +142 @@
 
         len = lseek(fd, 0, SEEK_END);
-        lseek(fd, 0, SEEK_SET); 
+        lseek(fd, 0, SEEK_SET);
         if (len == 0) {
-                printf(NAME ": fun_conf_read error: configuration file '%s' "
-                    "is empty.\n", conf_path);
+                ddf_msg(LVL_ERROR, "Configuration file '%s' is empty.",
+                    conf_path);
                 goto cleanup;
         }
@@ -150 +151 @@
         buf = malloc(len + 1);
         if (buf == NULL) {
-                printf(NAME ": fun_conf_read error: memory allocation failed.\n");
+                ddf_msg(LVL_ERROR, "Memory allocation failed.");
                 goto cleanup;
         }
 
         if (0 >= read(fd, buf, len)) {
-                printf(NAME ": fun_conf_read error: unable to read file '%s'.\n",
-                    conf_path);
+                ddf_msg(LVL_ERROR, "Unable to read file '%s'.", conf_path);
                 goto cleanup;
         }
@@ -252 +252 @@
                 fun->hw_resources.count++;
 
-                printf(NAME ": added irq 0x%x to function %s\n", irq,
+                ddf_msg(LVL_NOTE, "Added irq 0x%x to function %s", irq,
                     fun->fnode->name);
         }
@@ -270 +270 @@
                 fun->hw_resources.count++;
 
-                printf(NAME ": added io range (addr=0x%x, size=0x%x) to "
-                    "function %s\n", (unsigned int) addr, (unsigned int) len,
+                ddf_msg(LVL_NOTE, "Added io range (addr=0x%x, size=0x%x) to "
+                    "function %s", (unsigned int) addr, (unsigned int) len,
                     fun->fnode->name);
         }
@@ -331 +331 @@
         score = (int)strtol(val, &end, 10);
         if (val == end) {
-                printf(NAME " : error - could not read match score for "
-                    "function %s.\n", fun->fnode->name);
+                ddf_msg(LVL_ERROR, "Cannot read match score for function "
+                    "%s.", fun->fnode->name);
                 return;
         }
@@ -339 +339 @@
         get_match_id(&id, val);
         if (id == NULL) {
-                printf(NAME " : error - could not read match id for "
-                    "function %s.\n", fun->fnode->name);
+                ddf_msg(LVL_ERROR, "Cannot read match ID for function %s.",
+                    fun->fnode->name);
                 return;
         }
 
-        printf(NAME ": adding match id '%s' with score %d to function %s\n", id,
-            score, fun->fnode->name);
+        ddf_msg(LVL_DEBUG, "Adding match id '%s' with score %d to "
+            "function %s", id, score, fun->fnode->name);
 
         rc = ddf_fun_add_match_id(fun->fnode, id, score);
-        if (rc != EOK)
-                printf(NAME ": error adding match ID: %s\n", str_error(rc));
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed adding match ID: %s",
+                    str_error(rc));
+        }
 }
 
@@ -375 +377 @@
         if (!prop_parse(fun, line, "io_range", &fun_parse_io_range) &&
             !prop_parse(fun, line, "irq", &fun_parse_irq) &&
-            !prop_parse(fun, line, "match", &fun_parse_match_id))
-        {
-            printf(NAME " error undefined device property at line '%s'\n",
-                line);
+            !prop_parse(fun, line, "match", &fun_parse_match_id)) {
+
+                ddf_msg(LVL_ERROR, "Undefined device property at line '%s'",
+                    line);
         }
 }
@@ -439 +441 @@
         fun->fnode->ops = &isa_fun_ops;
 
-        printf(NAME ": Binding function %s.\n", fun->fnode->name);
+        ddf_msg(LVL_DEBUG, "Binding function %s.", fun->fnode->name);
 
         /* XXX Handle error */
@@ -467 +469 @@
 static int isa_add_device(ddf_dev_t *dev)
 {
-        printf(NAME ": isa_add_device, device handle = %d\n",
+        ddf_msg(LVL_DEBUG, "isa_add_device, device handle = %d",
             (int) dev->handle);
 
         /* Make the bus device more visible. Does not do anything. */
-        printf(NAME ": adding a 'ctl' function\n");
+        ddf_msg(LVL_DEBUG, "Adding a 'ctl' function");
 
         ddf_fun_t *ctl = ddf_fun_create(dev, fun_exposed, "ctl");
         if (ctl == NULL) {
-                printf(NAME ": Error creating control function.\n");
+                ddf_msg(LVL_ERROR, "Failed creating control function.");
                 return EXDEV;
         }
 
         if (ddf_fun_bind(ctl) != EOK) {
-                printf(NAME ": Error binding control function.\n");
+                ddf_msg(LVL_ERROR, "Failed binding control function.");
                 return EXDEV;
         }
@@ -486 +488 @@
         /* Add functions as specified in the configuration file. */
         isa_functions_add(dev);
-        printf(NAME ": finished the enumeration of legacy functions\n");
+        ddf_msg(LVL_NOTE, "Finished enumerating legacy functions");
 
         return EOK;
@@ -493 +495 @@
 static void isa_init() 
 {
+        ddf_log_init(NAME, LVL_ERROR);
         isa_fun_ops.interfaces[HW_RES_DEV_IFACE] = &isa_fun_hw_res_ops;
 }