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

- added "floppy" and "disk" as available directive to the boot: option

Browse Source 
- legacy "c" and "a" are still supported
This commit is contained in:
Christophe Bothamy 2002-09-24 09:50:16 +00:00
parent 7ba1d2d96f
commit 33a7581f57
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bochs/.bochsrc
View File

@ -215,14 +215,17 @@ ata0-master: type=disk, path="30M.sample", cylinders=615, heads=6, spt=17
#=======================================================================
# BOOT:
# This defines your boot drive.
# You can either boot from 'a', 'c' or 'cdrom'
# You can either boot from 'floppy', 'disk' or 'cdrom'
# legacy 'a' and 'c' are also supported
# Examples:
# boot: floppy
# boot: disk
# boot: cdrom
# boot: c
# boot: a
# boot: cdrom
#=======================================================================
#boot: a
boot: c
#boot: floppy
boot: disk
#=======================================================================
# FLOPPY_BOOTSIG_CHECK: disabled=[0|1]

8
bochs/main.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: main.cc,v 1.144 2002-09-22 20:56:11 cbothamy Exp $
// $Id: main.cc,v 1.145 2002-09-24 09:50:16 cbothamy Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -2219,8 +2219,12 @@ parse_line_formatted(char *context, int num_params, char *params[])
else if (!strcmp(params[0], "boot")) {
if (!strcmp(params[1], "a")) {
bx_options.Obootdrive->set (BX_BOOT_FLOPPYA);
} else if (!strcmp(params[1], "floppy")) {
bx_options.Obootdrive->set (BX_BOOT_FLOPPYA);
} else if (!strcmp(params[1], "c")) {
bx_options.Obootdrive->set (BX_BOOT_DISKC);
} else if (!strcmp(params[1], "disk")) {
bx_options.Obootdrive->set (BX_BOOT_DISKC);
} else if (!strcmp(params[1], "cdrom")) {
bx_options.Obootdrive->set (BX_BOOT_CDROM);
} else {
@ -3084,7 +3088,7 @@ bx_write_configuration (char *rc, int overwrite)
//bx_write_serial_options (fp, &bx_options.com[3], 4);
bx_write_sb16_options (fp, &bx_options.sb16);
int bootdrive = bx_options.Obootdrive->get ();
fprintf (fp, "boot: %s\n", (bootdrive==BX_BOOT_FLOPPYA) ? "a" : (bootdrive==BX_BOOT_DISKC) ? "c" : "cdrom");
fprintf (fp, "boot: %s\n", (bootdrive==BX_BOOT_FLOPPYA) ? "floppy" : (bootdrive==BX_BOOT_DISKC) ? "disk" : "cdrom");
fprintf (fp, "floppy_bootsig_check: disabled=%d\n", bx_options.OfloppySigCheck->get ());
fprintf (fp, "vga_update_interval: %u\n", bx_options.Ovga_update_interval->get ());
fprintf (fp, "keyboard_serial_delay: %u\n", bx_options.Okeyboard_serial_delay->get ());