Changeset fd07e57b in mainline for kernel/arch/arm32/src

Timestamp:

2014-01-05T21:25:41Z (12 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)

Location:

kernel/arch/arm32/src/mach

Files:

• gta02/gta02.c (modified) (2 diffs)
• integratorcp/integratorcp.c (modified) (3 diffs)

kernel/arch/arm32/src/mach/gta02/gta02.c

@@ -49 +49 @@
 #include <ddi/ddi.h>
 #include <ddi/device.h>
+#include <log.h>
 
 #define GTA02_MEMORY_START      0x30000000      /* physical */
@@ -149 +150 @@
         } else {
                 /* Spurious interrupt.*/
-                printf("cpu%d: spurious interrupt (inum=%d)\n",
+                log(LF_ARCH, LVL_DEBUG, "cpu%d: spurious interrupt (inum=%d)",
                     CPU->id, inum);
         }

kernel/arch/arm32/src/mach/integratorcp/integratorcp.c

@@ -43 +43 @@
 #include <console/console.h>
 #include <sysinfo/sysinfo.h>
-#include <print.h>
 #include <ddi/device.h>
 #include <mm/page.h>
@@ -53 +52 @@
 #include <abi/fb/visuals.h>
 #include <ddi/ddi.h>
-#include <print.h>
+#include <log.h>
+
 
 
@@ -275 +275 @@
                         } else {
                                 /* Spurious interrupt.*/
-                                printf("cpu%d: spurious interrupt (inum=%d)\n",
+                                log(LF_ARCH, LVL_DEBUG,
+                                    "cpu%d: spurious interrupt (inum=%d)",
                                     CPU->id, i);
                         }