comments added and corrected

git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1030 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
hellwig
2012-04-05 09:40:39 +00:00
parent a4bed2d329
commit ff828ba48f
13 changed files with 33 additions and 28 deletions

View File

@ -156,7 +156,7 @@ void bx_gui_c::init(int argc, char **argv, unsigned tilewidth, unsigned tileheig
BX_GUI_THIS power_bmap_id = create_bitmap(bx_power_bmap, BX_POWER_BMAP_X, BX_POWER_BMAP_Y);
BX_GUI_THIS reset_bmap_id = create_bitmap(bx_reset_bmap, BX_RESET_BMAP_X, BX_RESET_BMAP_Y);
BX_GUI_THIS snapshot_bmap_id = create_bitmap(bx_snapshot_bmap, BX_SNAPSHOT_BMAP_X, BX_SNAPSHOT_BMAP_Y);
//DanceOS Richard Hellwig
//DanceOS
#ifdef DANCEOS_RESTORE
BX_GUI_THIS restore_bmap_id = create_bitmap(bx_floppya_bmap, BX_FLOPPYA_BMAP_X, BX_FLOPPYA_BMAP_Y);
#endif
@ -225,7 +225,7 @@ void bx_gui_c::init(int argc, char **argv, unsigned tilewidth, unsigned tileheig
BX_GUI_THIS config_hbar_id = headerbar_bitmap(BX_GUI_THIS config_bmap_id,
BX_GRAVITY_RIGHT, config_handler);
BX_GUI_THIS set_tooltip(BX_GUI_THIS config_hbar_id, "Runtime config dialog");
//DanceOS Richard Hellwig
//DanceOS
// Fake-Restore button
#ifdef DANCEOS_RESTORE
BX_GUI_THIS restore_hbar_id = headerbar_bitmap(BX_GUI_THIS restore_bmap_id,
@ -653,7 +653,7 @@ void bx_gui_c::save_restore_handler(void)
//DanceOS Richard Hellwig
//DanceOS
#ifdef DANCEOS_RESTORE
void bx_gui_c::restore_handler(void)
{

View File

@ -161,7 +161,7 @@ protected:
static void copy_handler(void);
static void paste_handler(void);
static void snapshot_handler(void);
//DanceOS Richard Hellwig
//DanceOS
#ifdef DANCEOS_RESTORE
static void restore_handler(void);
#endif
@ -183,7 +183,7 @@ protected:
unsigned copy_bmap_id, copy_hbar_id;
unsigned paste_bmap_id, paste_hbar_id;
unsigned snapshot_bmap_id, snapshot_hbar_id;
//DanceOS Richard Hellwig
//DanceOS
#ifdef DANCEOS_RESTORE
unsigned restore_bmap_id, restore_hbar_id;
#endif

View File

@ -68,7 +68,7 @@ class bx_real_sim_c : public bx_simulator_interface_c {
bx_bool wx_debug_gui;
public:
bx_real_sim_c();
//DanceOS Richard Hellwig
//DanceOS
#ifdef DANCEOS_RESTORE
virtual ~bx_real_sim_c() {root_param = NULL;}
#else

View File

@ -123,6 +123,7 @@
//////////////////////////////////////////////////////
//DanceOS
#ifndef BX_SIMINTERFACE_H
# define BX_SIMINTERFACE_H 1
@ -746,4 +747,5 @@ BOCHSAPI extern bx_startup_flags_t bx_startup_flags;
BOCHSAPI extern bx_bool bx_user_quit;
BOCHSAPI extern Bit8u bx_cpu_count;
//DanceOS
#endif /* BX_SIMINTERFACE_H */

View File

@ -31,6 +31,7 @@
// isn't even defined in this context.
//
//DanceOS
// workaround for include file ordering problem in conjunction with AspectC++
#include "bochs.h"
@ -59,7 +60,7 @@ extern "C" {
#define CI_PATH_LENGTH 512
//DanceOS Richard Hellwig
//DanceOS
#ifdef DANCEOS_RESTORE
bool raus = false;
#endif
@ -424,7 +425,7 @@ int bx_config_interface(int menu)
return 0;
case BX_CI_START_SIMULATION:
// we don't expect it to return, but if it does, quit
//DanceOS Richard Hellwig
//DanceOS
#ifdef DANCEOS_RESTORE
if(SIM->begin_simulation(bx_startup_flags.argc, bx_startup_flags.argv)){
raus = true;
@ -562,7 +563,7 @@ int bx_config_interface(int menu)
fprintf(stderr, "Unknown config interface menu type.\n");
assert(menu >=0 && menu < BX_CI_N_MENUS);
}
//DanceOS Richard Hellwig
//DanceOS
#ifdef DANCEOS_RESTORE
if(raus){
return 1;

View File

@ -1817,7 +1817,7 @@ void bx_x_gui_c::exit(void)
if (bx_x_display)
XCloseDisplay (bx_x_display);
//DanceOS Richard Hellwig
//DanceOS
#ifdef DANCEOS_RESTORE
bx_bitmap_left_xorigin = 0;