Changeset fd07e57b in mainline for kernel/generic/src/console/cmd.c

Timestamp:

2014-01-05T21:25:41Z (10 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/generic/src/console/cmd.c (modified) (3 diffs)

kernel/generic/src/console/cmd.c

@@ -45 +45 @@
 #include <console/kconsole.h>
 #include <print.h>
+#include <log.h>
 #include <panic.h>
 #include <typedefs.h>
@@ -639 +640 @@
         for (i = 0; basic_commands[i]; i++) {
                 if (!cmd_register(basic_commands[i])) {
-                        printf("Cannot register command %s\n",
+                        log(LF_OTHER, LVL_ERROR,
+                            "Cannot register command %s",
                             basic_commands[i]->name);
                 }
@@ -665 +667 @@
         unsigned int _len = (unsigned int) len;
         if ((_len != len) || (((int) _len) < 0)) {
-                printf("Command length overflow\n");
+                log(LF_OTHER, LVL_ERROR, "Command length overflow");
                 return 1;
         }