diff options
Diffstat (limited to 'src/console')
-rw-r--r-- | src/console/console.c | 7 | ||||
-rw-r--r-- | src/console/printk.c | 11 | ||||
-rw-r--r-- | src/console/uart8250_console.c | 4 |
3 files changed, 7 insertions, 15 deletions
diff --git a/src/console/console.c b/src/console/console.c index aeccc14433..cf6521675a 100644 --- a/src/console/console.c +++ b/src/console/console.c @@ -14,9 +14,10 @@ static int initialized; void console_init(void) { struct console_driver *driver; - if(get_option(&console_loglevel, "debug_level")) - console_loglevel=DEFAULT_CONSOLE_LOGLEVEL; - + + if (get_option("debug_level", &console_loglevel)) + console_loglevel = DEFAULT_CONSOLE_LOGLEVEL; + for(driver = console_drivers; driver < econsole_drivers; driver++) { if (!driver->init) continue; diff --git a/src/console/printk.c b/src/console/printk.c index 01a52afc4c..0f7e491e86 100644 --- a/src/console/printk.c +++ b/src/console/printk.c @@ -9,18 +9,9 @@ #include <smp/spinlock.h> #include <console/console.h> -/* printk's without a loglevel use this.. */ -#define DEFAULT_MESSAGE_LOGLEVEL 4 /* BIOS_WARNING */ - -/* We show everything that is MORE important than this.. */ -#define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ - /* Keep together for sysctl support */ -int console_loglevel = DEFAULT_CONSOLE_LOGLEVEL; -int default_message_loglevel = DEFAULT_MESSAGE_LOGLEVEL; -int minimum_console_loglevel = MINIMUM_CONSOLE_LOGLEVEL; -int default_console_loglevel = DEFAULT_CONSOLE_LOGLEVEL; +unsigned int console_loglevel = DEFAULT_CONSOLE_LOGLEVEL; void display(char*); extern int vtxprintf(void (*)(unsigned char), const char *, va_list); diff --git a/src/console/uart8250_console.c b/src/console/uart8250_console.c index 37364e710d..78921c3059 100644 --- a/src/console/uart8250_console.c +++ b/src/console/uart8250_console.c @@ -29,10 +29,10 @@ static void ttyS0_init(void) { static const unsigned char div[8]={1,2,3,6,12,24,48,96}; - int b_index=0; + unsigned int b_index=0; unsigned int divisor=TTYS0_DIV; - if(get_option(&b_index,"baud_rate")==0) { + if(!get_option("baud_rate", &b_index)) { divisor=div[b_index]; } uart8250_init(TTYS0_BASE, divisor, TTYS0_LCS); |