log: Update log_console to honour the log format

At present this just outputs the message. Update it to output whatever the
format requests.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/common/log_console.c b/common/log_console.c
index 5af73bd8be4f2c8f5c3abc6a9d7ba25ba83ea12e..290273307836265facbed6b110e644939235cbd7 100644 (file)
--- a/common/log_console.c
+++ b/common/log_console.c
@@ -10,9 +10,34 @@
 #include <common.h>
 #include <log.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 static int log_console_emit(struct log_device *ldev, struct log_rec *rec)
 {
-       puts(rec->msg);
+       int fmt = gd->log_fmt;
+
+       /*
+        * The output format is designed to give someone a fighting chance of
+        * figuring out which field is which:
+        *    - level is in CAPS
+        *    - cat is lower case and ends with comma
+        *    - file normally has a .c extension and ends with a colon
+        *    - line is integer and ends with a -
+        *    - function is an identifier and ends with ()
+        *    - message has a space before it unless it is on its own
+        */
+       if (fmt & (1 << LOGF_LEVEL))
+               printf("%s.", log_get_level_name(rec->level));
+       if (fmt & (1 << LOGF_CAT))
+               printf("%s,", log_get_cat_name(rec->cat));
+       if (fmt & (1 << LOGF_FILE))
+               printf("%s:", rec->file);
+       if (fmt & (1 << LOGF_LINE))
+               printf("%d-", rec->line);
+       if (fmt & (1 << LOGF_FUNC))
+               printf("%s()", rec->func);
+       if (fmt & (1 << LOGF_MSG))
+               printf("%s%s", fmt != (1 << LOGF_MSG) ? " " : "", rec->msg);
 
        return 0;
 }

diff --git a/test/py/tests/test_log.py b/test/py/tests/test_log.py
index fa9a25e8dc0c6c254750513151fd57e3120511cc..517f41514384f643613cbc2ce74e6820df7a9295 100644 (file)
--- a/test/py/tests/test_log.py
+++ b/test/py/tests/test_log.py
@@ -28,9 +28,9 @@ def test_log(u_boot_console):
         """
         for i in range(max_level):
             if mask & 1:
-                assert 'log %d' % i == lines.next()
+                assert 'log_run() log %d' % i == lines.next()
             if mask & 3:
-                assert '_log %d' % i == lines.next()
+                assert 'func() _log %d' % i == lines.next()
 
     def run_test(testnum):
         """Run a particular test number (the 'log test' command)