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

- fixed floppy boot signature check switch

Browse Source 
- added network boot ROM support in the main Bochs code (already present in BIOS)
This commit is contained in:
Volker Ruppert 2007-08-01 17:10:24 +00:00
parent 895891b673
commit 6ea536f95c
6 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bochs/.bochsrc
View File

@ -293,14 +293,12 @@ ata0-master: type=disk, mode=flat, path="30M.sample"
#=======================================================================
# BOOT:
# This defines the boot sequence. Now you can specify up to 3 boot drives.
# You can either boot from 'floppy', 'disk' or 'cdrom'
# You can either boot from 'floppy', 'disk', 'cdrom' or 'network'
# legacy 'a' and 'c' are also supported
# Examples:
# boot: floppy
# boot: disk
# boot: cdrom
# boot: c
# boot: a
# boot: cdrom, disk
# boot: network, disk
# boot: cdrom, floppy, disk
#=======================================================================
#boot: floppy

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.181 2007-06-30 07:14:50 vruppert Exp $
// $Id: rombios.c,v 1.182 2007-08-01 17:09:51 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -927,7 +927,7 @@ Bit16u cdrom_boot();
#endif // BX_ELTORITO_BOOT
static char bios_cvs_version_string[] = "$Revision: 1.181 $ $Date: 2007-06-30 07:14:50 $";
static char bios_cvs_version_string[] = "$Revision: 1.182 $ $Date: 2007-08-01 17:09:51 $";
#define BIOS_COPYRIGHT_STRING "(c) 2002 MandrakeSoft S.A. Written by Kevin Lawton & the Bochs team."
@ -7690,7 +7690,7 @@ ASM_END
/* Always check the signature on a HDD boot sector; on FDD, only do
* the check if the CMOS doesn't tell us to skip it */
if (e.type != 0x00 || !((inb_cmos(0x38) & 0x01))) {
if ((e.type != 0x01) || !((inb_cmos(0x38) & 0x01))) {
if (read_word(bootseg,0x1fe) != 0xaa55) {
print_boot_failure(e.type, 0);
return;

4
bochs/gui/siminterface.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: siminterface.cc,v 1.174 2006-12-17 08:17:27 vruppert Exp $
// $Id: siminterface.cc,v 1.175 2007-08-01 17:09:51 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// See siminterface.h for description of the siminterface concept.
@ -451,7 +451,7 @@ char *floppy_type_names[] = { "none", "1.2M", "1.44M", "2.88M", "720K", "360K",
int floppy_type_n_sectors[] = { -1, 80*2*15, 80*2*18, 80*2*36, 80*2*9, 40*2*9, 40*1*8, 40*1*9, 40*2*8, -1 };
char *floppy_status_names[] = { "ejected", "inserted", NULL };
char *bochs_bootdisk_names[] = { "none", "floppy", "disk","cdrom", NULL };
char *bochs_bootdisk_names[] = { "none", "floppy", "disk","cdrom", "network", NULL };
char *loader_os_names[] = { "none", "linux", "nullkernel", NULL };
char *keyboard_type_names[] = { "xt", "at", "mf", NULL };

3
bochs/gui/siminterface.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: siminterface.h,v 1.209 2007-04-08 21:57:05 sshwarts Exp $
// $Id: siminterface.h,v 1.210 2007-08-01 17:09:52 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Intro to siminterface by Bryce Denney:
@ -276,6 +276,7 @@ typedef enum {
#define BX_BOOT_FLOPPYA 1
#define BX_BOOT_DISKC 2
#define BX_BOOT_CDROM 3
#define BX_BOOT_NETWORK 4
// loader hack
#define Load32bitOSNone 0