mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged some BIOS patches from @SF tracker

Browse Source
This commit is contained in:
Stanislav Shwartsman 2008-01-21 15:06:29 +00:00
parent 63d8d50cfc
commit abe7373657
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bochs/bios/BIOS-bochs-latest
View File

Binary file not shown.

BIN
bochs/bios/BIOS-bochs-legacy
View File

Binary file not shown.

6
bochs/bios/rombios.c
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: rombios.c,v 1.196 2008-01-14 19:10:37 vruppert Exp $
// $Id: rombios.c,v 1.197 2008-01-21 15:06:28 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -944,7 +944,7 @@ Bit16u cdrom_boot();
#endif // BX_ELTORITO_BOOT
static char bios_cvs_version_string[] = "$Revision: 1.196 $ $Date: 2008-01-14 19:10:37 $";
static char bios_cvs_version_string[] = "$Revision: 1.197 $ $Date: 2008-01-21 15:06:28 $";
#define BIOS_COPYRIGHT_STRING "(c) 2002 MandrakeSoft S.A. Written by Kevin Lawton & the Bochs team."
@ -10049,7 +10049,6 @@ bios_table_area_start:
;- POST -
;--------
.org 0xe05b ; POST Entry Point
bios_table_area_end:
post:
xor ax, ax
@ -11106,5 +11105,6 @@ static Bit8u vgafont8[128*8]=
ASM_START
.org 0xcc00
bios_table_area_end:
// bcc-generated data will be placed here
ASM_END

9
bochs/bios/rombios32.c
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: rombios32.c,v 1.18 2008-01-06 20:57:24 sshwarts Exp $
// $Id: rombios32.c,v 1.19 2008-01-21 15:06:29 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// 32 bit Bochs BIOS init code
@ -343,6 +343,9 @@ void bios_printf(int flags, const char *fmt, ...)
char buf[1024];
const char *s;
if ((flags & BIOS_PRINTF_DEBHALT) == BIOS_PRINTF_DEBHALT)
outb(PANIC_PORT2, 0x00);
va_start(ap, fmt);
vsnprintf(buf, sizeof(buf), fmt, ap);
s = buf;
@ -1386,5 +1389,9 @@ void rombios32_init(void)
acpi_bios_init();
bios_lock_shadow_ram();
BX_INFO("bios_table_cur_addr: 0x%08lx\n", bios_table_cur_addr);
if (bios_table_cur_addr > bios_table_end_addr)
BX_PANIC("bios_table_end_addr overflow!\n");
}
}