mirrors
/
Bochs
mirror of https://github.com/bochs-emu/Bochs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- bx_devices.reset() method now takes one arg

This commit is contained in:
Bryce Denney 2002-08-27 21:30:48 +00:00
parent a7e9c74a0e
commit c6c0667d2c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bochs/main.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: main.cc,v 1.123 2002-08-27 18:11:13 bdenney Exp $ // $Id: main.cc,v 1.124 2002-08-27 21:30:47 bdenney Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2002 MandrakeSoft S.A. // Copyright (C) 2002 MandrakeSoft S.A.
@ -1426,7 +1426,7 @@ bx_init_hardware()
#if BX_DEBUGGER == 0 #if BX_DEBUGGER == 0
bx_devices.init(BX_MEM(0)); bx_devices.init(BX_MEM(0));
bx_devices.reset(); bx_devices.reset(BX_RESET_HARDWARE);
bx_gui.init_signal_handlers (); bx_gui.init_signal_handlers ();
bx_pc_system.start_timers(); bx_pc_system.start_timers();
#endif #endif

4
bochs/pc_system.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: pc_system.cc,v 1.20 2002-08-27 18:53:30 vruppert Exp $ // $Id: pc_system.cc,v 1.21 2002-08-27 21:30:48 bdenney Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2002 MandrakeSoft S.A. // Copyright (C) 2002 MandrakeSoft S.A.
@ -182,7 +182,7 @@ bx_pc_system_c::ResetSignal( PCS_OP operation )
BX_ERROR(( "# bx_pc_system_c::ResetSignal() called" )); BX_ERROR(( "# bx_pc_system_c::ResetSignal() called" ));
for (int i=0; i<BX_SMP_PROCESSORS; i++) for (int i=0; i<BX_SMP_PROCESSORS; i++)
BX_CPU(i)->reset(BX_RESET_SOFTWARE); BX_CPU(i)->reset(BX_RESET_SOFTWARE);
bx_devices.reset(); bx_devices.reset(BX_RESET_SOFTWARE);
return(0); return(0);
} }