diff options
| author | Li-Ta Lo <ollie@lanl.gov> | 2005-01-11 22:48:54 +0000 |
|---|---|---|
| committer | Li-Ta Lo <ollie@lanl.gov> | 2005-01-11 22:48:54 +0000 |
| commit | 515f6c729e0b4878884e74e21d00dbc4b66dcdd9 (patch) | |
| tree | 82879fb1f10c07a85c573bca92410bdc6c874e3d /src/devices/emulator | |
| parent | 51990b350a03eb718f6af0890a2f9a42373106ca (diff) | |
works for PCI vga cards too
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1856 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/devices/emulator')
| -rw-r--r-- | src/devices/emulator/biosemu.c | 23 | ||||
| -rw-r--r-- | src/devices/emulator/pcbios/pcibios.c | 2 | ||||
| -rw-r--r-- | src/devices/emulator/x86emu/sys.c | 4 |
3 files changed, 14 insertions, 15 deletions
diff --git a/src/devices/emulator/biosemu.c b/src/devices/emulator/biosemu.c index 02884035a5..c1f48a28b9 100644 --- a/src/devices/emulator/biosemu.c +++ b/src/devices/emulator/biosemu.c @@ -46,8 +46,8 @@ int run_bios_int(int num) X86_CS = MEM_RW((num << 2) + 2); X86_IP = MEM_RW(num << 2); - printk_debug("%s: INT %x CS:IP = %x:%x\n", __FUNCTION__, - num, MEM_RW((num << 2) + 2), MEM_RW(num << 2)); + //printk_debug("%s: INT %x CS:IP = %x:%x\n", __FUNCTION__, + // num, MEM_RW((num << 2) + 2), MEM_RW(num << 2)); return 1; } @@ -58,8 +58,8 @@ u8 x_inb(u16 port) val = inb(port); - if (port != 0x40) - printk_debug("inb(0x%04x) = 0x%02x\n", port, val); + //if (port != 0x40) + // printk_debug("inb(0x%04x) = 0x%02x\n", port, val); return val; } @@ -70,7 +70,7 @@ u16 x_inw(u16 port) val = inw(port); - printk_debug("inw(0x%04x) = 0x%04x\n", port, val); + //printk_debug("inw(0x%04x) = 0x%04x\n", port, val); return val; } @@ -80,26 +80,26 @@ u32 x_inl(u16 port) val = inl(port); - printk_debug("inl(0x%04x) = 0x%08x\n", port, val); + //printk_debug("inl(0x%04x) = 0x%08x\n", port, val); return val; } void x_outb(u16 port, u8 val) { - if (port != 0x43) - printk_debug("outb(0x%02x, 0x%04x)\n", val, port); + //if (port != 0x43) + // printk_debug("outb(0x%02x, 0x%04x)\n", val, port); outb(val, port); } void x_outw(u16 port, u16 val) { - printk_debug("outw(0x%04x, 0x%04x)\n", val, port); + //printk_debug("outw(0x%04x, 0x%04x)\n", val, port); outw(val, port); } void x_outl(u16 port, u32 val) { - printk_debug("outl(0x%08x, 0x%04x)\n", val, port); + //printk_debug("outl(0x%08x, 0x%04x)\n", val, port); outl(val, port); } @@ -116,7 +116,7 @@ void do_int(int num) { int ret = 0; - printk_debug("int%x vector at %x\n", num, getIntVect(num)); + //printk_debug("int%x vector at %x\n", num, getIntVect(num)); switch (num) { #ifndef _PC @@ -143,6 +143,7 @@ void do_int(int num) break; case 0x1A: ret = pcibios_handler(); + ret = 1; break; case 0xe6: //ret = intE6_handler(); diff --git a/src/devices/emulator/pcbios/pcibios.c b/src/devices/emulator/pcbios/pcibios.c index 74d25dc627..1517d2a7fb 100644 --- a/src/devices/emulator/pcbios/pcibios.c +++ b/src/devices/emulator/pcbios/pcibios.c @@ -12,8 +12,6 @@ int pcibios_handler() int i, ret = 0; struct device *dev = 0; - printk_debug("%s AX = %x\n", __func__, X86_AX); - switch (X86_AX) { case PCI_BIOS_PRESENT: X86_AH = 0x00; /* no config space/special cycle support */ diff --git a/src/devices/emulator/x86emu/sys.c b/src/devices/emulator/x86emu/sys.c index 2b437bff80..7669c29d9c 100644 --- a/src/devices/emulator/x86emu/sys.c +++ b/src/devices/emulator/x86emu/sys.c @@ -205,8 +205,8 @@ u8 *mem_ptr(u32 addr, int size) } else #endif if (addr < 0x200) { - printk("%x:%x updating int vector 0x%x\n", - M.x86.R_CS, M.x86.R_IP, addr >> 2); + //printk("%x:%x updating int vector 0x%x\n", + // M.x86.R_CS, M.x86.R_IP, addr >> 2); retaddr = (u8 *) (M.mem_base + addr); } else { |