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

- changed all iodev config macros to BX_SUPPORT_xxx

Browse Source 
- removed incorrect SDL/ prefix from include paths (patch from Robin KAY)
This commit is contained in:
Volker Ruppert 2004-08-06 15:49:55 +00:00
parent bf20e99f4c
commit d06c80cee3
33 changed files with 175 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bochs/bx_debug/dbg_main.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: dbg_main.cc,v 1.5 2004-06-19 15:20:07 sshwarts Exp $
// $Id: dbg_main.cc,v 1.6 2004-08-06 15:49:53 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -3061,7 +3061,7 @@ bx_dbg_dump_cpu_command(void)
dbg_printf ( "inhibit_mask:%u\n", cpu.inhibit_mask);
}
#if BX_PCI_SUPPORT
#if BX_SUPPORT_PCI
if (bx_options.Oi440FXSupport->get ()) {
DEV_pci_print_i440fx_state();
}
@ -4259,7 +4259,7 @@ bx_dbg_info_control_regs_command(void)
void
bx_dbg_info_ne2k(int page, int reg)
{
#if BX_NE2K_SUPPORT
#if BX_SUPPORT_NE2K
DEV_ne2k_print_info (stderr, page, reg, 0);
#else
dbg_printf ( "NE2000 support is not compiled in.\n");

22
bochs/config.h.in
View File

@ -694,22 +694,22 @@ typedef
#define BX_NUM_SIMULATORS 1
// limited i440FX PCI support
#define BX_PCI_SUPPORT 0
#define BX_SUPPORT_PCI 0
// Experimental VGA on PCI
#define BX_PCI_VGA_SUPPORT 1
#define BX_SUPPORT_PCIVGA 1
// Experimental host PCI device mapping
#define BX_PCI_DEV_SUPPORT 0
#define BX_SUPPORT_PCIDEV 0
#if (BX_PCI_DEV_SUPPORT && !BX_PCI_SUPPORT)
#if (BX_SUPPORT_PCIDEV && !BX_SUPPORT_PCI)
#error To enable PCI host device mapping, you must also enable PCI
#endif
// limited USB on PCI
#define BX_PCI_USB_SUPPORT 0
#define BX_SUPPORT_PCIUSB 0
#if (BX_PCI_USB_SUPPORT && !BX_PCI_SUPPORT)
#if (BX_SUPPORT_PCIUSB && !BX_SUPPORT_PCI)
#error To enable USB, you must also enable PCI
#endif
@ -883,7 +883,7 @@ typedef
#endif
// NE2K network emulation
#define BX_NE2K_SUPPORT 0
#define BX_SUPPORT_NE2K 0
#define BX_ETH_NULL_LOGGING 1
#define BX_ETH_FBSD_LOGGING 1
@ -911,21 +911,21 @@ typedef
// Pseudo PCI NIC
#define BX_PCI_PNIC_SUPPORT 0
#define BX_SUPPORT_PCIPNIC 0
#if (BX_PCI_PNIC_SUPPORT && !BX_PCI_SUPPORT)
#if (BX_SUPPORT_PCIPNIC && !BX_SUPPORT_PCI)
#error To enable the PCI pseudo NIC, you must also enable PCI
#endif
// Check for NE2K support, since all the networking code is ifdeffed
// under that. There should probably be a more generic "enable-networking"
#if (BX_PCI_PNIC_SUPPORT && !BX_NE2K_SUPPORT)
#if (BX_SUPPORT_PCIPNIC && !BX_SUPPORT_NE2K)
#error To enable the pseudo NIC, you must also enable ne2000
#endif
// I/O Interface to debug
#define BX_IODEBUG_SUPPORT 0
#define BX_SUPPORT_IODEBUG 0
// External Debugger
#define BX_EXTERNAL_DEBUGGER 0

36
bochs/configure vendored
View File

@ -31657,7 +31657,7 @@ if test "${enable_ne2000+set}" = set; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\_ACEOF
#define BX_NE2K_SUPPORT 1
#define BX_SUPPORT_NE2K 1
_ACEOF
NE2K_OBJS='ne2k.o'
@ -32163,7 +32163,7 @@ _ACEOF
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\_ACEOF
#define BX_NE2K_SUPPORT 0
#define BX_SUPPORT_NE2K 0
_ACEOF
NE2K_OBJS=''
@ -32175,7 +32175,7 @@ else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\_ACEOF
#define BX_NE2K_SUPPORT 0
#define BX_SUPPORT_NE2K 0
_ACEOF
NE2K_OBJS=''
@ -32197,7 +32197,7 @@ if test "${enable_pci+set}" = set; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\_ACEOF
#define BX_PCI_SUPPORT 1
#define BX_SUPPORT_PCI 1
_ACEOF
pci=1
@ -32206,7 +32206,7 @@ _ACEOF
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\_ACEOF
#define BX_PCI_SUPPORT 0
#define BX_SUPPORT_PCI 0
_ACEOF
pci=0
@ -32217,7 +32217,7 @@ else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\_ACEOF
#define BX_PCI_SUPPORT 0
#define BX_SUPPORT_PCI 0
_ACEOF
pci=0
@ -32284,7 +32284,7 @@ echo "$as_me: error: PCI host device mapping requires Linux as host" >&2;}
;;
esac
cat >>confdefs.h <<\_ACEOF
#define BX_PCI_DEV_SUPPORT 1
#define BX_SUPPORT_PCIDEV 1
_ACEOF
PCI_OBJ="$PCI_OBJ pcidev.o"
@ -32292,7 +32292,7 @@ _ACEOF
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\_ACEOF
#define BX_PCI_DEV_SUPPORT 0
#define BX_SUPPORT_PCIDEV 0
_ACEOF
fi
@ -32302,7 +32302,7 @@ else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\_ACEOF
#define BX_PCI_DEV_SUPPORT 0
#define BX_SUPPORT_PCIDEV 0
_ACEOF
@ -32318,7 +32318,7 @@ if test "${enable_usb+set}" = set; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\_ACEOF
#define BX_PCI_USB_SUPPORT 1
#define BX_SUPPORT_PCIUSB 1
_ACEOF
PCI_OBJ="$PCI_OBJ pciusb.o"
@ -32326,7 +32326,7 @@ _ACEOF
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\_ACEOF
#define BX_PCI_USB_SUPPORT 0
#define BX_SUPPORT_PCIUSB 0
_ACEOF
fi
@ -32335,7 +32335,7 @@ else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\_ACEOF
#define BX_PCI_USB_SUPPORT 0
#define BX_SUPPORT_PCIUSB 0
_ACEOF
@ -32351,7 +32351,7 @@ if test "${enable_pnic+set}" = set; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\_ACEOF
#define BX_PCI_PNIC_SUPPORT 1
#define BX_SUPPORT_PCIPNIC 1
_ACEOF
PCI_OBJ="$PCI_OBJ pcipnic.o"
@ -32359,7 +32359,7 @@ _ACEOF
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\_ACEOF
#define BX_PCI_PNIC_SUPPORT 0
#define BX_SUPPORT_PCIPNIC 0
_ACEOF
fi
@ -32368,7 +32368,7 @@ else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\_ACEOF
#define BX_PCI_PNIC_SUPPORT 0
#define BX_SUPPORT_PCIPNIC 0
_ACEOF
@ -34211,7 +34211,7 @@ if test "${enable_iodebug+set}" = set; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\_ACEOF
#define BX_IODEBUG_SUPPORT 1
#define BX_SUPPORT_IODEBUG 1
_ACEOF
IODEBUG_OBJS='iodebug.o'
@ -34219,7 +34219,7 @@ _ACEOF
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\_ACEOF
#define BX_IODEBUG_SUPPORT 0
#define BX_SUPPORT_IODEBUG 0
_ACEOF
fi
@ -34231,7 +34231,7 @@ else
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\_ACEOF
#define BX_IODEBUG_SUPPORT 1
#define BX_SUPPORT_IODEBUG 1
_ACEOF
IODEBUG_OBJS='iodebug.o'

38
bochs/configure.in
View File

@ -2,7 +2,7 @@ dnl // Process this file with autoconf to produce a configure script.
AC_PREREQ(2.50)
AC_INIT(bochs.h)
AC_REVISION([[$Id: configure.in,v 1.257 2004-07-29 20:15:16 sshwarts Exp $]])
AC_REVISION([[$Id: configure.in,v 1.258 2004-08-06 15:49:52 vruppert Exp $]])
AC_CONFIG_HEADER(config.h)
AC_CONFIG_HEADER(ltdlconf.h)
@ -715,7 +715,7 @@ AC_ARG_ENABLE(ne2000,
[ --enable-ne2000 enable limited ne2000 support],
[if test "$enableval" = yes; then
AC_MSG_RESULT(yes)
AC_DEFINE(BX_NE2K_SUPPORT, 1)
AC_DEFINE(BX_SUPPORT_NE2K, 1)
NE2K_OBJS='ne2k.o'
NETLOW_OBJS='eth.o eth_null.o eth_vnet.o'
AC_CHECK_HEADER(net/bpf.h, NETLOW_OBJS="$NETLOW_OBJS eth_fbsd.o")
@ -774,14 +774,14 @@ AC_ARG_ENABLE(ne2000,
networking=yes
else
AC_MSG_RESULT(no)
AC_DEFINE(BX_NE2K_SUPPORT, 0)
AC_DEFINE(BX_SUPPORT_NE2K, 0)
NE2K_OBJS=''
NETLOW_OBJS=''
networking=no
fi],
[
AC_MSG_RESULT(no)
AC_DEFINE(BX_NE2K_SUPPORT, 0)
AC_DEFINE(BX_SUPPORT_NE2K, 0)
NE2K_OBJS=''
NETLOW_OBJS=''
networking=no
@ -796,18 +796,18 @@ AC_ARG_ENABLE(pci,
[ --enable-pci enable limited i440FX PCI support],
[if test "$enableval" = yes; then
AC_MSG_RESULT(yes)
AC_DEFINE(BX_PCI_SUPPORT, 1)
AC_DEFINE(BX_SUPPORT_PCI, 1)
pci=1
PCI_OBJ='pci.o pci2isa.o pci_ide.o pcivga.o'
else
AC_MSG_RESULT(no)
AC_DEFINE(BX_PCI_SUPPORT, 0)
AC_DEFINE(BX_SUPPORT_PCI, 0)
pci=0
PCI_OBJ=''
fi],
[
AC_MSG_RESULT(no)
AC_DEFINE(BX_PCI_SUPPORT, 0)
AC_DEFINE(BX_SUPPORT_PCI, 0)
pci=0
PCI_OBJ=''
]
@ -860,16 +860,16 @@ AC_ARG_ENABLE(pcidev,
AC_MSG_ERROR([PCI host device mapping requires Linux as host])
;;
esac
AC_DEFINE(BX_PCI_DEV_SUPPORT, 1)
AC_DEFINE(BX_SUPPORT_PCIDEV, 1)
PCI_OBJ="$PCI_OBJ pcidev.o"
else
AC_MSG_RESULT(no)
AC_DEFINE(BX_PCI_DEV_SUPPORT, 0)
AC_DEFINE(BX_SUPPORT_PCIDEV, 0)
fi
],
[
AC_MSG_RESULT(no)
AC_DEFINE(BX_PCI_DEV_SUPPORT, 0)
AC_DEFINE(BX_SUPPORT_PCIDEV, 0)
]
)
@ -878,15 +878,15 @@ AC_ARG_ENABLE(usb,
[ --enable-usb enable limited USB support],
[if test "$enableval" = yes; then
AC_MSG_RESULT(yes)
AC_DEFINE(BX_PCI_USB_SUPPORT, 1)
AC_DEFINE(BX_SUPPORT_PCIUSB, 1)
PCI_OBJ="$PCI_OBJ pciusb.o"
else
AC_MSG_RESULT(no)
AC_DEFINE(BX_PCI_USB_SUPPORT, 0)
AC_DEFINE(BX_SUPPORT_PCIUSB, 0)
fi],
[
AC_MSG_RESULT(no)
AC_DEFINE(BX_PCI_USB_SUPPORT, 0)
AC_DEFINE(BX_SUPPORT_PCIUSB, 0)
]
)
@ -895,15 +895,15 @@ AC_ARG_ENABLE(pnic,
[ --enable-pnic enable pseudo NIC support],
[if test "$enableval" = yes; then
AC_MSG_RESULT(yes)
AC_DEFINE(BX_PCI_PNIC_SUPPORT, 1)
AC_DEFINE(BX_SUPPORT_PCIPNIC, 1)
PCI_OBJ="$PCI_OBJ pcipnic.o"
else
AC_MSG_RESULT(no)
AC_DEFINE(BX_PCI_PNIC_SUPPORT, 0)
AC_DEFINE(BX_SUPPORT_PCIPNIC, 0)
fi],
[
AC_MSG_RESULT(no)
AC_DEFINE(BX_PCI_PNIC_SUPPORT, 0)
AC_DEFINE(BX_SUPPORT_PCIPNIC, 0)
]
)
@ -1811,18 +1811,18 @@ AC_ARG_ENABLE(iodebug,
[ --enable-iodebug enable I/O interface to debugger],
[if test "$enableval" = yes; then
AC_MSG_RESULT(yes)
AC_DEFINE(BX_IODEBUG_SUPPORT, 1)
AC_DEFINE(BX_SUPPORT_IODEBUG, 1)
IODEBUG_OBJS='iodebug.o'
else
AC_MSG_RESULT(no)
AC_DEFINE(BX_IODEBUG_SUPPORT, 0)
AC_DEFINE(BX_SUPPORT_IODEBUG, 0)
fi
],
[
if test "" = 1; then
# enable by default if debugger is on
AC_MSG_RESULT(yes)
AC_DEFINE(BX_IODEBUG_SUPPORT, 1)
AC_DEFINE(BX_SUPPORT_IODEBUG, 1)
IODEBUG_OBJS='iodebug.o'
else
AC_MSG_RESULT(no)

8
bochs/gui/sdl.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: sdl.cc,v 1.52 2004-06-19 15:20:09 sshwarts Exp $
// $Id: sdl.cc,v 1.53 2004-08-06 15:49:53 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -36,9 +36,9 @@
#if BX_WITH_SDL
#include <stdlib.h>
#include <SDL/SDL.h>
#include <SDL/SDL_endian.h>
#include <SDL/SDL_thread.h>
#include <SDL.h>
#include <SDL_endian.h>
#include <SDL_thread.h>
#include "icon_bochs.h"
#include "sdl.h"

36
bochs/iodev/devices.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: devices.cc,v 1.74 2004-07-03 08:20:19 vruppert Exp $
// $Id: devices.cc,v 1.75 2004-08-06 15:49:54 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -52,20 +52,20 @@ bx_devices_c::bx_devices_c(void)
read_port_to_handler = NULL;
write_port_to_handler = NULL;
#if BX_PCI_SUPPORT
#if BX_SUPPORT_PCI
pluginPciBridge = &stubPci;
pluginPci2IsaBridge = &stubPci2Isa;
pluginPciIdeController = NULL;
#if BX_PCI_VGA_SUPPORT
#if BX_SUPPORT_PCIVGA
pluginPciVgaAdapter = NULL;
#endif
#if BX_PCI_DEV_SUPPORT
#if BX_SUPPORT_PCIDEV
pluginPciDevAdapter = NULL;
#endif
#if BX_PCI_USB_SUPPORT
#if BX_SUPPORT_PCIUSB
pluginPciUSBAdapter = NULL;
#endif
#if BX_PCI_PNIC_SUPPORT
#if BX_SUPPORT_PCIPNIC
pluginPciPNicAdapter = NULL;
#endif
#endif
@ -87,7 +87,7 @@ bx_devices_c::bx_devices_c(void)
pluginGameport = NULL;
pluginSpeaker = &stubSpeaker;
g2h = NULL;
#if BX_IODEBUG_SUPPORT
#if BX_SUPPORT_IODEBUG
iodebug = NULL;
#endif
}
@ -106,7 +106,7 @@ bx_devices_c::init(BX_MEM_C *newmem)
{
unsigned i;
BX_DEBUG(("Init $Id: devices.cc,v 1.74 2004-07-03 08:20:19 vruppert Exp $"));
BX_DEBUG(("Init $Id: devices.cc,v 1.75 2004-08-06 15:49:54 vruppert Exp $"));
mem = newmem;
/* set no-default handlers, will be overwritten by the real default handler */
@ -174,20 +174,20 @@ bx_devices_c::init(BX_MEM_C *newmem)
// PCI logic (i440FX)
if (bx_options.Oi440FXSupport->get ()) {
#if BX_PCI_SUPPORT
#if BX_SUPPORT_PCI
PLUG_load_plugin(pci, PLUGTYPE_CORE);
PLUG_load_plugin(pci2isa, PLUGTYPE_CORE);
PLUG_load_plugin(pci_ide, PLUGTYPE_OPTIONAL);
#if BX_PCI_VGA_SUPPORT
#if BX_SUPPORT_PCIVGA
PLUG_load_plugin(pcivga, PLUGTYPE_OPTIONAL);
#endif
#if BX_PCI_USB_SUPPORT
#if BX_SUPPORT_PCIUSB
PLUG_load_plugin(pciusb, PLUGTYPE_OPTIONAL);
#endif
#if BX_PCI_DEV_SUPPORT
#if BX_SUPPORT_PCIDEV
PLUG_load_plugin(pcidev, PLUGTYPE_OPTIONAL);
#endif
#if BX_PCI_PNIC_SUPPORT && BX_NE2K_SUPPORT
#if BX_SUPPORT_PCIPNIC && BX_SUPPORT_NE2K
if (bx_options.ne2k.Opresent->get ()) {
PLUG_load_plugin(pcipnic, PLUGTYPE_OPTIONAL);
}
@ -199,7 +199,7 @@ bx_devices_c::init(BX_MEM_C *newmem)
// NE2000 NIC
if (bx_options.ne2k.Opresent->get ()) {
#if BX_NE2K_SUPPORT
#if BX_SUPPORT_NE2K
PLUG_load_plugin(ne2k, PLUGTYPE_OPTIONAL);
#else
BX_ERROR(("Bochs is not compiled with NE2K support"));
@ -233,7 +233,7 @@ bx_devices_c::init(BX_MEM_C *newmem)
#endif
}
#if BX_PCI_SUPPORT
#if BX_SUPPORT_PCI
pluginPciBridge->init ();
pluginPci2IsaBridge->init ();
#endif
@ -252,7 +252,7 @@ bx_devices_c::init(BX_MEM_C *newmem)
bx_slowdown_timer.init();
#if BX_IODEBUG_SUPPORT
#if BX_SUPPORT_IODEBUG
iodebug = &bx_iodebug;
iodebug->init();
#endif
@ -312,7 +312,7 @@ bx_devices_c::init(BX_MEM_C *newmem)
bx_devices_c::reset(unsigned type)
{
pluginUnmapped->reset(type);
#if BX_PCI_SUPPORT
#if BX_SUPPORT_PCI
if (bx_options.Oi440FXSupport->get ()) {
pluginPciBridge->reset(type);
pluginPci2IsaBridge->reset(type);
@ -329,7 +329,7 @@ bx_devices_c::reset(unsigned type)
pluginPicDevice->reset(type);
pit->reset(type);
bx_slowdown_timer.reset(type);
#if BX_IODEBUG_SUPPORT
#if BX_SUPPORT_IODEBUG
iodebug->reset(type);
#endif
// now reset optional plugins

6
bochs/iodev/eth.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: eth.cc,v 1.19 2004-06-19 15:20:11 sshwarts Exp $
// $Id: eth.cc,v 1.20 2004-08-06 15:49:54 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -35,7 +35,7 @@
#define BX_PLUGGABLE
#include "iodev.h"
#if BX_NE2K_SUPPORT
#if BX_SUPPORT_NE2K
#define LOG_THIS /* not needed */
@ -205,4 +205,4 @@ int execute_script( char* scriptname, char* arg1 )
#endif // (HAVE_ETHERTAP==1) || (HAVE_TUNTAP==1)
#endif /* if BX_NE2K_SUPPORT */
#endif /* if BX_SUPPORT_NE2K */

6
bochs/iodev/eth_arpback.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: eth_arpback.cc,v 1.12 2004-06-19 15:20:11 sshwarts Exp $
// $Id: eth_arpback.cc,v 1.13 2004-08-06 15:49:54 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -38,7 +38,7 @@
#include "iodev.h"
#if BX_NE2K_SUPPORT && defined(ETH_ARPBACK)
#if BX_SUPPORT_NE2K && defined(ETH_ARPBACK)
#include "crc32.h"
#include "eth_packetmaker.h"
@ -210,5 +210,5 @@ void bx_arpback_pktmover_c::rx_timer (void)
}
}
#endif /* if BX_NE2K_SUPPORT && defined(ETH_ARPBACK) */
#endif /* if BX_SUPPORT_NE2K && defined(ETH_ARPBACK) */

6
bochs/iodev/eth_fbsd.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: eth_fbsd.cc,v 1.27 2004-06-19 15:20:11 sshwarts Exp $
// $Id: eth_fbsd.cc,v 1.28 2004-08-06 15:49:54 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -54,7 +54,7 @@
#define BX_PLUGGABLE
#include "iodev.h"
#if BX_NE2K_SUPPORT && defined(ETH_FBSD)
#if BX_SUPPORT_NE2K && defined(ETH_FBSD)
#define LOG_THIS bx_devices.pluginNE2kDevice->
@ -381,5 +381,5 @@ bx_fbsd_pktmover_c::rx_timer(void)
}
}
#endif /* if BX_NE2K_SUPPORT && defined(ETH_FBSD) */
#endif /* if BX_SUPPORT_NE2K && defined(ETH_FBSD) */

6
bochs/iodev/eth_linux.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: eth_linux.cc,v 1.15 2004-06-19 15:20:11 sshwarts Exp $
// $Id: eth_linux.cc,v 1.16 2004-08-06 15:49:54 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -46,7 +46,7 @@
#define BX_PLUGGABLE
#include "iodev.h"
#if BX_NE2K_SUPPORT && defined (ETH_LINUX)
#if BX_SUPPORT_NE2K && defined (ETH_LINUX)
#define LOG_THIS bx_devices.pluginNE2kDevice->
extern "C" {
@ -283,4 +283,4 @@ bx_linux_pktmover_c::rx_timer(void)
(*rxh)(rxarg, rxbuf, nbytes);
// }
}
#endif /* if BX_NE2K_SUPPORT && defined ETH_LINUX */
#endif /* if BX_SUPPORT_NE2K && defined ETH_LINUX */

6
bochs/iodev/eth_null.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: eth_null.cc,v 1.14 2004-06-19 15:20:11 sshwarts Exp $
// $Id: eth_null.cc,v 1.15 2004-08-06 15:49:54 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -37,7 +37,7 @@
#define BX_PLUGGABLE
#include "iodev.h"
#if BX_NE2K_SUPPORT
#if BX_SUPPORT_NE2K
#define LOG_THIS bx_devices.pluginNE2kDevice->
@ -161,4 +161,4 @@ void bx_null_pktmover_c::rx_timer_handler (void *this_ptr)
#endif
}
#endif /* if BX_NE2K_SUPPORT */
#endif /* if BX_SUPPORT_NE2K */

6
bochs/iodev/eth_packetmaker.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: eth_packetmaker.cc,v 1.9 2004-06-19 15:20:11 sshwarts Exp $
// $Id: eth_packetmaker.cc,v 1.10 2004-08-06 15:49:54 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Define BX_PLUGGABLE in files that can be compiled into plugins. For
@ -9,7 +9,7 @@
#include "iodev.h"
#if BX_NE2K_SUPPORT && defined(ETH_ARPBACK)
#if BX_SUPPORT_NE2K && defined(ETH_ARPBACK)
#include "eth_packetmaker.h"
@ -181,4 +181,4 @@ eth_ARPmaker::sendpacket(const eth_packet& outpacket) {
}
}
#endif /* if BX_NE2K_SUPPORT && defined(ETH_ARPBACK) */
#endif /* if BX_SUPPORT_NE2K && defined(ETH_ARPBACK) */

6
bochs/iodev/eth_tap.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: eth_tap.cc,v 1.17 2004-06-19 15:20:11 sshwarts Exp $
// $Id: eth_tap.cc,v 1.18 2004-08-06 15:49:54 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -85,7 +85,7 @@
#define BX_PLUGGABLE
#include "iodev.h"
#if BX_NE2K_SUPPORT
#if BX_SUPPORT_NE2K
#define LOG_THIS bx_devices.pluginNE2kDevice->
@ -367,4 +367,4 @@ void bx_tap_pktmover_c::rx_timer ()
(*rxh)(rxarg, rxbuf, nbytes);
}
#endif /* if BX_NE2K_SUPPORT */
#endif /* if BX_SUPPORT_NE2K */

6
bochs/iodev/eth_tuntap.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: eth_tuntap.cc,v 1.13 2004-06-19 15:20:11 sshwarts Exp $
// $Id: eth_tuntap.cc,v 1.14 2004-08-06 15:49:54 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -87,7 +87,7 @@
#define BX_PLUGGABLE
#include "iodev.h"
#if BX_NE2K_SUPPORT
#if BX_SUPPORT_NE2K
#define LOG_THIS bx_devices.pluginNE2kDevice->
@ -437,4 +437,4 @@ void bx_tuntap_pktmover_c::rx_timer ()
return fd;
}
#endif /* if BX_NE2K_SUPPORT */
#endif /* if BX_SUPPORT_NE2K */

