Skip to content
Snippets Groups Projects
Commit 98bd9c0c authored by John Hodge's avatar John Hodge
Browse files

Kernel/debug - Clean up Debug() method, bind to #define config

parent 7e9bbefb
No related merge requests found
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#define DEBUG_MAX_LINE_LEN 256 #define DEBUG_MAX_LINE_LEN 256
#define LOCK_DEBUG_OUTPUT 0 // Avoid interleaving of output lines? #define LOCK_DEBUG_OUTPUT 0 // Avoid interleaving of output lines?
#define TRACE_TO_KTERM 0 // Send ENTER/DEBUG/LEAVE to debug? #define TRACE_TO_KTERM 0 // Send ENTER/DEBUG/LEAVE/Debug to the VTerm
// === IMPORTS === // === IMPORTS ===
extern void KernelPanic_SetMode(void); extern void KernelPanic_SetMode(void);
...@@ -19,7 +19,6 @@ extern void VT_SetTerminal(int TerminalID); ...@@ -19,7 +19,6 @@ extern void VT_SetTerminal(int TerminalID);
// === PROTOTYPES === // === PROTOTYPES ===
static void Debug_Putchar(char ch); static void Debug_Putchar(char ch);
static void Debug_Puts(int bUseKTerm, const char *Str); static void Debug_Puts(int bUseKTerm, const char *Str);
void Debug_DbgOnlyFmt(const char *format, va_list args);
void Debug_FmtS(int bUseKTerm, const char *format, ...); void Debug_FmtS(int bUseKTerm, const char *format, ...);
bool Debug_Fmt(int bUseKTerm, const char *format, va_list args); bool Debug_Fmt(int bUseKTerm, const char *format, va_list args);
void Debug_SetKTerminal(const char *File); void Debug_SetKTerminal(const char *File);
...@@ -85,11 +84,6 @@ static void Debug_Puts(int UseKTerm, const char *Str) ...@@ -85,11 +84,6 @@ static void Debug_Puts(int UseKTerm, const char *Str)
} }
} }
void Debug_DbgOnlyFmt(const char *format, va_list args)
{
Debug_Fmt(0, format, args);
}
bool Debug_Fmt(int bUseKTerm, const char *format, va_list args) bool Debug_Fmt(int bUseKTerm, const char *format, va_list args)
{ {
char buf[DEBUG_MAX_LINE_LEN]; char buf[DEBUG_MAX_LINE_LEN];
...@@ -166,12 +160,11 @@ void Debug(const char *Fmt, ...) ...@@ -166,12 +160,11 @@ void Debug(const char *Fmt, ...)
SHORTLOCK(&glDebug_Lock); SHORTLOCK(&glDebug_Lock);
#endif #endif
Debug_Puts(0, "Debug: "); Debug_Puts(TRACE_TO_KTERM, "Debug: ");
va_start(args, Fmt); va_start(args, Fmt);
Debug_DbgOnlyFmt(Fmt, args); Debug_Fmt(TRACE_TO_KTERM, Fmt, args);
va_end(args); va_end(args);
Debug_PutCharDebug('\r'); Debug_Puts(TRACE_TO_KTERM, "\r\n");
Debug_PutCharDebug('\n');
#if LOCK_DEBUG_OUTPUT #if LOCK_DEBUG_OUTPUT
SHORTREL(&glDebug_Lock); SHORTREL(&glDebug_Lock);
#endif #endif
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment