diff options
author | Patrick Georgi <patrick.georgi@secunet.com> | 2012-11-22 12:46:12 +0100 |
---|---|---|
committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2012-11-24 20:11:46 +0100 |
commit | 199b09cb7a3c590ccbf8d705c98cfde101378f20 (patch) | |
tree | 058511a1a638aa892c836a584633e155aaf0ebe6 /src/northbridge/via/vx800 | |
parent | 503af721a1f2c831fb360d1c1b2af38e0866fc35 (diff) |
x86 realmode: Use x86emu register file + defines
By using the (global) register file as defined by x86emu,
we can use the same register access for YABEL and realmode
interrupt handlers.
- the x86 realmode interrupt handlers changed in signature
- to access registers, use X86_$REGNAME now (eg. X86_EAX)
- x86_exception_handler still uses struct eregs *regs to
avoid spilling the x86emu register file stuff everywhere
Coccinelle script that handled most of this commit:
@ inthandler @
identifier FUNC, regs;
@@
int FUNC(
-struct eregs *regs
+void
)
{ ... }
@ depends on inthandler @
identifier regs;
@@
-regs->eax
+X86_EAX
@ depends on inthandler @
identifier regs;
@@
-regs->ebx
+X86_EBX
@ depends on inthandler @
identifier regs;
@@
-regs->ecx
+X86_ECX
@ depends on inthandler @
identifier regs;
@@
-regs->edx
+X86_EDX
@ depends on inthandler @
identifier regs;
@@
-regs->esi
+X86_ESI
@ depends on inthandler @
identifier regs;
@@
-regs->edi
+X86_EDI
@ depends on inthandler @
identifier regs;
@@
-regs->eflags
+X86_EFLAGS
@ depends on inthandler @
identifier regs;
@@
-regs->vector
+M.x86.intno
Change-Id: I60cc2c36646fe4b7f97457b1e297e3df086daa36
Signed-off-by: Patrick Georgi <patrick.georgi@secunet.com>
Reviewed-on: http://review.coreboot.org/1891
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/northbridge/via/vx800')
-rw-r--r-- | src/northbridge/via/vx800/vga.c | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/src/northbridge/via/vx800/vga.c b/src/northbridge/via/vx800/vga.c index be522f884c..319dbda7de 100644 --- a/src/northbridge/via/vx800/vga.c +++ b/src/northbridge/via/vx800/vga.c @@ -33,6 +33,7 @@ #include <cpu/x86/mtrr.h> #include <cpu/x86/msr.h> #include <arch/interrupt.h> +#include <x86emu/regs.h> #if CONFIG_PCI_OPTION_ROM_RUN_REALMODE #include <devices/oprom/realmode/x86.h> #endif @@ -50,14 +51,14 @@ #define VIACONFIG_VGA_PCI_10 0xf8000008 #define VIACONFIG_VGA_PCI_14 0xfc000000 -static int via_vx800_int15_handler(struct eregs *regs) +static int via_vx800_int15_handler(void) { int res=0; printk(BIOS_DEBUG, "via_vx800_int15_handler\n"); - switch(regs->eax & 0xffff) { + switch(X86_EAX & 0xffff) { case 0x5f19: - regs->eax=0x5f; - regs->ecx=0x03; + X86_EAX=0x5f; + X86_ECX=0x03; res=1; break; case 0x5f18: @@ -84,44 +85,44 @@ static int via_vx800_int15_handler(struct eregs *regs) i = (i & 0x70); i = i >> 4; if (i == 0) { - regs->eax = 0x00; //not support 5f18 + X86_EAX = 0x00; //not support 5f18 break; } i = i + 2; - regs->ebx = (u32) i; + X86_EBX = (u32) i; i = pci_read_config8(dev, 0x90); i = (i & 0x07); i = i + 3; i = i << 4; - regs->ebx = regs->ebx + ((u32) i); - regs->eax = 0x5f; + X86_EBX = X86_EBX + ((u32) i); + X86_EAX = 0x5f; res = 1; break; } case 0x5f00: - regs->eax = 0x005f; + X86_EAX = 0x005f; res = 1; break; case 0x5f01: - regs->eax = 0x5f; - regs->ecx = (regs->ecx & 0xffffff00 ) | 2; // panel type = 2 = 1024 * 768 + X86_EAX = 0x5f; + X86_ECX = (X86_ECX & 0xffffff00 ) | 2; // panel type = 2 = 1024 * 768 res = 1; break; case 0x5f02: - regs->eax=0x5f; - regs->ebx= (regs->ebx & 0xffff0000) | 2; - regs->ecx= (regs->ecx & 0xffff0000) | 0x401; // PAL + crt only - regs->edx= (regs->edx & 0xffff0000) | 0; // TV Layout - default + X86_EAX=0x5f; + X86_EBX= (X86_EBX & 0xffff0000) | 2; + X86_ECX= (X86_ECX & 0xffff0000) | 0x401; // PAL + crt only + X86_EDX= (X86_EDX & 0xffff0000) | 0; // TV Layout - default res=1; break; case 0x5f0f: - regs->eax = 0x005f; + X86_EAX = 0x005f; res = 1; break; default: printk(BIOS_DEBUG, "Unknown INT15 function %04x!\n", - regs->eax & 0xffff); - regs->eax = 0; + X86_EAX & 0xffff); + X86_EAX = 0; break; } return res; |