6
bochs/iodev/eth_vde.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: eth_vde.cc,v 1.3 2004-06-19 15:20:11 sshwarts Exp $
// $Id: eth_vde.cc,v 1.4 2004-08-06 15:49:54 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2003 Renzo Davoli
@ -27,7 +27,7 @@
#define BX_PLUGGABLE
#include "iodev.h"
#if BX_NE2K_SUPPORT
#if BX_SUPPORT_NE2K
#define LOG_THIS bx_devices.pluginNE2kDevice->
@ -336,4 +336,4 @@ static int send_fd(char *name, int fddata, struct sockaddr_un *datasock, int gro
return fd;
}
#endif /* if BX_NE2K_SUPPORT */
#endif /* if BX_SUPPORT_NE2K */

4
bochs/iodev/eth_vnet.cc
View File

@ -14,7 +14,7 @@
#define BX_PLUGGABLE
#include "iodev.h"
#if BX_NE2K_SUPPORT
#if BX_SUPPORT_NE2K
#define LOG_THIS bx_devices.pluginNE2kDevice->
@ -974,4 +974,4 @@ bx_vnet_pktmover_c::udpipv4_dhcp_handler_ns(
#endif /* if BX_NE2K_SUPPORT */
#endif /* if BX_SUPPORT_NE2K */

6
bochs/iodev/eth_win32.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: eth_win32.cc,v 1.18 2004-06-19 15:20:11 sshwarts Exp $
// $Id: eth_win32.cc,v 1.19 2004-08-06 15:49:54 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -42,7 +42,7 @@
#define BX_PLUGGABLE
#include "iodev.h"
#if BX_NE2K_SUPPORT
#if BX_SUPPORT_NE2K
// windows.h included by bochs.h
#define LOG_THIS bx_devices.pluginNE2kDevice->
@ -356,4 +356,4 @@ void bx_win32_pktmover_c::rx_timer_handler (void *this_ptr)
}
}
#endif /* if BX_NE2K_SUPPORT */
#endif /* if BX_SUPPORT_NE2K */

