Merge git://git.denx.de/u-boot-sunxi

[platform/kernel/u-boot.git] / include / log.h

diff --git a/include/log.h b/include/log.h
index 653fb8d..a872fc6 100644 (file)
--- a/include/log.h
+++ b/include/log.h
@@ -39,16 +39,17 @@ enum log_level_t {
 enum log_category_t {
        LOGC_FIRST = 0, /* First part mirrors UCLASS_... */
 
-       LOGC_NONE = UCLASS_COUNT,
-       LOGC_ARCH,
-       LOGC_BOARD,
-       LOGC_CORE,
+       LOGC_NONE = UCLASS_COUNT,       /* First number is after all uclasses */
+       LOGC_ARCH,      /* Related to arch-specific code */
+       LOGC_BOARD,     /* Related to board-specific code */
+       LOGC_CORE,      /* Related to core features (non-driver-model) */
        LOGC_DM,        /* Core driver-model */
        LOGC_DT,        /* Device-tree */
        LOGC_EFI,       /* EFI implementation */
+       LOGC_ALLOC,     /* Memory allocation */
 
-       LOGC_COUNT,
-       LOGC_END,
+       LOGC_COUNT,     /* Number of log categories */
+       LOGC_END,       /* Sentinel value for a list of log categories */
 };
 
 /* Helper to cast a uclass ID to a log category */
@@ -88,8 +89,22 @@ int _log(enum log_category_t cat, enum log_level_t level, const char *file,
  */
 #if CONFIG_IS_ENABLED(LOG)
 #define _LOG_MAX_LEVEL CONFIG_VAL(LOG_MAX_LEVEL)
+#define log_err(_fmt...)       log(LOG_CATEGORY, LOGL_ERR, ##_fmt)
+#define log_warning(_fmt...)   log(LOG_CATEGORY, LOGL_WARNING, ##_fmt)
+#define log_notice(_fmt...)    log(LOG_CATEGORY, LOGL_NOTICE, ##_fmt)
+#define log_info(_fmt...)      log(LOG_CATEGORY, LOGL_INFO, ##_fmt)
+#define log_debug(_fmt...)     log(LOG_CATEGORY, LOGL_DEBUG, ##_fmt)
+#define log_content(_fmt...)   log(LOG_CATEGORY, LOGL_DEBUG_CONTENT, ##_fmt)
+#define log_io(_fmt...)                log(LOG_CATEGORY, LOGL_DEBUG_IO, ##_fmt)
 #else
 #define _LOG_MAX_LEVEL LOGL_INFO
+#define log_err(_fmt...)
+#define log_warning(_fmt...)
+#define log_notice(_fmt...)
+#define log_info(_fmt...)
+#define log_debug(_fmt...)
+#define log_content(_fmt...)
+#define log_io(_fmt...)
 #endif
 
 /* Emit a log record if the level is less that the maximum */
@@ -175,7 +190,7 @@ void __assert_fail(const char *assertion, const char *file, unsigned int line,
        })
 #else
 #define log_ret(_ret) (_ret)
-#define log_msg_ret(_ret) (_ret)
+#define log_msg_ret(_msg, _ret) (_ret)
 #endif
 
 /**