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

- SIM->get_enabled() SIM->set_enabled() were no longer useful, since they

Browse Source 
mirrored the use of enable_control_panel exactly.  This should not cause
  any change in behavior, and it lets me eliminate these methods which
  don't make much sense anymore.
This commit is contained in:
Bryce Denney 2002-08-26 11:37:55 +00:00
parent 026f0dcb8d
commit f8df133a82
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bochs/main.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: main.cc,v 1.118 2002-08-25 15:51:45 vruppert Exp $
// $Id: main.cc,v 1.119 2002-08-26 11:37:55 bdenney Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -1194,7 +1194,6 @@ bx_do_text_config_interface (int argc, char *argv[])
|| (!strncmp ("-q", argv[1], 2)))) {
// skip the control panel
arg++;
SIM->set_enabled (0);
enable_control_panel = 0;
if ((argc > 2) && (!strcmp(argv[1], "-qf"))) {
bochsrc = argv[arg];
@ -1251,7 +1250,6 @@ bx_do_text_config_interface (int argc, char *argv[])
}
// Display the pre-simulation control panel.
#if !BX_WITH_WX
SIM->set_enabled (1);
bx_control_panel (BX_CPANEL_START_MENU);
#endif
}
@ -1320,7 +1318,7 @@ bx_read_configuration (char *rcfile)
return -1;
}
// update log actions if control panel is enabled
if (SIM->get_enabled ()) {
if (enable_control_panel) {
for (int level=0; level<N_LOGLEV; level++) {
int action = bx_options.log.actions[level];
io->set_log_action (level, action);
@ -1347,7 +1345,7 @@ bx_init_hardware()
// all configuration has been read, now initialize everything.
#if !BX_USE_CONTROL_PANEL
if (!SIM->get_enabled ()) {
if (!enable_control_panel) {
for (int level=0; level<N_LOGLEV; level++) {
int action = bx_options.log.actions[level];
if (action == ACT_ASK) action = ACT_FATAL;