6
bochs/iodev/iodebug.cc
View File

@ -1,10 +1,10 @@
/////////////////////////////////////////////////////////////////////////
// $Id: iodebug.cc,v 1.16 2004-06-19 15:20:12 sshwarts Exp $
// $Id: iodebug.cc,v 1.17 2004-08-06 15:49:54 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
#include "iodev.h"
#if BX_IODEBUG_SUPPORT
#if BX_SUPPORT_IODEBUG
@ -299,4 +299,4 @@ void bx_iodebug_c::add_range( Bit32u addr_start, Bit32u addr_end )
// fprintf(stderr, "IODEBUG unable to register memory range, all slots taken\n");
}
#endif /* if BX_IODEBUG_SUPPORT */
#endif /* if BX_SUPPORT_IODEBUG */

18
bochs/iodev/iodev.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: iodev.h,v 1.48 2004-07-11 20:38:48 vruppert Exp $
// $Id: iodev.h,v 1.49 2004-08-06 15:49:54 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -50,7 +50,7 @@ class bx_pit_c;
class bx_keyb_c;
class bx_ioapic_c;
class bx_g2h_c;
#if BX_IODEBUG_SUPPORT
#if BX_SUPPORT_IODEBUG
class bx_iodebug_c;
#endif
@ -373,7 +373,7 @@ public:
bx_devmodel_c *pluginExtFpuIrq;
bx_devmodel_c *pluginGameport;
bx_speaker_stub_c *pluginSpeaker;
#if BX_IODEBUG_SUPPORT
#if BX_SUPPORT_IODEBUG
bx_iodebug_c *iodebug;
#endif
@ -438,17 +438,17 @@ private:
#if BX_PCI_SUPPORT
#if BX_SUPPORT_PCI
#include "iodev/pci.h"
#include "iodev/pci2isa.h"
#include "iodev/pci_ide.h"
#if BX_PCI_VGA_SUPPORT
#if BX_SUPPORT_PCIVGA
#include "iodev/pcivga.h"
#endif
#if BX_PCI_DEV_SUPPORT
#if BX_SUPPORT_PCIDEV
#include "iodev/pcidev.h"
#endif
#if BX_PCI_USB_SUPPORT
#if BX_SUPPORT_PCIUSB
#include "iodev/pciusb.h"
#endif
#endif
@ -462,7 +462,7 @@ private:
#include "iodev/floppy.h"
#include "iodev/harddrv.h"
#include "iodev/vmware3.h"
#if BX_IODEBUG_SUPPORT
#if BX_SUPPORT_IODEBUG
# include "iodev/iodebug.h"
#endif
#include "iodev/keyboard.h"
@ -478,7 +478,7 @@ private:
#include "iodev/unmapped.h"
#include "iodev/eth.h"
#include "iodev/ne2k.h"
#if BX_PCI_PNIC_SUPPORT
#if BX_SUPPORT_PCIPNIC
#include "iodev/pcipnic.h"
#endif
#include "iodev/guest2host.h"

