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

- virtual timer method 'reset' renamed to 'setup' (it's doing other things than

Browse Source 
the reset methods for devices)
- PCI register dump on exit now done in the destructor
This commit is contained in:
Volker Ruppert 2006-09-18 18:10:49 +00:00
parent c592b9527c
commit 26f7f49b9a
4 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bochs/iodev/devices.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: devices.cc,v 1.108 2006-09-17 19:19:15 vruppert Exp $
// $Id: devices.cc,v 1.109 2006-09-18 18:10:48 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -114,7 +114,7 @@ void bx_devices_c::init(BX_MEM_C *newmem)
{
unsigned i;
BX_DEBUG(("Init $Id: devices.cc,v 1.108 2006-09-17 19:19:15 vruppert Exp $"));
BX_DEBUG(("Init $Id: devices.cc,v 1.109 2006-09-18 18:10:48 vruppert Exp $"));
mem = newmem;
/* set no-default handlers, will be overwritten by the real default handler */
@ -392,15 +392,9 @@ void bx_devices_c::after_restore_state()
void bx_devices_c::exit()
{
pit->exit();
bx_virt_timer.reset();
bx_virt_timer.setup();
bx_slowdown_timer.exit();
#if BX_SUPPORT_PCI
if (SIM->get_param_bool(BXPN_I440FX_SUPPORT)->get()) {
pluginPciBridge->print_i440fx_state();
}
#endif
PLUG_unload_plugin(unmapped);
PLUG_unload_plugin(biosdev);
PLUG_unload_plugin(cmos);

3
bochs/iodev/pci.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: pci.cc,v 1.52 2006-09-10 17:18:44 vruppert Exp $
// $Id: pci.cc,v 1.53 2006-09-18 18:10:49 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -61,6 +61,7 @@ bx_pci_bridge_c::bx_pci_bridge_c()
bx_pci_bridge_c::~bx_pci_bridge_c()
{
print_i440fx_state();
BX_DEBUG(("Exit"));
}

6
bochs/iodev/virt_timer.cc
View File

@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////////
// $Id: virt_timer.cc,v 1.32 2006-09-17 19:19:15 vruppert Exp $
// $Id: virt_timer.cc,v 1.33 2006-09-18 18:10:49 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -135,7 +135,7 @@ bx_virt_timer_c::bx_virt_timer_c()
put("VTIMER");
settype(VTIMERLOG);
reset();
setup();
}
const Bit64u bx_virt_timer_c::NullTimerInterval = BX_MAX_VIRTUAL_TIME;
@ -375,7 +375,7 @@ void bx_virt_timer_c::next_event_time_update(void)
}
}
void bx_virt_timer_c::reset(void)
void bx_virt_timer_c::setup(void)
{
numTimers = 0;
current_timers_time = 0;

6
bochs/iodev/virt_timer.h
View File

@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////////
// $Id: virt_timer.h,v 1.12 2006-09-17 19:19:15 vruppert Exp $
// $Id: virt_timer.h,v 1.13 2006-09-18 18:10:49 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -145,8 +145,8 @@ public:
//The real timer handler.
void timer_handler();
//Initialization step #1
void reset(void);
//Initialization step #1 in constructor and for cleanup
void setup(void);
//Initialization step #2
void init(void);