i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fixed settings evaluation.

Browse Source 
* exchanged sBlueScreenEnabled and sBlueScreenOutput (so that they better
  match the sSerialDebugEnabled and sSyslogDebugEnabled variables).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16077 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-01-24 21:52:53 +00:00
parent ad4afa7409
commit 7f370a1f89
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/debug/debug.c
+19 -19
View File
@@ -44,8 +44,8 @@ int dbg_register_file[B_MAX_CPU_COUNT][14];
static bool sSerialDebugEnabled = false; static bool sSerialDebugEnabled = false;
static bool sSyslogOutputEnabled = false; static bool sSyslogOutputEnabled = false;
static bool sBlueScreenEnabled = true; static bool sBlueScreenEnabled = false;
static bool sBlueScreenOutput = false; static bool sBlueScreenOutput = true;
static spinlock sSpinlock = 0; static spinlock sSpinlock = 0;
static int32 sDebuggerOnCPU = -1; static int32 sDebuggerOnCPU = -1;
@@ -107,7 +107,7 @@ kputchar(char c)
{ {
if (sSerialDebugEnabled) if (sSerialDebugEnabled)
arch_debug_serial_putchar(c); arch_debug_serial_putchar(c);
if (sBlueScreenOutput) if (sBlueScreenEnabled)
blue_screen_putchar(c); blue_screen_putchar(c);
} }
@@ -117,7 +117,7 @@ kputs(const char *s)
{ {
if (sSerialDebugEnabled) if (sSerialDebugEnabled)
arch_debug_serial_puts(s); arch_debug_serial_puts(s);
if (sBlueScreenOutput) if (sBlueScreenEnabled)
blue_screen_puts(s); blue_screen_puts(s);
} }
@@ -131,7 +131,7 @@ read_line(char *buffer, int32 maxLength)
char c; char c;
char (*readChar)(void); char (*readChar)(void);
if (sBlueScreenEnabled) if (sBlueScreenOutput)
readChar = blue_screen_getchar; readChar = blue_screen_getchar;
else else
readChar = arch_debug_serial_getchar; readChar = arch_debug_serial_getchar;
@@ -215,7 +215,7 @@ read_line(char *buffer, int32 maxLength)
break; break;
case '$': case '$':
case '+': case '+':
if (!sBlueScreenEnabled) { if (!sBlueScreenOutput) {
/* HACK ALERT!!! /* HACK ALERT!!!
* *
* If we get a $ at the beginning of the line * If we get a $ at the beginning of the line
@@ -596,18 +596,18 @@ debug_init_post_vm(kernel_args *args)
// get debug settings // get debug settings
handle = load_driver_settings("kernel"); handle = load_driver_settings("kernel");
if (handle != NULL) { if (handle != NULL) {
if (get_driver_boolean_parameter(handle, "serial_debug_output", true, true)) sSerialDebugEnabled = get_driver_boolean_parameter(handle,
sSerialDebugEnabled = true; "serial_debug_output", true, true);
if (get_driver_boolean_parameter(handle, "syslog_debug_output", false, false)) sSyslogOutputEnabled = get_driver_boolean_parameter(handle,
sSyslogOutputEnabled = true; "syslog_debug_output", false, false);
if (get_driver_boolean_parameter(handle, "bluescreen", true, true)) sBlueScreenOutput = get_driver_boolean_parameter(handle,
sBlueScreenEnabled = true; "bluescreen", true, true);
unload_driver_settings(handle); unload_driver_settings(handle);
} }
if (sBlueScreenEnabled && blue_screen_init() != B_OK) if (sBlueScreenOutput && blue_screen_init() != B_OK)
sBlueScreenEnabled = false; sBlueScreenOutput = false;
syslog_init(); syslog_init();
@@ -732,8 +732,8 @@ kernel_debugger(const char *message)
smp_send_broadcast_ici(SMP_MSG_CPU_HALT, 0, 0, 0, NULL, SMP_MSG_FLAG_SYNC); smp_send_broadcast_ici(SMP_MSG_CPU_HALT, 0, 0, 0, NULL, SMP_MSG_FLAG_SYNC);
} }
if (sBlueScreenEnabled) { if (sBlueScreenOutput) {
sBlueScreenOutput = true; sBlueScreenEnabled = true;
blue_screen_enter(); blue_screen_enter();
} }
@@ -742,7 +742,7 @@ kernel_debugger(const char *message)
kernel_debugger_loop(); kernel_debugger_loop();
sBlueScreenOutput = false; sBlueScreenEnabled = false;
restore_interrupts(state); restore_interrupts(state);
// ToDo: in case we change dbg_register_file - don't we want to restore it? // ToDo: in case we change dbg_register_file - don't we want to restore it?
@@ -784,7 +784,7 @@ dprintf(const char *format, ...)
arch_debug_serial_puts(sOutputBuffer); arch_debug_serial_puts(sOutputBuffer);
if (sSyslogOutputEnabled) if (sSyslogOutputEnabled)
syslog_write(sOutputBuffer, length); syslog_write(sOutputBuffer, length);
if (sBlueScreenOutput) if (sBlueScreenEnabled)
blue_screen_puts(sOutputBuffer); blue_screen_puts(sOutputBuffer);
release_spinlock(&sSpinlock); release_spinlock(&sSpinlock);
@@ -809,7 +809,7 @@ kprintf(const char *format, ...)
if (sSerialDebugEnabled) if (sSerialDebugEnabled)
arch_debug_serial_puts(sOutputBuffer); arch_debug_serial_puts(sOutputBuffer);
if (sBlueScreenOutput) if (sBlueScreenEnabled)
blue_screen_puts(sOutputBuffer); blue_screen_puts(sOutputBuffer);
} }