18
bochs/iodev/ne2k.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: ne2k.cc,v 1.65 2004-07-26 16:04:31 vruppert Exp $
// $Id: ne2k.cc,v 1.66 2004-08-06 15:49:54 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -33,7 +33,7 @@
#define BX_PLUGGABLE
#include "iodev.h"
#if BX_NE2K_SUPPORT
#if BX_SUPPORT_NE2K
//Never completely fill the ne2k ring so that we never
// hit the unclear completely full buffer condition.
@ -120,7 +120,7 @@ bx_ne2k_c::reset(unsigned type)
BX_NE2K_THIS s.ISR.reset = 1;
BX_NE2K_THIS s.DCR.longaddr = 1;
#if BX_PCI_SUPPORT
#if BX_SUPPORT_PCI
if ((type == BX_RESET_HARDWARE) && (BX_NE2K_THIS s.pci_enabled)) {
// This should be done by the PCI BIOS
Bit32u baseaddr = bx_options.ne2k.Oioaddr->get ();
@ -1303,14 +1303,14 @@ bx_ne2k_c::init(void)
{
char devname[16];
BX_DEBUG(("Init $Id: ne2k.cc,v 1.65 2004-07-26 16:04:31 vruppert Exp $"));
BX_DEBUG(("Init $Id: ne2k.cc,v 1.66 2004-08-06 15:49:54 vruppert Exp $"));
// Read in values from config file
memcpy(BX_NE2K_THIS s.physaddr, bx_options.ne2k.Omacaddr->getptr (), 6);
BX_NE2K_THIS s.pci_enabled = 0;
strcpy(devname, "NE2000 NIC");
#if BX_PCI_SUPPORT
#if BX_SUPPORT_PCI
if ((bx_options.Oi440FXSupport->get()) &&
(DEV_is_pci_device(BX_PLUGIN_NE2K))) {
BX_NE2K_THIS s.pci_enabled = 1;
@ -1423,7 +1423,7 @@ bx_ne2k_c::init(void)
bx_ne2k_c::set_irq_level(bx_bool level)
{
if (BX_NE2K_THIS s.pci_enabled) {
#if BX_PCI_SUPPORT
#if BX_SUPPORT_PCI
DEV_pci_set_irq(BX_NE2K_THIS s.devfunc, BX_NE2K_THIS s.pci_conf[0x3d], level);
#endif
} else {
@ -1435,7 +1435,7 @@ bx_ne2k_c::set_irq_level(bx_bool level)
}
}
#if BX_PCI_SUPPORT
#if BX_SUPPORT_PCI
// static pci configuration space read callback handler
// redirects to non-static class handler to avoid virtual functions
@ -1532,7 +1532,7 @@ bx_ne2k_c::pci_write(Bit8u address, Bit32u value, unsigned io_len)
}
}
#endif /* BX_PCI_SUPPORT */
#endif /* BX_SUPPORT_PCI */
#if BX_DEBUGGER
@ -1790,4 +1790,4 @@ bx_ne2k_c::print_info (FILE *fp, int page, int reg, int brief)
#endif
#endif /* if BX_NE2K_SUPPORT */
#endif /* if BX_SUPPORT_NE2K */

8
bochs/iodev/ne2k.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: ne2k.h,v 1.14 2004-07-04 17:07:49 vruppert Exp $
// $Id: ne2k.h,v 1.15 2004-08-06 15:49:54 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -193,7 +193,7 @@ typedef struct {
// pci stuff
bx_bool pci_enabled;
#if BX_PCI_SUPPORT
#if BX_SUPPORT_PCI
Bit8u devfunc;
Bit8u pci_conf[256];
#endif
@ -241,14 +241,14 @@ private:
static Bit32u read_handler(void *this_ptr, Bit32u address, unsigned io_len);
static void write_handler(void *this_ptr, Bit32u address, Bit32u value, unsigned io_len);
#if BX_PCI_SUPPORT
#if BX_SUPPORT_PCI
static Bit32u pci_read_handler(void *this_ptr, Bit8u address, unsigned io_len);
static void pci_write_handler(void *this_ptr, Bit8u address, Bit32u value, unsigned io_len);
#endif
#if !BX_USE_NE2K_SMF
Bit32u read(Bit32u address, unsigned io_len);
void write(Bit32u address, Bit32u value, unsigned io_len);
#if BX_PCI_SUPPORT
#if BX_SUPPORT_PCI
Bit32u pci_read(Bit8u address, unsigned io_len);
void pci_write(Bit8u address, Bit32u value, unsigned io_len);
#endif

6
bochs/iodev/pci.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: pci.cc,v 1.36 2004-07-12 18:16:16 vruppert Exp $
// $Id: pci.cc,v 1.37 2004-08-06 15:49:54 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -34,7 +34,7 @@
#define BX_PLUGGABLE
#include "iodev.h"
#if BX_PCI_SUPPORT
#if BX_SUPPORT_PCI
#define LOG_THIS thePciBridge->
@ -568,4 +568,4 @@ bx_pci_c::pci_set_base_io(void *this_ptr, bx_read_handler_t f1, bx_write_handler
*addr = baseaddr;
}
#endif /* BX_PCI_SUPPORT */
#endif /* BX_SUPPORT_PCI */

6
bochs/iodev/pci2isa.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: pci2isa.cc,v 1.19 2004-07-12 18:16:16 vruppert Exp $
// $Id: pci2isa.cc,v 1.20 2004-08-06 15:49:54 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -34,7 +34,7 @@
#define BX_PLUGGABLE
#include "iodev.h"
#if BX_PCI_SUPPORT
#if BX_SUPPORT_PCI
#define LOG_THIS thePci2IsaBridge->
@ -392,4 +392,4 @@ bx_pci2isa_c::pci_write(Bit8u address, Bit32u value, unsigned io_len)
}
}
#endif /* BX_PCI_SUPPORT */
#endif /* BX_SUPPORT_PCI */

