GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CONFIG_PCI_ROM_RUN 

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1874 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Yinghai Lu 2005-01-14 21:54:16 +00:00
parent 8e51b8a372
commit 688238a50c
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/config/Options.lb
View File

@ -763,6 +763,12 @@ define AGP_APERTURE_SIZE
comment "AGP graphics virtual memory aperture size" comment "AGP graphics virtual memory aperture size"
end end
define CONFIG_PCI_ROM_RUN
default 0
export always
comment "Init PCI device option rom"
end
############################################### ###############################################
# Board specific options # Board specific options
############################################### ###############################################

24
src/console/vga_console.c
View File

@ -10,11 +10,15 @@
#include <pc80/vga.h> #include <pc80/vga.h>
#include <console/console.h> #include <console/console.h>
void beep(int ms); //extern void beep(int ms);
static char *vidmem; /* The video buffer, should be replaced by symbol in ldscript.ld */ static char *vidmem; /* The video buffer, should be replaced by symbol in ldscript.ld */
int vga_line, vga_col; int vga_line, vga_col;
extern int vga_inited; // it will be changed in pci_rom.c
static int vga_console_inited = 0;
#define VIDBUFFER 0xB8000; #define VIDBUFFER 0xB8000;
static void memsetw(void *s, int c, unsigned int n) static void memsetw(void *s, int c, unsigned int n)
@ -29,7 +33,6 @@ static void memsetw(void *s, int c, unsigned int n)
static void vga_init(void) static void vga_init(void)
{ {
// these are globals // these are globals
vga_line = 0; vga_line = 0;
vga_col = 0; vga_col = 0;
@ -56,6 +59,15 @@ static void vga_scroll(void)
static void vga_tx_byte(unsigned char byte) static void vga_tx_byte(unsigned char byte)
{ {
if (!vga_inited) {
return;
}
if(!vga_console_inited) {
vga_init();
vga_console_inited = 1;
}
if (byte == '\n') { if (byte == '\n') {
vga_line++; vga_line++;
vga_col = 0; vga_col = 0;
@ -71,8 +83,8 @@ static void vga_tx_byte(unsigned char byte)
} else if (byte == '\a') { } else if (byte == '\a') {
//beep //beep
beep(500); // beep(500);
;
} else { } else {
vidmem[((vga_col + (vga_line *COLS)) * 2)] = byte; vidmem[((vga_col + (vga_line *COLS)) * 2)] = byte;
vidmem[((vga_col + (vga_line *COLS)) * 2) +1] = VGA_ATTR_CLR_WHT; vidmem[((vga_col + (vga_line *COLS)) * 2) +1] = VGA_ATTR_CLR_WHT;
@ -94,8 +106,8 @@ static void vga_tx_byte(unsigned char byte)
write_crtc((vga_col + (vga_line *COLS)) & 0x0ff, CRTC_CURSOR_LO); write_crtc((vga_col + (vga_line *COLS)) & 0x0ff, CRTC_CURSOR_LO);
} }
struct console_driver { static struct console_driver vga_console __console ={
.init = vga_init, .init = 0,
.tx_byte = vga_tx_byte, .tx_byte = vga_tx_byte,
.rx_byte = 0, .rx_byte = 0,
.tst_byte = 0, .tst_byte = 0,