Changeset fd07e57b in mainline for kernel/arch/sparc64/src/drivers/kbd.c

Timestamp:

2014-01-05T21:25:41Z (11 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

4aa2a27

Parents:

aacdb8e (diff), ca05e9b (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 cherrypicked kernel logger.

• Old klog sybsystem was renamed to kio
• Kernel and user-space log messages are stored in both logs (kernel logs end up in log/kernel file)

File:

• kernel/arch/sparc64/src/drivers/kbd.c (modified) (6 diffs)

kernel/arch/sparc64/src/drivers/kbd.c

@@ -44 +44 @@
 #include <align.h>
 #include <str.h>
-#include <print.h>
+#include <log.h>
 #include <sysinfo/sysinfo.h>
 
@@ -71 +71 @@
         ofw_tree_property_t *prop = ofw_tree_getprop(node, "interrupts");
         if ((!prop) || (!prop->value)) {
-                printf("ns16550: Unable to find interrupts property\n");
+                log(LF_ARCH, LVL_ERROR,
+                    "ns16550: Unable to find interrupts property");
                 return false;
         }
@@ -82 +83 @@
         prop = ofw_tree_getprop(node, "reg");
         if ((!prop) || (!prop->value)) {
-                printf("ns16550: Unable to find reg property\n");
+                log(LF_ARCH, LVL_ERROR,
+                    "ns16550: Unable to find reg property");
                 return false;
         }
@@ -91 +93 @@
         if (!ofw_ebus_apply_ranges(node->parent,
             ((ofw_ebus_reg_t *) prop->value), &pa)) {
-                printf("ns16550: Failed to determine address\n");
+                log(LF_ARCH, LVL_ERROR,
+                    "ns16550: Failed to determine address");
                 return false;
         }
@@ -101 +104 @@
             ((ofw_ebus_reg_t *) prop->value), interrupts, &inr, &cir,
             &cir_arg)) {
-                printf("ns16550: Failed to determine interrupt\n");
+                log(LF_ARCH, LVL_ERROR,
+                    "ns16550: Failed to determine interrupt");
                 return false;
         }
@@ -117 +121 @@
             PAGE_WRITE | PAGE_NOT_CACHEABLE) + offset);
         
-        ns16550_instance_t *ns16550_instance = ns16550_init(ns16550, inr, cir, cir_arg);
+        ns16550_instance_t *ns16550_instance = ns16550_init(ns16550, inr, cir,
+            cir_arg, NULL);
         if (ns16550_instance) {
                 kbrd_instance_t *kbrd_instance = kbrd_init();