6
bochs/iodev/pci_ide.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: pci_ide.cc,v 1.6 2004-07-11 20:38:48 vruppert Exp $
// $Id: pci_ide.cc,v 1.7 2004-08-06 15:49:54 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -34,7 +34,7 @@
#define BX_PLUGGABLE
#include "iodev.h"
#if BX_PCI_SUPPORT
#if BX_SUPPORT_PCI
#define LOG_THIS thePciIdeController->
@ -262,4 +262,4 @@ bx_pci_ide_c::pci_write(Bit8u address, Bit32u value, unsigned io_len)
}
}
#endif /* BX_PCI_SUPPORT */
#endif /* BX_SUPPORT_PCI */

4
bochs/iodev/pcidev.cc
View File

@ -27,7 +27,7 @@
#define BX_PLUGGABLE
#include "iodev.h"
#if BX_PCI_SUPPORT && BX_PCI_DEV_SUPPORT
#if BX_SUPPORT_PCI && BX_SUPPORT_PCIDEV
#include "kernel_pcidev.h"
@ -591,4 +591,4 @@ bx_pcidev_c::write(void *param, Bit32u address, Bit32u value, unsigned io_len)
BX_ERROR(("pcidev I/O write error"));
}
#endif // BX_PCI_SUPPORT && BX_PCI_DEV_SUPPORT
#endif // BX_SUPPORT_PCI && BX_SUPPORT_PCIDEV

