diff options
| author | Stefan Reinauer <stepan@openbios.org> | 2005-12-02 21:52:30 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2005-12-02 21:52:30 +0000 |
| commit | 7ce8c54e2ba89059d28790550a8f74907b54b916 (patch) | |
| tree | e89df947fbe9e3f85d6082af6926038e9fe8e61a /src/console | |
| parent | c2455dc0ce210b3da2b14be8885803ff47a781eb (diff) | |
| download | coreboot-7ce8c54e2ba89059d28790550a8f74907b54b916.tar.xz | |
1201_ht_bus0_dev0_fidvid_core.diff
https://openbios.org/roundup/linuxbios/issue41
Lord have mercy upon us.
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2118 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/console')
| -rw-r--r-- | src/console/console.c | 5 | ||||
| -rw-r--r-- | src/console/printk.c | 2 | ||||
| -rw-r--r-- | src/console/vga_console.c | 6 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/console/console.c b/src/console/console.c index 7f97b5c95f..86ec26d312 100644 --- a/src/console/console.c +++ b/src/console/console.c @@ -16,7 +16,7 @@ void console_init(void) struct console_driver *driver; if(get_option(&console_loglevel, "debug_level")) console_loglevel=DEFAULT_CONSOLE_LOGLEVEL; - + for(driver = console_drivers; driver < econsole_drivers; driver++) { if (!driver->init) continue; @@ -57,9 +57,10 @@ unsigned char console_rx_byte(void) struct console_driver *driver; if (!initialized) return 0; - for(driver = console_drivers; driver < econsole_drivers; driver++) + for(driver = console_drivers; driver < econsole_drivers; driver++) { if (driver->tst_byte) break; + } if (driver == econsole_drivers) return 0; while (!driver->tst_byte()); diff --git a/src/console/printk.c b/src/console/printk.c index da330c932b..01a52afc4c 100644 --- a/src/console/printk.c +++ b/src/console/printk.c @@ -25,7 +25,7 @@ int default_console_loglevel = DEFAULT_CONSOLE_LOGLEVEL; void display(char*); extern int vtxprintf(void (*)(unsigned char), const char *, va_list); -spinlock_t console_lock = SPIN_LOCK_UNLOCKED; +static spinlock_t console_lock = SPIN_LOCK_UNLOCKED; int do_printk(int msg_level, const char *fmt, ...) { diff --git a/src/console/vga_console.c b/src/console/vga_console.c index bdd56f3923..e9756c8996 100644 --- a/src/console/vga_console.c +++ b/src/console/vga_console.c @@ -15,11 +15,7 @@ static char *vidmem; int vga_line, vga_col; -#if CONFIG_CONSOLE_VGA == 1 -extern int vga_inited; // it will be changed in pci_rom.c -#else -int vga_inited = 0; -#endif +int vga_inited = 0; // it will be changed in pci_rom.c static int vga_console_inited = 0; |