Merge https://source.denx.de/u-boot/custodians/u-boot-pmic

[J-u-boot.git] / common / log_console.c

diff --git a/common/log_console.c b/common/log_console.c
index 5af73bd8be4f2c8f5c3abc6a9d7ba25ba83ea12e..f1dcc04b97c915668613ee15959dae53247d8d15 100644 (file)
--- a/common/log_console.c
+++ b/common/log_console.c
@@ -1,18 +1,47 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Logging support
  *
  * Copyright (c) 2017 Google, Inc
  * Written by Simon Glass <[email protected]>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.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;
+       bool add_space = false;
+
+       /*
+        * 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 (!(rec->flags & LOGRECF_CONT) && fmt != BIT(LOGF_MSG)) {
+               add_space = true;
+               if (fmt & BIT(LOGF_LEVEL))
+                       printf("%s.", log_get_level_name(rec->level));
+               if (fmt & BIT(LOGF_CAT))
+                       printf("%s,", log_get_cat_name(rec->cat));
+               if (fmt & BIT(LOGF_FILE))
+                       printf("%s:", rec->file);
+               if (fmt & BIT(LOGF_LINE))
+                       printf("%d-", rec->line);
+               if (fmt & BIT(LOGF_FUNC))
+                       printf("%*s()", CONFIG_LOGF_FUNC_PAD, rec->func);
+       }
+       if (fmt & BIT(LOGF_MSG))
+               printf("%s%s", add_space ? " " : "", rec->msg);
 
        return 0;
 }
@@ -20,4 +49,5 @@ static int log_console_emit(struct log_device *ldev, struct log_rec *rec)
 LOG_DRIVER(console) = {
        .name   = "console",
        .emit   = log_console_emit,
+       .flags  = LOGDF_ENABLE,
 };