6
bochs/iodev/pcipnic.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: pcipnic.cc,v 1.7 2004-07-13 17:45:34 vruppert Exp $
// $Id: pcipnic.cc,v 1.8 2004-08-06 15:49:55 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2003 Fen Systems Ltd.
@ -25,7 +25,7 @@
#define BX_PLUGGABLE
#include "iodev.h"
#if BX_PCI_SUPPORT && BX_PCI_PNIC_SUPPORT
#if BX_SUPPORT_PCI && BX_SUPPORT_PCIPNIC
#define LOG_THIS thePNICDevice->
@ -634,4 +634,4 @@ bx_pcipnic_c::rx_frame(const void *buf, unsigned io_len)
}
}
#endif // BX_PCI_SUPPORT && BX_PCI_PNIC_SUPPORT
#endif // BX_SUPPORT_PCI && BX_SUPPORT_PCIPNIC

6
bochs/iodev/pciusb.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: pciusb.cc,v 1.9 2004-07-12 17:34:28 vruppert Exp $
// $Id: pciusb.cc,v 1.10 2004-08-06 15:49:55 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2003 MandrakeSoft S.A.
@ -36,7 +36,7 @@
#define BX_PLUGGABLE
#include "iodev.h"
#if BX_PCI_SUPPORT && BX_PCI_USB_SUPPORT
#if BX_SUPPORT_PCI && BX_SUPPORT_PCIUSB
#define LOG_THIS theUSBDevice->
@ -653,4 +653,4 @@ bx_pciusb_c::pci_write(Bit8u address, Bit32u value, unsigned io_len)
BX_DEBUG(("Experimental USB PCI write register 0x%02x value 0x%s", address, szTmp));
}
#endif // BX_PCI_SUPPORT && BX_PCI_USB_SUPPORT
#endif // BX_SUPPORT_PCI && BX_SUPPORT_PCIUSB

6
bochs/iodev/pcivga.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: pcivga.cc,v 1.5 2004-06-29 19:24:34 vruppert Exp $
// $Id: pcivga.cc,v 1.6 2004-08-06 15:49:55 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002,2003 Mike Nordell
@ -34,7 +34,7 @@
#define BX_PLUGGABLE
#include "iodev.h"
#if BX_PCI_SUPPORT && BX_PCI_VGA_SUPPORT
#if BX_SUPPORT_PCI && BX_SUPPORT_PCIVGA
#define LOG_THIS thePciVgaAdapter->
@ -246,4 +246,4 @@ bx_pcivga_c::pci_write(Bit8u address, Bit32u value, unsigned io_len)
BX_DEBUG(("Experimental PCIVGA write register 0x%02x value 0x%s", address, szTmp));
}
#endif // BX_PCI_SUPPORT && BX_PCI_VGA_SUPPORT
#endif // BX_SUPPORT_PCI && BX_SUPPORT_PCIVGA

4
bochs/iodev/vga.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: vga.cc,v 1.107 2004-07-24 18:12:00 vruppert Exp $
// $Id: vga.cc,v 1.108 2004-08-06 15:49:55 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -294,7 +294,7 @@ bx_vga_c::init(void)
DEV_register_ioread_handler(this, vbe_read_handler, addr, "vga video", 7);
DEV_register_iowrite_handler(this, vbe_write_handler, addr, "vga video", 7);
}
#if !BX_PCI_USB_SUPPORT
#if !BX_SUPPORT_PCIUSB
for (addr=VBE_DISPI_IOPORT_INDEX_OLD; addr<=VBE_DISPI_IOPORT_DATA_OLD; addr++) {
DEV_register_ioread_handler(this, vbe_read_handler, addr, "vga video", 7);
DEV_register_iowrite_handler(this, vbe_write_handler, addr, "vga video", 7);

6
bochs/main.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: main.cc,v 1.279 2004-07-29 20:15:16 sshwarts Exp $
// $Id: main.cc,v 1.280 2004-08-06 15:49:52 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -36,7 +36,7 @@
// since SDL redefines main() to SDL_main(), we must include SDL.h so that the
// C language prototype is found. Otherwise SDL_main() will get its name
// mangled and not match what the SDL library is expecting.
#include <SDL/SDL.h>
#include <SDL.h>
#if defined(macintosh)
// Work around a bug in SDL 1.2.4 on MacOS X, which redefines getenv to
@ -984,7 +984,7 @@ bx_atexit(void)
}
#endif
#if BX_PCI_SUPPORT
#if BX_SUPPORT_PCI
if (bx_options.Oi440FXSupport->get ()) {
bx_devices.pluginPciBridge->print_i440fx_state();
}

