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/cx700 | |
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/cx700')
-rw-r--r-- | src/northbridge/via/cx700/vga.c | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/src/northbridge/via/cx700/vga.c b/src/northbridge/via/cx700/vga.c index 658535d6aa..6b60354dd1 100644 --- a/src/northbridge/via/cx700/vga.c +++ b/src/northbridge/via/cx700/vga.c @@ -31,6 +31,7 @@ #include <cpu/x86/msr.h> #include <arch/interrupt.h> #include "registers.h" +#include <x86emu/regs.h> #if CONFIG_PCI_OPTION_ROM_RUN_REALMODE #include <devices/oprom/realmode/x86.h> #endif @@ -44,7 +45,7 @@ #define CRTC_INDEX 0x3d4 #define CRTC_DATA 0x3d5 -static int via_cx700_int15_handler(struct eregs *regs) +static int via_cx700_int15_handler(void) { int res=0; u8 mem_speed; @@ -67,62 +68,62 @@ static int via_cx700_int15_handler(struct eregs *regs) printk(BIOS_DEBUG, "via_cx700_int15_handler\n"); - switch(regs->eax & 0xffff) { + switch(X86_EAX & 0xffff) { case 0x5f00: /* VGA POST Initialization Signal */ - regs->eax = (regs->eax & 0xffff0000 ) | 0x5f; + X86_EAX = (X86_EAX & 0xffff0000 ) | 0x5f; res = 1; break; case 0x5f01: /* Software Panel Type Configuration */ - regs->eax = (regs->eax & 0xffff0000 ) | 0x5f; + X86_EAX = (X86_EAX & 0xffff0000 ) | 0x5f; // panel type = 2 = 1024 * 768 - regs->ecx = (regs->ecx & 0xffffff00 ) | 2; + X86_ECX = (X86_ECX & 0xffffff00 ) | 2; res = 1; break; case 0x5f27: /* Boot Device Selection */ - regs->eax = (regs->eax & 0xffff0000 ) | 0x5f; + X86_EAX = (X86_EAX & 0xffff0000 ) | 0x5f; - regs->ebx = 0x00000000; // 0 -> default - regs->ecx = 0x00000000; // 0 -> default + X86_EBX = 0x00000000; // 0 -> default + X86_ECX = 0x00000000; // 0 -> default // TV Layout - default - regs->edx = (regs->edx & 0xffffff00) | 0; + X86_EDX = (X86_EDX & 0xffffff00) | 0; res=1; break; case 0x5f0b: /* Get Expansion Setting */ - regs->eax = (regs->eax & 0xffff0000 ) | 0x5f; + X86_EAX = (X86_EAX & 0xffff0000 ) | 0x5f; - regs->ecx = regs->ecx & 0xffffff00; // non-expansion + X86_ECX = X86_ECX & 0xffffff00; // non-expansion // regs->ecx = regs->ecx & 0xffffff00 | 1; // expansion res=1; break; case 0x5f0f: /* VGA Post Completion */ - regs->eax = (regs->eax & 0xffff0000 ) | 0x5f; + X86_EAX = (X86_EAX & 0xffff0000 ) | 0x5f; res=1; break; case 0x5f18: - regs->eax = (regs->eax & 0xffff0000 ) | 0x5f; + X86_EAX = (X86_EAX & 0xffff0000 ) | 0x5f; #define UMA_SIZE_8MB (3 << 0) #define UMA_SIZE_16MB (4 << 0) #define UMA_SIZE_32MB (5 << 0) - regs->ebx = (regs->ebx & 0xffff0000 ) | MEMORY_SPEED_533MHZ | UMA_SIZE_32MB; + X86_EBX = (X86_EBX & 0xffff0000 ) | MEMORY_SPEED_533MHZ | UMA_SIZE_32MB; mem_speed = pci_read_config8(dev_find_slot(0, PCI_DEVFN(0, 4)), SCRATCH_DRAM_FREQ); if (mem_speed > 5) mem_speed = 5; - regs->ebx |= memory_mapping[mem_speed]; + X86_EBX |= memory_mapping[mem_speed]; res=1; break; default: printk(BIOS_DEBUG, "Unknown INT15 function %04x!\n", - regs->eax & 0xffff); + X86_EAX & 0xffff); break; } return res; |