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

- in text runtime config skip non-runtime options in lists with SERIES_ASK set

Browse Source 
- added runtime flag for floppy options
This commit is contained in:
Volker Ruppert 2005-11-06 09:11:09 +00:00
parent 9e57072f28
commit 93355486d2
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bochs/config.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: config.cc,v 1.54 2005-10-31 12:53:11 vruppert Exp $
// $Id: config.cc,v 1.55 2005-11-06 09:11:09 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -408,10 +408,12 @@ void bx_init_options ()
floppy_status_names,
BX_INSERTED,
BX_EJECTED);
bx_options.floppya.Ostatus->set_ask_format ("Is the floppy inserted or ejected? [%s] ");
bx_options.floppya.Opath->set_format ("%s");
bx_options.floppya.Opath->set_runtime_param (1);
bx_options.floppya.Otype->set_format ("size=%s");
bx_options.floppya.Ostatus->set_ask_format ("Is the floppy inserted or ejected? [%s] ");
bx_options.floppya.Ostatus->set_format ("%s");
bx_options.floppya.Ostatus->set_runtime_param (1);
bx_param_c *floppya_init_list[] = {
// if the order "path,type,status" changes, corresponding changes must
// be made in gui/wxmain.cc, MyFrame::editFloppyConfig.
@ -452,10 +454,12 @@ void bx_init_options ()
floppy_status_names,
BX_INSERTED,
BX_EJECTED);
bx_options.floppyb.Ostatus->set_ask_format ("Is the floppy inserted or ejected? [%s] ");
bx_options.floppyb.Opath->set_format ("%s");
bx_options.floppyb.Opath->set_runtime_param (1);
bx_options.floppyb.Otype->set_format ("size=%s");
bx_options.floppyb.Ostatus->set_ask_format ("Is the floppy inserted or ejected? [%s] ");
bx_options.floppyb.Ostatus->set_format ("%s");
bx_options.floppyb.Ostatus->set_runtime_param (1);
bx_param_c *floppyb_init_list[] = {
bx_options.floppyb.Opath,
bx_options.floppyb.Otype,

9
bochs/gui/textconfig.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: textconfig.cc,v 1.31 2005-10-22 11:00:00 vruppert Exp $
// $Id: textconfig.cc,v 1.32 2005-11-06 09:11:09 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// This is code for a text-mode configuration interface. Note that this file
@ -927,8 +927,11 @@ bx_list_c::text_ask (FILE *fpin, FILE *fpout)
fprintf (fpout, "\n"); //fprintf (fp, "options=%s\n", options->get ());
if (options->get () & SERIES_ASK) {
for (int i=0; i<size; i++) {
if (list[i]->get_enabled ())
list[i]->text_ask (fpin, fpout);
if (list[i]->get_enabled()) {
if (!SIM->get_init_done() || list[i]->get_runtime_param()) {
list[i]->text_ask (fpin, fpout);
}
}
}
} else {
if (options->get () & SHOW_PARENT)