20
bochs/memory/memory.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: memory.cc,v 1.32 2004-07-29 20:15:18 sshwarts Exp $
// $Id: memory.cc,v 1.33 2004-08-06 15:49:55 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -38,7 +38,7 @@ BX_MEM_C::writePhysicalPage(BX_CPU_C *cpu, Bit32u addr, unsigned len, void *data
// Note: accesses should always be contained within a single page now.
#if BX_IODEBUG_SUPPORT
#if BX_SUPPORT_IODEBUG
bx_iodebug_c::mem_write(cpu, addr, len, data);
#endif
@ -127,7 +127,7 @@ inc_one:
// (ignore write)
//BX_INFO(("ROM lock %08x: len=%u",
// (unsigned) a20addr, (unsigned) len));
#if BX_PCI_SUPPORT == 0
#if BX_SUPPORT_PCI == 0
#if BX_SHADOW_RAM
// Write it since its in shadow RAM
vector[a20addr] = *data_ptr;
@ -206,7 +206,7 @@ BX_MEM_C::readPhysicalPage(BX_CPU_C *cpu, Bit32u addr, unsigned len, void *data)
Bit8u *data_ptr;
Bit32u a20addr;
#if BX_IODEBUG_SUPPORT
#if BX_SUPPORT_IODEBUG
bx_iodebug_c::mem_read(cpu, addr, len, data);
#endif
@ -277,13 +277,13 @@ inc_one:
}
// addr in range 00080000 .. 000FFFFF
#if BX_PCI_SUPPORT == 0
#if BX_SUPPORT_PCI == 0
if ((a20addr <= 0x0009ffff) || (a20addr >= 0x000c0000) ) {
// regular memory 80000 .. 9FFFF, C0000 .. F0000
*data_ptr = vector[a20addr];
goto inc_one;
}
#else // #if BX_PCI_SUPPORT == 0
#else // #if BX_SUPPORT_PCI == 0
if (a20addr <= 0x0009ffff) {
*data_ptr = vector[a20addr];
goto inc_one;
@ -311,7 +311,7 @@ inc_one:
}
goto inc_one;
}
#endif // #if BX_PCI_SUPPORT == 0
#endif // #if BX_SUPPORT_PCI == 0
}
else {
// some or all of data is outside limits of physical memory
@ -336,12 +336,12 @@ inc_one:
}
#endif
for (i = 0; i < len; i++) {
#if BX_PCI_SUPPORT == 0
#if BX_SUPPORT_PCI == 0
if (a20addr < BX_MEM_THIS len)
*data_ptr = vector[a20addr];
else
*data_ptr = 0xff;
#else // BX_PCI_SUPPORT == 0
#else // BX_SUPPORT_PCI == 0
if (a20addr < BX_MEM_THIS len) {
if ((a20addr >= 0x000C0000) && (a20addr <= 0x000FFFFF)) {
if (!bx_options.Oi440FXSupport->get ())
@ -369,7 +369,7 @@ inc_one:
}
else
*data_ptr = 0xff;
#endif // BX_PCI_SUPPORT == 0
#endif // BX_SUPPORT_PCI == 0
addr++;
a20addr = (addr);
#ifdef BX_LITTLE_ENDIAN

6
bochs/memory/memory.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: memory.h,v 1.18 2004-06-06 17:01:19 vruppert Exp $
// $Id: memory.h,v 1.19 2004-08-06 15:49:55 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -64,7 +64,7 @@ public:
Bit8u *vector; // aligned correctly
size_t len;
size_t megabytes; // (len in Megabytes)
#if BX_PCI_SUPPORT
#if BX_SUPPORT_PCI
Bit8u shadow[4*16*4096]; // 256k of memory
#endif
#if BX_DEBUGGER
@ -85,7 +85,7 @@ public:
unsigned len, void *data) BX_CPP_AttrRegparmN(3);
BX_MEM_SMF void load_ROM(const char *path, Bit32u romaddress, Bit8u type);
BX_MEM_SMF Bit32u get_memory_in_k(void);
#if BX_PCI_SUPPORT
#if BX_SUPPORT_PCI
BX_MEM_SMF Bit8u* pci_fetch_ptr(Bit32u addr) BX_CPP_AttrRegparmN(1);
#endif
BX_MEM_SMF bx_bool dbg_fetch_mem(Bit32u addr, unsigned len, Bit8u *buf);

14
bochs/memory/misc_mem.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: misc_mem.cc,v 1.45 2004-07-29 20:15:19 sshwarts Exp $
// $Id: misc_mem.cc,v 1.46 2004-08-06 15:49:55 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -131,7 +131,7 @@ BX_MEM_C::~BX_MEM_C(void)
void
BX_MEM_C::init_memory(int memsize)
{
BX_DEBUG(("Init $Id: misc_mem.cc,v 1.45 2004-07-29 20:15:19 sshwarts Exp $"));
BX_DEBUG(("Init $Id: misc_mem.cc,v 1.46 2004-08-06 15:49:55 vruppert Exp $"));
// you can pass 0 if memory has been allocated already through
// the constructor, or the desired size of memory if it hasn't
// BX_INFO(("%.2fMB", (float)(BX_MEM_THIS megabytes) ));
@ -233,7 +233,7 @@ BX_MEM_C::load_ROM(const char *path, Bit32u romaddress, Bit8u type)
}
#endif // #if BX_PROVIDE_CPU_MEMORY
#if BX_PCI_SUPPORT
#if BX_SUPPORT_PCI
Bit8u* BX_CPP_AttrRegparmN(1)
BX_MEM_C::pci_fetch_ptr(Bit32u addr)
{
@ -269,7 +269,7 @@ BX_MEM_C::dbg_fetch_mem(Bit32u addr, unsigned len, Bit8u *buf)
*buf = DEV_vga_mem_read(addr);
}
else {
#if BX_PCI_SUPPORT == 0
#if BX_SUPPORT_PCI == 0
*buf = vector[addr];
#else
if ( bx_options.Oi440FXSupport->get () &&
@ -290,7 +290,7 @@ BX_MEM_C::dbg_fetch_mem(Bit32u addr, unsigned len, Bit8u *buf)
}
else
*buf = vector[addr];
#endif // #if BX_PCI_SUPPORT == 0
#endif // #if BX_SUPPORT_PCI == 0
}
buf++;
addr++;
@ -357,7 +357,7 @@ BX_MEM_C::getHostMemAddr(BX_CPU_C *cpu, Bit32u a20Addr, unsigned op)
if (op == BX_READ) {
if ( (a20Addr > 0x9ffff) && (a20Addr < 0xc0000) )
return(NULL); // Vetoed! Mem mapped IO (VGA)
#if !BX_PCI_SUPPORT
#if !BX_SUPPORT_PCI
return( (Bit8u *) & vector[a20Addr] );
#else
else if ( (a20Addr < 0xa0000) || (a20Addr > 0xfffff)
@ -382,7 +382,7 @@ BX_MEM_C::getHostMemAddr(BX_CPU_C *cpu, Bit32u a20Addr, unsigned op)
if ( (a20Addr < 0xa0000) || (a20Addr > 0xfffff) ) {
retAddr = (Bit8u *) & vector[a20Addr];
}
#if !BX_PCI_SUPPORT
#if !BX_SUPPORT_PCI
else
return(NULL); // Vetoed! Mem mapped IO (VGA) and ROMs
#else