Audit and remove redundant uses of replacements.h in the tree.

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

diff --git a/src/helper/log.h b/src/helper/log.h
index afe5da893ca2f156a4d4d570f42f7c92b7178a39..1a032b26151171b670ab80dd713387083394cb30 100644 (file)
--- a/src/helper/log.h
+++ b/src/helper/log.h
@@ -2,6 +2,12 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
+ *   Copyright (C) 2008 by Spencer Oliver                                  *
+ *   spen@spen-soft.co.uk                                                  *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -20,11 +26,8 @@
 #ifndef ERROR_H
 #define ERROR_H
 
-#include "replacements.h"
 #include "command.h"
 
-#include <stdarg.h>
-
 /* logging priorities 
  * LOG_LVL_SILENT - turn off all output. In lieu of try+catch this can be used as a 
  *                  feeble ersatz.
@@ -56,8 +59,10 @@ __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);
-extern void keep_alive();
-extern void kept_alive();
+extern void keep_alive(void);
+extern void kept_alive(void);
+extern void alive_sleep(int ms);
+extern void busy_sleep(int ms);
 
 typedef void (*log_callback_fn)(void *priv, const char *file, int line,
                const char *function, const char *string);
@@ -80,6 +85,7 @@ 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 LOG_LEVEL_IS( FOO )  ((debug_level) >= (FOO))
 
 #define LOG_DEBUG(expr ...) \
                ((debug_level >= LOG_LVL_DEBUG) ? log_printf_lf (LOG_LVL_DEBUG, __FILE__, __LINE__, __FUNCTION__, expr) , 0 : 0)
@@ -115,6 +121,6 @@ extern int debug_level;
 /* see "Error:" log entry for meaningful message to the user. The caller should 
  * make no assumptions about what went wrong and try to handle the problem.
  */
-#define ERROR_FAIL                             (-4)
+#define ERROR_FAIL                                     (-4)
 
 #endif /* LOG_H */