summaryrefslogtreecommitdiff
path: root/src/console
diff options
context:
space:
mode:
authorLuc Verhaegen <libv@skynet.be>2009-06-03 14:19:33 +0000
committerLuc Verhaegen <libv@skynet.be>2009-06-03 14:19:33 +0000
commita9c5ea08d07d343d32d4c083a232107bd84d8064 (patch)
treefbe58f136039f1c35ab5fea76fcd7970b63a3a3e /src/console
parent9efecc5408cb72d5e547736cba90c1814539a10c (diff)
downloadcoreboot-a9c5ea08d07d343d32d4c083a232107bd84d8064.tar.xz
Revert "CMOS: Add set_option and rework get_option."
This reverts commit eb7bb49eb5b48c39baf7a256b7c74e23e3da5660. Stepan pointed out that "s" means string, which makes the following statement in this commit message invalid: "Since we either have reserved space (which we shouldn't do anything with in these two functions), an enum or a hexadecimal value, unsigned int seemed like the way to go." Signed-off-by: Luc Verhaegen <libv@skynet.be> Acked-by: Luc Verhaegen <libv@skynet.be> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4335 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/console')
-rw-r--r--src/console/console.c7
-rw-r--r--src/console/printk.c11
-rw-r--r--src/console/uart8250_console.c4
3 files changed, 15 insertions, 7 deletions
diff --git a/src/console/console.c b/src/console/console.c
index cf6521675a..aeccc14433 100644
--- a/src/console/console.c
+++ b/src/console/console.c
@@ -14,10 +14,9 @@ static int initialized;
void console_init(void)
{
struct console_driver *driver;
-
- if (get_option("debug_level", &console_loglevel))
- console_loglevel = DEFAULT_CONSOLE_LOGLEVEL;
-
+ if(get_option(&console_loglevel, "debug_level"))
+ 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 0f7e491e86..01a52afc4c 100644
--- a/src/console/printk.c
+++ b/src/console/printk.c
@@ -9,9 +9,18 @@
#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 */
-unsigned int console_loglevel = DEFAULT_CONSOLE_LOGLEVEL;
+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;
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 78921c3059..37364e710d 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};
- unsigned int b_index=0;
+ int b_index=0;
unsigned int divisor=TTYS0_DIV;
- if(!get_option("baud_rate", &b_index)) {
+ if(get_option(&b_index,"baud_rate")==0) {
divisor=div[b_index];
}
uart8250_init(TTYS0_BASE, divisor, TTYS0_LCS);