log: fixup log_head after relocating global data

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

diff --git a/include/log.h b/include/log.h
index 8f35c10abb5e28f9c46793e581cc0abbcee0ca03..fc0d59844728323474120de5f74180932845dbc7 100644 (file)
--- a/include/log.h
+++ b/include/log.h
@@ -100,6 +100,10 @@ enum log_category_t {
        LOGC_BOOT,
        /** @LOGC_EVENT: Related to event and event handling */
        LOGC_EVENT,
+       /** @LOGC_FS: Related to filesystems */
+       LOGC_FS,
+       /** @LOGC_EXPO: Related to expo handling */
+       LOGC_EXPO,
        /** @LOGC_COUNT: Number of log categories */
        LOGC_COUNT,
        /** @LOGC_END: Sentinel value for lists of log categories */
@@ -130,18 +134,6 @@ int _log(enum log_category_t cat, enum log_level_t level, const char *file,
         int line, const char *func, const char *fmt, ...)
                __attribute__ ((format (__printf__, 6, 7)));
 
-static inline int _log_nop(enum log_category_t cat, enum log_level_t level,
-                          const char *file, int line, const char *func,
-                          const char *fmt, ...)
-               __attribute__ ((format (__printf__, 6, 7)));
-
-static inline int _log_nop(enum log_category_t cat, enum log_level_t level,
-                          const char *file, int line, const char *func,
-                          const char *fmt, ...)
-{
-       return 0;
-}
-
 /**
  * _log_buffer - Internal function to print data buffer in hex and ascii form
  *
@@ -194,6 +186,9 @@ int _log_buffer(enum log_category_t cat, enum log_level_t level,
 
 #ifdef LOG_DEBUG
 #define _LOG_DEBUG     LOGL_FORCE_DEBUG
+#ifndef DEBUG
+#define DEBUG
+#endif
 #else
 #define _LOG_DEBUG     0
 #endif
@@ -237,12 +232,6 @@ int _log_buffer(enum log_category_t cat, enum log_level_t level,
        })
 #endif
 
-#define log_nop(_cat, _level, _fmt, _args...) ({ \
-       int _l = _level; \
-       _log_nop((enum log_category_t)(_cat), _l, __FILE__, __LINE__, \
-                     __func__, pr_fmt(_fmt), ##_args); \
-})
-
 #ifdef DEBUG
 #define _DEBUG 1
 #else
@@ -337,7 +326,10 @@ void __assert_fail(const char *assertion, const char *file, unsigned int line,
  *
  * or:
  *
- *     return log_msg_ret("fred failed", fred_call());
+ *     return log_msg_ret("get", fred_call());
+ *
+ * It is recommended to use <= 3 characters for the name since this will only
+ * use 4 bytes in rodata
  */
 #define log_ret(_ret) ({ \
        int __ret = (_ret); \
@@ -696,4 +688,16 @@ static inline int log_get_default_format(void)
               (IS_ENABLED(CONFIG_LOGF_FUNC) ? BIT(LOGF_FUNC) : 0);
 }
 
+struct global_data;
+/**
+ * log_fixup_for_gd_move() - Handle global_data moving to a new place
+ *
+ * @new_gd: Pointer to the new global data
+ *
+ * The log_head list is part of global_data. Due to the way lists work, moving
+ * the list will cause it to become invalid. This function fixes that up so
+ * that the log_head list will work correctly.
+ */
+void log_fixup_for_gd_move(struct global_data *new_gd);
+
 #endif