summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorPatrick Georgi <patrick.georgi@secunet.com>2012-11-22 12:46:12 +0100
committerStefan Reinauer <stefan.reinauer@coreboot.org>2012-11-24 20:11:46 +0100
commit199b09cb7a3c590ccbf8d705c98cfde101378f20 (patch)
tree058511a1a638aa892c836a584633e155aaf0ebe6 /src/mainboard
parent503af721a1f2c831fb360d1c1b2af38e0866fc35 (diff)
downloadcoreboot-199b09cb7a3c590ccbf8d705c98cfde101378f20.tar.xz
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/mainboard')
-rw-r--r--src/mainboard/intel/emeraldlake2/mainboard.c62
-rw-r--r--src/mainboard/kontron/986lcd-m/mainboard.c18
-rw-r--r--src/mainboard/roda/rk886ex/mainboard.c18
-rw-r--r--src/mainboard/samsung/lumpy/mainboard.c62
-rw-r--r--src/mainboard/samsung/stumpy/mainboard.c62
-rw-r--r--src/mainboard/siemens/sitemp_g1p1/int15_func.c45
-rw-r--r--src/mainboard/technexion/tim5690/vgabios.c19
7 files changed, 144 insertions, 142 deletions
diff --git a/src/mainboard/intel/emeraldlake2/mainboard.c b/src/mainboard/intel/emeraldlake2/mainboard.c
index ae7f72a95f..28dc92eaa7 100644
--- a/src/mainboard/intel/emeraldlake2/mainboard.c
+++ b/src/mainboard/intel/emeraldlake2/mainboard.c
@@ -25,7 +25,7 @@
#include <device/pci_def.h>
#include <device/pci_ops.h>
#include <console/console.h>
-#if defined(CONFIG_PCI_OPTION_ROM_RUN_YABEL) && CONFIG_PCI_OPTION_ROM_RUN_YABEL
+#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN
#include <x86emu/x86emu.h>
#endif
#include <pc80/mc146818rtc.h>
@@ -43,14 +43,14 @@ void mainboard_suspend_resume(void)
}
#if defined(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) && CONFIG_PCI_OPTION_ROM_RUN_REALMODE
-static int int15_handler(struct eregs *regs)
+static int int15_handler(void)
{
int res=0;
printk(BIOS_DEBUG, "%s: INT15 function %04x!\n",
- __func__, regs->eax & 0xffff);
+ __func__, X86_EAX & 0xffff);
- switch(regs->eax & 0xffff) {
+ switch(X86_EAX & 0xffff) {
case 0x5f34:
/*
* Set Panel Fitting Hook:
@@ -59,10 +59,10 @@ static int int15_handler(struct eregs *regs)
* bit 0 = Centering (do not set with bit1 or bit2)
* 0 = video bios default
*/
- regs->eax &= 0xffff0000;
- regs->eax |= 0x005f;
- regs->ecx &= 0xffffff00;
- regs->ecx |= 0x01;
+ X86_EAX &= 0xffff0000;
+ X86_EAX |= 0x005f;
+ X86_ECX &= 0xffffff00;
+ X86_ECX |= 0x01;
res = 1;
break;
case 0x5f35:
@@ -77,10 +77,10 @@ static int int15_handler(struct eregs *regs)
* bit 6 = EFP2 *
* bit 7 = LFP2
*/
- regs->eax &= 0xffff0000;
- regs->eax |= 0x005f;
- regs->ecx &= 0xffff0000;
- regs->ecx |= 0x0000;
+ X86_EAX &= 0xffff0000;
+ X86_EAX |= 0x005f;
+ X86_ECX &= 0xffff0000;
+ X86_ECX |= 0x0000;
res = 1;
break;
case 0x5f51:
@@ -91,49 +91,49 @@ static int int15_handler(struct eregs *regs)
* 02h = SVDO-LVDS, LFP driven by SVDO decoder
* 03h = eDP, LFP Driven by Int-DisplayPort encoder
*/
- regs->eax &= 0xffff0000;
- regs->eax |= 0x005f;
- regs->ecx &= 0xffff0000;
- regs->ecx |= 0x0003;
+ X86_EAX &= 0xffff0000;
+ X86_EAX |= 0x005f;
+ X86_ECX &= 0xffff0000;
+ X86_ECX |= 0x0003;
res = 1;
break;
case 0x5f70:
- switch ((regs->ecx >> 8) & 0xff) {
+ switch ((X86_ECX >> 8) & 0xff) {
case 0:
/* Get Mux */
- regs->eax &= 0xffff0000;
- regs->eax |= 0x005f;
- regs->ecx &= 0xffff0000;
- regs->ecx |= 0x0000;
+ X86_EAX &= 0xffff0000;
+ X86_EAX |= 0x005f;
+ X86_ECX &= 0xffff0000;
+ X86_ECX |= 0x0000;
res = 1;
break;
case 1:
/* Set Mux */
- regs->eax &= 0xffff0000;
- regs->eax |= 0x005f;
- regs->ecx &= 0xffff0000;
- regs->ecx |= 0x0000;
+ X86_EAX &= 0xffff0000;
+ X86_EAX |= 0x005f;
+ X86_ECX &= 0xffff0000;
+ X86_ECX |= 0x0000;
res = 1;
break;
case 2:
/* Get SG/Non-SG mode */
- regs->eax &= 0xffff0000;
- regs->eax |= 0x005f;
- regs->ecx &= 0xffff0000;
- regs->ecx |= 0x0000;
+ X86_EAX &= 0xffff0000;
+ X86_EAX |= 0x005f;
+ X86_ECX &= 0xffff0000;
+ X86_ECX |= 0x0000;
res = 1;
break;
default:
/* FIXME: Interrupt was not handled, but return success? */
printk(BIOS_DEBUG, "Unknown INT15 5f70 function: 0x%02x\n",
- ((regs->ecx >> 8) & 0xff));
+ ((X86_ECX >> 8) & 0xff));
return 1;
}
break;
default:
printk(BIOS_DEBUG, "Unknown INT15 function %04x!\n",
- regs->eax & 0xffff);
+ X86_EAX & 0xffff);
break;
}
return res;
diff --git a/src/mainboard/kontron/986lcd-m/mainboard.c b/src/mainboard/kontron/986lcd-m/mainboard.c
index 3951ce663f..600058d502 100644
--- a/src/mainboard/kontron/986lcd-m/mainboard.c
+++ b/src/mainboard/kontron/986lcd-m/mainboard.c
@@ -20,7 +20,7 @@
#include <types.h>
#include <device/device.h>
#include <console/console.h>
-#if CONFIG_PCI_OPTION_ROM_RUN_YABEL
+#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN
#include <x86emu/x86emu.h>
#endif
#include <pc80/mc146818rtc.h>
@@ -64,7 +64,7 @@ static int int15_handler(void)
#endif
#if defined(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) && CONFIG_PCI_OPTION_ROM_RUN_REALMODE
-static int int15_handler(struct eregs *regs)
+static int int15_handler(void)
{
int res = 0;
@@ -73,7 +73,7 @@ static int int15_handler(struct eregs *regs)
* the mainboard or northbridge code.
* TODO: completely move to mainboards / chipsets.
*/
- switch (regs->eax & 0xffff) {
+ switch (X86_EAX & 0xffff) {
/* And now Intel IGD code */
#define BOOT_DISPLAY_DEFAULT 0
#define BOOT_DISPLAY_CRT (1 << 0)
@@ -85,19 +85,19 @@ static int int15_handler(struct eregs *regs)
#define BOOT_DISPLAY_EFP2 (1 << 6)
#define BOOT_DISPLAY_LCD2 (1 << 7)
case 0x5f35:
- regs->eax = 0x5f;
- regs->ecx = BOOT_DISPLAY_DEFAULT;
+ X86_EAX = 0x5f;
+ X86_ECX = BOOT_DISPLAY_DEFAULT;
res = 1;
break;
case 0x5f40:
- regs->eax = 0x5f;
- regs->ecx = 3; // This is mainboard specific
- printk(BIOS_DEBUG, "DISPLAY=%x\n", regs->ecx);
+ X86_EAX = 0x5f;
+ X86_ECX = 3; // This is mainboard specific
+ printk(BIOS_DEBUG, "DISPLAY=%x\n", X86_ECX);
res = 1;
break;
default:
printk(BIOS_DEBUG, "Unknown INT15 function %04x!\n",
- regs->eax & 0xffff);
+ X86_EAX & 0xffff);
}
return res;
diff --git a/src/mainboard/roda/rk886ex/mainboard.c b/src/mainboard/roda/rk886ex/mainboard.c
index f4e43bda0d..6d46edd91c 100644
--- a/src/mainboard/roda/rk886ex/mainboard.c
+++ b/src/mainboard/roda/rk886ex/mainboard.c
@@ -24,7 +24,7 @@
#include <arch/io.h>
#include <arch/interrupt.h>
#include <delay.h>
-#if CONFIG_PCI_OPTION_ROM_RUN_YABEL
+#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN
#include <x86emu/x86emu.h>
#endif
@@ -91,7 +91,7 @@ static int int15_handler(void)
#endif
#if CONFIG_PCI_OPTION_ROM_RUN_REALMODE
-static int int15_handler(struct eregs *regs)
+static int int15_handler(void)
{
int res = 0;
@@ -100,7 +100,7 @@ static int int15_handler(struct eregs *regs)
* the mainboard or northbridge code.
* TODO: completely move to mainboards / chipsets.
*/
- switch (regs->eax & 0xffff) {
+ switch (X86_EAX & 0xffff) {
/* And now Intel IGD code */
#define BOOT_DISPLAY_DEFAULT 0
#define BOOT_DISPLAY_CRT (1 << 0)
@@ -112,19 +112,19 @@ static int int15_handler(struct eregs *regs)
#define BOOT_DISPLAY_EFP2 (1 << 6)
#define BOOT_DISPLAY_LCD2 (1 << 7)
case 0x5f35:
- regs->eax = 0x5f;
- regs->ecx = BOOT_DISPLAY_DEFAULT;
+ X86_EAX = 0x5f;
+ X86_ECX = BOOT_DISPLAY_DEFAULT;
res = 1;
break;
case 0x5f40:
- regs->eax = 0x5f;
- regs->ecx = 3; // This is mainboard specific
- printk(BIOS_DEBUG, "DISPLAY=%x\n", regs->ecx);
+ X86_EAX = 0x5f;
+ X86_ECX = 3; // This is mainboard specific
+ printk(BIOS_DEBUG, "DISPLAY=%x\n", X86_ECX);
res = 1;
break;
default:
printk(BIOS_DEBUG, "Unknown INT15 function %04x!\n",
- regs->eax & 0xffff);
+ X86_EAX & 0xffff);
}
return res;
diff --git a/src/mainboard/samsung/lumpy/mainboard.c b/src/mainboard/samsung/lumpy/mainboard.c
index 3408248c96..a3dc2c0c06 100644
--- a/src/mainboard/samsung/lumpy/mainboard.c
+++ b/src/mainboard/samsung/lumpy/mainboard.c
@@ -24,7 +24,7 @@
#include <device/pci_def.h>
#include <device/pci_ops.h>
#include <console/console.h>
-#if defined(CONFIG_PCI_OPTION_ROM_RUN_YABEL) && CONFIG_PCI_OPTION_ROM_RUN_YABEL
+#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN
#include <x86emu/x86emu.h>
#endif
#include <pc80/mc146818rtc.h>
@@ -50,14 +50,14 @@ void mainboard_suspend_resume(void)
}
#if defined(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) && CONFIG_PCI_OPTION_ROM_RUN_REALMODE
-static int int15_handler(struct eregs *regs)
+static int int15_handler(void)
{
int res=0;
printk(BIOS_DEBUG, "%s: INT15 function %04x!\n",
- __func__, regs->eax & 0xffff);
+ __func__, X86_EAX & 0xffff);
- switch(regs->eax & 0xffff) {
+ switch(X86_EAX & 0xffff) {
case 0x5f34:
/*
* Set Panel Fitting Hook:
@@ -66,10 +66,10 @@ static int int15_handler(struct eregs *regs)
* bit 0 = Centering (do not set with bit1 or bit2)
* 0 = video bios default
*/
- regs->eax &= 0xffff0000;
- regs->eax |= 0x005f;
- regs->ecx &= 0xffffff00;
- regs->ecx |= 0x00;
+ X86_EAX &= 0xffff0000;
+ X86_EAX |= 0x005f;
+ X86_ECX &= 0xffffff00;
+ X86_ECX |= 0x00;
res = 1;
break;
case 0x5f35:
@@ -84,10 +84,10 @@ static int int15_handler(struct eregs *regs)
* bit 6 = EFP2 *
* bit 7 = LFP2
*/
- regs->eax &= 0xffff0000;
- regs->eax |= 0x005f;
- regs->ecx &= 0xffff0000;
- regs->ecx |= 0x0000;
+ X86_EAX &= 0xffff0000;
+ X86_EAX |= 0x005f;
+ X86_ECX &= 0xffff0000;
+ X86_ECX |= 0x0000;
res = 1;
break;
case 0x5f51:
@@ -98,49 +98,49 @@ static int int15_handler(struct eregs *regs)
* 02h = SVDO-LVDS, LFP driven by SVDO decoder
* 03h = eDP, LFP Driven by Int-DisplayPort encoder
*/
- regs->eax &= 0xffff0000;
- regs->eax |= 0x005f;
- regs->ecx &= 0xffff0000;
- regs->ecx |= 0x0001;
+ X86_EAX &= 0xffff0000;
+ X86_EAX |= 0x005f;
+ X86_ECX &= 0xffff0000;
+ X86_ECX |= 0x0001;
res = 1;
break;
case 0x5f70:
- switch ((regs->ecx >> 8) & 0xff) {
+ switch ((X86_ECX >> 8) & 0xff) {
case 0:
/* Get Mux */
- regs->eax &= 0xffff0000;
- regs->eax |= 0x005f;
- regs->ecx &= 0xffff0000;
- regs->ecx |= 0x0000;
+ X86_EAX &= 0xffff0000;
+ X86_EAX |= 0x005f;
+ X86_ECX &= 0xffff0000;
+ X86_ECX |= 0x0000;
res = 1;
break;
case 1:
/* Set Mux */
- regs->eax &= 0xffff0000;
- regs->eax |= 0x005f;
- regs->ecx &= 0xffff0000;
- regs->ecx |= 0x0000;
+ X86_EAX &= 0xffff0000;
+ X86_EAX |= 0x005f;
+ X86_ECX &= 0xffff0000;
+ X86_ECX |= 0x0000;
res = 1;
break;
case 2:
/* Get SG/Non-SG mode */
- regs->eax &= 0xffff0000;
- regs->eax |= 0x005f;
- regs->ecx &= 0xffff0000;
- regs->ecx |= 0x0000;
+ X86_EAX &= 0xffff0000;
+ X86_EAX |= 0x005f;
+ X86_ECX &= 0xffff0000;
+ X86_ECX |= 0x0000;
res = 1;
break;
default:
/* FIXME: Interrupt was not handled, but return success? */
printk(BIOS_DEBUG, "Unknown INT15 5f70 function: 0x%02x\n",
- ((regs->ecx >> 8) & 0xff));
+ ((X86_ECX >> 8) & 0xff));
return 1;
}
break;
default:
printk(BIOS_DEBUG, "Unknown INT15 function %04x!\n",
- regs->eax & 0xffff);
+ X86_EAX & 0xffff);
break;
}
return res;
diff --git a/src/mainboard/samsung/stumpy/mainboard.c b/src/mainboard/samsung/stumpy/mainboard.c
index fe70948f10..b0981fd711 100644
--- a/src/mainboard/samsung/stumpy/mainboard.c
+++ b/src/mainboard/samsung/stumpy/mainboard.c
@@ -25,7 +25,7 @@
#include <device/pci_def.h>
#include <device/pci_ops.h>
#include <console/console.h>
-#if defined(CONFIG_PCI_OPTION_ROM_RUN_YABEL) && CONFIG_PCI_OPTION_ROM_RUN_YABEL
+#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN
#include <x86emu/x86emu.h>
#endif
#include <pc80/mc146818rtc.h>
@@ -43,14 +43,14 @@ void mainboard_suspend_resume(void)
}
#if defined(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) && CONFIG_PCI_OPTION_ROM_RUN_REALMODE
-static int int15_handler(struct eregs *regs)
+static int int15_handler(void)
{
int res=0;
printk(BIOS_DEBUG, "%s: INT15 function %04x!\n",
- __func__, regs->eax & 0xffff);
+ __func__, X86_EAX & 0xffff);
- switch(regs->eax & 0xffff) {
+ switch(X86_EAX & 0xffff) {
case 0x5f34:
/*
* Set Panel Fitting Hook:
@@ -59,10 +59,10 @@ static int int15_handler(struct eregs *regs)
* bit 0 = Centering (do not set with bit1 or bit2)
* 0 = video bios default
*/
- regs->eax &= 0xffff0000;
- regs->eax |= 0x005f;
- regs->ecx &= 0xffffff00;
- regs->ecx |= 0x01;
+ X86_EAX &= 0xffff0000;
+ X86_EAX |= 0x005f;
+ X86_ECX &= 0xffffff00;
+ X86_ECX |= 0x01;
res = 1;
break;
case 0x5f35:
@@ -77,10 +77,10 @@ static int int15_handler(struct eregs *regs)
* bit 6 = EFP2 *
* bit 7 = LFP2
*/
- regs->eax &= 0xffff0000;
- regs->eax |= 0x005f;
- regs->ecx &= 0xffff0000;
- regs->ecx |= 0x0000;
+ X86_EAX &= 0xffff0000;
+ X86_EAX |= 0x005f;
+ X86_ECX &= 0xffff0000;
+ X86_ECX |= 0x0000;
res = 1;
break;
case 0x5f51:
@@ -91,49 +91,49 @@ static int int15_handler(struct eregs *regs)
* 02h = SVDO-LVDS, LFP driven by SVDO decoder
* 03h = eDP, LFP Driven by Int-DisplayPort encoder
*/
- regs->eax &= 0xffff0000;
- regs->eax |= 0x005f;
- regs->ecx &= 0xffff0000;
- regs->ecx |= 0x0003;
+ X86_EAX &= 0xffff0000;
+ X86_EAX |= 0x005f;
+ X86_ECX &= 0xffff0000;
+ X86_ECX |= 0x0003;
res = 1;
break;
case 0x5f70:
- switch ((regs->ecx >> 8) & 0xff) {
+ switch ((X86_ECX >> 8) & 0xff) {
case 0:
/* Get Mux */
- regs->eax &= 0xffff0000;
- regs->eax |= 0x005f;
- regs->ecx &= 0xffff0000;
- regs->ecx |= 0x0000;
+ X86_EAX &= 0xffff0000;
+ X86_EAX |= 0x005f;
+ X86_ECX &= 0xffff0000;
+ X86_ECX |= 0x0000;
res = 1;
break;
case 1:
/* Set Mux */
- regs->eax &= 0xffff0000;
- regs->eax |= 0x005f;
- regs->ecx &= 0xffff0000;
- regs->ecx |= 0x0000;
+ X86_EAX &= 0xffff0000;
+ X86_EAX |= 0x005f;
+ X86_ECX &= 0xffff0000;
+ X86_ECX |= 0x0000;
res = 1;
break;
case 2:
/* Get SG/Non-SG mode */
- regs->eax &= 0xffff0000;
- regs->eax |= 0x005f;
- regs->ecx &= 0xffff0000;
- regs->ecx |= 0x0000;
+ X86_EAX &= 0xffff0000;
+ X86_EAX |= 0x005f;
+ X86_ECX &= 0xffff0000;
+ X86_ECX |= 0x0000;
res = 1;
break;
default:
/* FIXME: Interrupt was not handled, but return sucess? */
printk(BIOS_DEBUG, "Unknown INT15 5f70 function: 0x%02x\n",
- ((regs->ecx >> 8) & 0xff));
+ ((X86_ECX >> 8) & 0xff));
return 1;
}
break;
default:
printk(BIOS_DEBUG, "Unknown INT15 function %04x!\n",
- regs->eax & 0xffff);
+ X86_EAX & 0xffff);
break;
}
return res;
diff --git a/src/mainboard/siemens/sitemp_g1p1/int15_func.c b/src/mainboard/siemens/sitemp_g1p1/int15_func.c
index c6531913ae..97402622f3 100644
--- a/src/mainboard/siemens/sitemp_g1p1/int15_func.c
+++ b/src/mainboard/siemens/sitemp_g1p1/int15_func.c
@@ -25,21 +25,22 @@
#include <stdlib.h>
#include <console/console.h>
#include <arch/interrupt.h>
+#include <x86emu/regs.h>
#include "int15_func.h"
-int sbios_INT15_handler(struct eregs *);
+int sbios_INT15_handler(void);
/*extern*/ unsigned long vgainfo_addr;
static INT15_function_extensions __int15_func;
/* System BIOS int15 function */
-int sbios_INT15_handler(struct eregs *regs)
+int sbios_INT15_handler(void)
{
int res = -1;
printk(BIOS_DEBUG, "System BIOS INT 15h\n");
- switch (regs->eax & 0xffff) {
+ switch (X86_EAX & 0xffff) {
#define BOOT_DISPLAY_DEFAULT 0
#define BOOT_DISPLAY_CRT (1 << 0)
#define BOOT_DISPLAY_TV (1 << 1)
@@ -50,42 +51,42 @@ int sbios_INT15_handler(struct eregs *regs)
#define BOOT_DISPLAY_EFP2 (1 << 6)
#define BOOT_DISPLAY_LCD2 (1 << 7)
case 0x5f35:
- regs->eax = 0x5f;
- regs->ecx = BOOT_DISPLAY_DEFAULT;
+ X86_EAX = 0x5f;
+ X86_ECX = BOOT_DISPLAY_DEFAULT;
res = 0;
break;
case 0x5f40:
- regs->eax = 0x5f;
- regs->ecx = 3; // This is mainboard specific
- printk(BIOS_DEBUG, "DISPLAY=%x\n", regs->ecx);
+ X86_EAX = 0x5f;
+ X86_ECX = 3; // This is mainboard specific
+ printk(BIOS_DEBUG, "DISPLAY=%x\n", X86_ECX);
res = 0;
break;
case 0x4e08:
- switch (regs->ebx & 0xff) {
+ switch (X86_EBX & 0xff) {
case 0x00:
- regs->eax &= ~(0xff);
- regs->ebx = (regs->ebx & ~(0xff)) | __int15_func.regs.func00_LCD_panel_id;
- printk(BIOS_DEBUG, "DISPLAY = %x\n", regs->ebx & 0xff);
+ X86_EAX &= ~(0xff);
+ X86_EBX = (X86_EBX & ~(0xff)) | __int15_func.regs.func00_LCD_panel_id;
+ printk(BIOS_DEBUG, "DISPLAY = %x\n", X86_EBX & 0xff);
res = 0;
break;
case 0x02:
break;
case 0x05:
- regs->eax &= ~(0xff);
- regs->ebx = (regs->ebx & ~(0xff)) | __int15_func.regs.func05_TV_standard;
- printk(BIOS_DEBUG, "TV = %x\n", regs->ebx & 0xff);
+ X86_EAX &= ~(0xff);
+ X86_EBX = (X86_EBX & ~(0xff)) | __int15_func.regs.func05_TV_standard;
+ printk(BIOS_DEBUG, "TV = %x\n", X86_EBX & 0xff);
res = 0;
break;
case 0x80:
- regs->eax &= ~(0xff);
- regs->ebx &= ~(0xff);
- printk(BIOS_DEBUG, "Integrated System Information = %x:%x\n", regs->edx, regs->edi);
- vgainfo_addr = (regs->edx * 16) + regs->edi;
+ X86_EAX &= ~(0xff);
+ X86_EBX &= ~(0xff);
+ printk(BIOS_DEBUG, "Integrated System Information = %x:%x\n", X86_EDX, X86_EDI);
+ vgainfo_addr = (X86_EDX * 16) + X86_EDI;
res = 0;
break;
case 0x89:
- regs->eax &= ~(0xff);
- regs->ebx &= ~(0xff);
+ X86_EAX &= ~(0xff);
+ X86_EBX &= ~(0xff);
printk(BIOS_DEBUG, "Get supported display device information\n");
res = 0;
break;
@@ -94,7 +95,7 @@ int sbios_INT15_handler(struct eregs *regs)
}
break;
default:
- printk(BIOS_DEBUG, "Unknown INT15 function %04x!\n", regs->eax & 0xffff);
+ printk(BIOS_DEBUG, "Unknown INT15 function %04x!\n", X86_EAX & 0xffff);
break;
}
diff --git a/src/mainboard/technexion/tim5690/vgabios.c b/src/mainboard/technexion/tim5690/vgabios.c
index 6c9b45e639..46a9b58441 100644
--- a/src/mainboard/technexion/tim5690/vgabios.c
+++ b/src/mainboard/technexion/tim5690/vgabios.c
@@ -24,9 +24,10 @@
#include <console/console.h>
#include <arch/interrupt.h>
#include "vgabios.h"
+#include <x86emu/regs.h>
-int tim5690_int15_handler(struct eregs *regs);
+int tim5690_int15_handler(void);
static rs690_vbios_regs vbios_regs_local;
@@ -38,30 +39,30 @@ static void vbios_fun_init(rs690_vbios_regs *vbios_regs)
}
/* BIOS int15 function */
-int tim5690_int15_handler(struct eregs *regs)
+int tim5690_int15_handler(void)
{
int res = 0;
printk(BIOS_DEBUG, "tim5690_int15_handler\n");
- switch (regs->eax & 0xffff) {
+ switch (X86_EAX & 0xffff) {
case AMD_RS690_INT15:
- switch (regs->ebx & 0xff) {
+ switch (X86_EBX & 0xff) {
case 0x00:
- regs->eax &= ~(0xff);
- regs->ebx = (regs->ebx & ~(0xff)) | vbios_regs_local.int15_regs.fun00_panel_id;
+ X86_EAX &= ~(0xff);
+ X86_EBX = (X86_EBX & ~(0xff)) | vbios_regs_local.int15_regs.fun00_panel_id;
res = 1;
break;
case 0x05:
- regs->eax &= ~(0xff);
- regs->ebx = (regs->ebx & ~(0xff)) | vbios_regs_local.int15_regs.fun05_tv_standard;
+ X86_EAX &= ~(0xff);
+ X86_EBX = (X86_EBX & ~(0xff)) | vbios_regs_local.int15_regs.fun05_tv_standard;
res = 1;
break;
}
break;
default:
printk(BIOS_DEBUG, "Unknown INT15 function %04x!\n",
- regs->eax & 0xffff);
+ X86_EAX & 0xffff);
break;
}