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

- moved BX_SHARE_PATH check and definition to bochs.h

Browse Source 
- small cleanup in bochs.h
This commit is contained in:
Volker Ruppert 2005-07-31 15:35:01 +00:00
parent 26d900cabe
commit c83745753b
3 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bochs/bochs.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: bochs.h,v 1.155 2005-06-26 10:54:48 vruppert Exp $
// $Id: bochs.h,v 1.156 2005-07-31 15:35:01 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -98,8 +98,19 @@ extern "C" {
#include "gui/siminterface.h"
// BX_SHARE_PATH should be defined by the makefile. If not, give it
// a value of NULL to avoid compile problems.
#ifndef BX_SHARE_PATH
#define BX_SHARE_PATH NULL
#endif
// prototypes
int bx_begin_simulation (int argc, char *argv[]);
char *bx_find_bochsrc (void);
int bx_parse_cmdline (int arg, int argc, char *argv[]);
int bx_read_configuration (char *rcfile);
int bx_write_configuration (char *rcfile, int overwrite);
void bx_reset_options (void);
//
// some macros to interface the CPU and memory to external environment
@ -503,12 +514,6 @@ extern bx_bool bx_gui_sighandler;
#define BX_IODEV_HANDLER_PERIOD 100 // microseconds
//#define BX_IODEV_HANDLER_PERIOD 10 // microseconds
char *bx_find_bochsrc (void);
int bx_parse_cmdline (int arg, int argc, char *argv[]);
int bx_read_configuration (char *rcfile);
int bx_write_configuration (char *rcfile, int overwrite);
void bx_reset_options (void);
#define BX_PATHNAME_LEN 512
typedef struct {

8
bochs/config.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: config.cc,v 1.37 2005-07-10 16:51:08 vruppert Exp $
// $Id: config.cc,v 1.38 2005-07-31 15:35:01 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -39,12 +39,6 @@
#undef getenv
#endif
// BX_SHARE_PATH should be defined by the makefile. If not, give it
// a value of NULL to avoid compile problems.
#ifndef BX_SHARE_PATH
#define BX_SHARE_PATH NULL
#endif
int bochsrc_include_count = 0;

8
bochs/main.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: main.cc,v 1.290 2005-07-04 18:02:23 sshwarts Exp $
// $Id: main.cc,v 1.291 2005-07-31 15:35:01 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -53,12 +53,6 @@
#undef Float64
#endif
// BX_SHARE_PATH should be defined by the makefile. If not, give it
// a value of NULL to avoid compile problems.
#ifndef BX_SHARE_PATH
#define BX_SHARE_PATH NULL
#endif
extern "C" {
#include <signal.h>