- jtag minidriver work in progress

[fw/openocd] / src / helper / log.h

diff --git a/src/helper/log.h b/src/helper/log.h
index 422e2b5c0f406fb2019f8de03e7ab9ffc898b65f..6c7c3de68482cc4e4f900ac886af7b94ddba7f45 100644 (file)
--- a/src/helper/log.h
+++ b/src/helper/log.h
@@ -26,6 +26,9 @@
 #include <stdarg.h>
 
 /* logging priorities 
+ * LOG_USER - user messages. Could be anything from information 
+ *            to progress messags. These messages do not represent
+ *            incorrect or unexpected behaviour, just normal execution. 
  * LOG_ERROR - fatal errors, that are likely to cause program abort
  * LOG_WARNING - non-fatal errors, that may be resolved later
  * LOG_INFO - state information, etc.
@@ -33,6 +36,8 @@
  */
 enum log_levels
 {
+       LOG_OUTPUT = -2,
+       LOG_USER = -1,
        LOG_ERROR = 0,
        LOG_WARNING = 1,
        LOG_INFO = 2,
@@ -46,20 +51,33 @@ extern int log_register_commands(struct command_context_s *cmd_ctx);
 extern int log_init(struct command_context_s *cmd_ctx);
 extern int set_log_output(struct command_context_s *cmd_ctx, FILE *output);
 
-typedef void (*logCallback)(void *privData, const char *file, int line, 
+typedef void (*log_callback_fn)(void *priv, const char *file, int line,
                const char *function, const char *format, va_list args);
 
-void log_setCallback(logCallback callback, void *privData);            
+typedef struct log_callback_s
+{
+    log_callback_fn fn;
+       void *priv;
+    struct log_callback_s *next;
+} log_callback_t;
+
+extern int log_add_callback(log_callback_fn fn, void *priv);
+extern int log_remove_callback(log_callback_fn fn, void *priv);
+
+char *alloc_printf(const char *fmt, va_list ap);
 
 extern int debug_level;
 
+/* Avoid fn call and building parameter list if we're not outputting the information.
+ * Matters on feeble CPUs for DEBUG/INFO statements that are involved frequently */
+
 #define DEBUG(expr ...) \
-       do { \
+       do { if (debug_level >= LOG_DEBUG) \
                log_printf (LOG_DEBUG, __FILE__, __LINE__, __FUNCTION__, expr); \
        } while(0)
 
 #define INFO(expr ...) \
-       do { \
+       do { if (debug_level >= LOG_INFO) \
                log_printf (LOG_INFO, __FILE__, __LINE__, __FUNCTION__, expr); \
        } while(0)
 
@@ -73,6 +91,17 @@ extern int debug_level;
                log_printf (LOG_ERROR, __FILE__, __LINE__, __FUNCTION__, expr); \
        } while(0)
 
+#define USER(expr ...) \
+       do { \
+               log_printf (LOG_USER, __FILE__, __LINE__, __FUNCTION__, expr); \
+       } while(0)
+
+#define OUTPUT(expr ...) \
+       do { \
+               log_printf (LOG_OUTPUT, __FILE__, __LINE__, __FUNCTION__, expr); \
+       } while(0)
+
+
 /* general failures
  * error codes < 100
  */
@@ -81,6 +110,4 @@ extern int debug_level;
 #define ERROR_NO_CONFIG_FILE           (-2)
 #define ERROR_BUF_TOO_SMALL                    (-3)
 
-char *allocPrintf(const char *fmt, va_list ap);
-
 #endif /* LOG_H */