- added patch to Improving progress/error output for telnet & GDB monitor

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

diff --git a/src/helper/log.h b/src/helper/log.h
index 6e799ad36f933252e5c8f2b6428557595624087f..34646e70217374539ef21dee2e1c57554333d8c4 100644 (file)
--- a/src/helper/log.h
+++ b/src/helper/log.h
@@ -44,6 +44,12 @@ extern void log_printf(enum log_levels level, const char *file, int line,
        __attribute__ ((format (printf, 5, 6)));
 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, 
+               const char *function, const char *format, va_list args);
+
+void log_setCallback(logCallback callback, void *privData);            
 
 extern int debug_level;
 
@@ -67,25 +73,6 @@ extern int debug_level;
                log_printf (LOG_ERROR, __FILE__, __LINE__, __FUNCTION__, expr); \
        } while(0)
 
-#define SDEBUG(expr ...) \
-       do { \
-               short_log_printf (LOG_DEBUG, expr); \
-       } while(0)
-
-#define SINFO(expr ...) \
-       do { \
-               short_log_printf (LOG_INFO, expr); \
-       } while(0)
-
-#define SWARNING(expr ...) \
-       do { \
-               short_log_printf (LOG_WARNING, expr); \
-       } while(0)
-
-#define SERROR(expr ...) \
-       do { \
-               short_log_printf (LOG_ERROR, expr); \
-       } while(0)
 
 /* general failures
  * error codes < 100
@@ -95,4 +82,7 @@ extern int debug_level;
 #define ERROR_NO_CONFIG_FILE           (-2)
 #define ERROR_BUF_TOO_SMALL                    (-3)
 
-#endif /* ERROR_H */
+char *allocPrintf(const char *fmt, va_list ap);
+
+
+#endif /* LOG_H */