- remove references to obsolete hga. Now --enable-vga and --disable-vga
no longer exist. I think configure will silently ignore them.
- modified:
iodev/Makefile.in iodev/devices.cc iodev/iodev.h main.cc
configure.in config.h.in configure build/batch-build.perl
This commit is contained in:
Bryce Denney
parent
79831381de
commit
441eb253f7
@ -1,6 +1,6 @@
|
||||
#!/usr/bin/perl
|
||||
#####################################################################
|
||||
# $Id: batch-build.perl,v 1.8 2002-10-25 12:23:35 bdenney Exp $
|
||||
# $Id: batch-build.perl,v 1.9 2002-10-26 13:14:11 bdenney Exp $
|
||||
#####################################################################
|
||||
#
|
||||
# Batch build tool for multiple configurations
|
||||
@ -92,8 +92,6 @@ add_configuration ('dc2300-vlb-ide',
|
||||
'--enable-dc2300-vlb-ide');
|
||||
add_configuration ('port-e9-hack',
|
||||
'--enable-port-e9-hack');
|
||||
add_configuration ('novga',
|
||||
'--disable-vga');
|
||||
add_configuration ('cdrom',
|
||||
'--enable-cdrom');
|
||||
add_configuration ('gdbstub',
|
||||
|
||||
@ -636,8 +636,6 @@ typedef
|
||||
#define BX_PROVIDE_DEVICE_MODELS 1
|
||||
#define BX_PROVIDE_BIOS_HOOKS 1
|
||||
|
||||
#define BX_EMULATE_HGA_DUMPS 0
|
||||
|
||||
#define BX_SUPPORT_VGA 1
|
||||
#define BX_SUPPORT_VBE 0
|
||||
|
||||
|
||||
62
bochs/configure
vendored
62
bochs/configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in,v 1.147.2.22 2002/10/23 21:01:12 bdenney Exp .
|
||||
# From configure.in Id: configure.in,v 1.153 2002/10/24 21:04:27 bdenney Exp .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.53.
|
||||
#
|
||||
@ -1039,7 +1039,6 @@ Optional Features:
|
||||
--enable-simid=0 or 1 CPU simulator ID if using more than one
|
||||
--enable-num-sim=1 or 2 number of CPU simulators
|
||||
--enable-time0=n start at n instead of using time()
|
||||
--enable-vga use VGA emulation
|
||||
--enable-vbe use VESA BIOS extensions
|
||||
--enable-mmx compile in MMX emulation
|
||||
--enable-fpu compile in FPU emulation
|
||||
@ -1048,7 +1047,6 @@ Optional Features:
|
||||
--enable-cdrom CDROM support
|
||||
--enable-sb16=xxx Sound Blaster 16 Support (xxx=dummy|win|linux|freebsd)
|
||||
--enable-gdb-stub enable gdb stub support
|
||||
--enable-hga-dumps=Nmicroseconds copy memory to HGA buffer every N usec
|
||||
--enable-iodebug enable I/O interface to debugger
|
||||
|
||||
Optional Packages:
|
||||
@ -4204,7 +4202,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
|
||||
case $host in
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 4207 "configure"' > conftest.$ac_ext
|
||||
echo '#line 4205 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
@ -4754,7 +4752,7 @@ chmod -w .
|
||||
save_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
|
||||
compiler_c_o=no
|
||||
if { (eval echo configure:4757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
|
||||
if { (eval echo configure:4755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
if test -s out/conftest.err; then
|
||||
@ -6585,7 +6583,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6588 "configure"
|
||||
#line 6586 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -6683,7 +6681,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6686 "configure"
|
||||
#line 6684 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -8725,7 +8723,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8728 "configure"
|
||||
#line 8726 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -17820,6 +17818,7 @@ _ACEOF
|
||||
GUI_NON_PLUGIN_OBJS='$(OBJS_THAT_CANNOT_BE_PLUGINS) $(OBJS_THAT_CAN_BE_PLUGINS) $(OBJS_THAT_SUPPORT_OTHER_PLUGINS)'
|
||||
GUI_PLUGIN_OBJS=''
|
||||
fi
|
||||
|
||||
# copy gui variables into iodev variables. Later, we will add to the gui
|
||||
# objs list, according to which display libraries are enabled.
|
||||
IODEV_NON_PLUGIN_OBJS=$GUI_NON_PLUGIN_OBJS
|
||||
@ -19640,43 +19639,6 @@ _ACEOF
|
||||
fi;
|
||||
|
||||
|
||||
|
||||
echo "$as_me:$LINENO: checking for VGA emulation" >&5
|
||||
echo $ECHO_N "checking for VGA emulation... $ECHO_C" >&6
|
||||
# Check whether --enable-vga or --disable-vga was given.
|
||||
if test "${enable_vga+set}" = set; then
|
||||
enableval="$enable_vga"
|
||||
if test "$enableval" = yes; then
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define BX_SUPPORT_VGA 1
|
||||
_ACEOF
|
||||
|
||||
VIDEO_OBJS='$(VIDEO_OBJS_VGA)'
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define BX_SUPPORT_VGA 0
|
||||
_ACEOF
|
||||
|
||||
VIDEO_OBJS='$(VIDEO_OBJS_HGA)'
|
||||
fi
|
||||
else
|
||||
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define BX_SUPPORT_VGA 1
|
||||
_ACEOF
|
||||
|
||||
VIDEO_OBJS='$(VIDEO_OBJS_VGA)'
|
||||
|
||||
|
||||
fi;
|
||||
|
||||
|
||||
echo "$as_me:$LINENO: checking for VESA BIOS extensions" >&5
|
||||
echo $ECHO_N "checking for VESA BIOS extensions... $ECHO_C" >&6
|
||||
# Check whether --enable-vbe or --disable-vbe was given.
|
||||
@ -20176,15 +20138,6 @@ fi;
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-hga-dumps or --disable-hga-dumps was given.
|
||||
if test "${enable_hga_dumps+set}" = set; then
|
||||
enableval="$enable_hga_dumps"
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define BX_EMULATE_HGA_DUMPS $enableval
|
||||
_ACEOF
|
||||
|
||||
fi;
|
||||
|
||||
echo "$as_me:$LINENO: checking for I/O Interface to the debugger" >&5
|
||||
echo $ECHO_N "checking for I/O Interface to the debugger... $ECHO_C" >&6
|
||||
IODEBUG_OBJS=''
|
||||
@ -22425,7 +22378,6 @@ s,@DISASM_VAR@,$DISASM_VAR,;t t
|
||||
s,@READLINE_LIB@,$READLINE_LIB,;t t
|
||||
s,@INSTRUMENT_DIR@,$INSTRUMENT_DIR,;t t
|
||||
s,@INSTRUMENT_VAR@,$INSTRUMENT_VAR,;t t
|
||||
s,@VIDEO_OBJS@,$VIDEO_OBJS,;t t
|
||||
s,@FPU_VAR@,$FPU_VAR,;t t
|
||||
s,@FPU_GLUE_OBJ@,$FPU_GLUE_OBJ,;t t
|
||||
s,@CDROM_OBJS@,$CDROM_OBJS,;t t
|
||||
|
||||
@ -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.153 2002-10-24 21:04:27 bdenney Exp $]])
|
||||
AC_REVISION([[$Id: configure.in,v 1.154 2002-10-26 13:14:04 bdenney Exp $]])
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
AC_CONFIG_HEADER(ltdlconf.h)
|
||||
|
||||
@ -1222,27 +1222,6 @@ AC_ARG_ENABLE(time0,
|
||||
)
|
||||
|
||||
|
||||
|
||||
AC_MSG_CHECKING(for VGA emulation)
|
||||
AC_ARG_ENABLE(vga,
|
||||
[ --enable-vga use VGA emulation],
|
||||
[if test "$enableval" = yes; then
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(BX_SUPPORT_VGA, 1)
|
||||
VIDEO_OBJS='$(VIDEO_OBJS_VGA)'
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(BX_SUPPORT_VGA, 0)
|
||||
VIDEO_OBJS='$(VIDEO_OBJS_HGA)'
|
||||
fi],
|
||||
[
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(BX_SUPPORT_VGA, 1)
|
||||
VIDEO_OBJS='$(VIDEO_OBJS_VGA)'
|
||||
]
|
||||
)
|
||||
AC_SUBST(VIDEO_OBJS)
|
||||
|
||||
AC_MSG_CHECKING(for VESA BIOS extensions)
|
||||
AC_ARG_ENABLE(vbe,
|
||||
[ --enable-vbe use VESA BIOS extensions],
|
||||
@ -1482,11 +1461,6 @@ AC_ARG_ENABLE(gdb-stub,
|
||||
AC_SUBST(GDBSTUB_VAR)
|
||||
|
||||
|
||||
AC_ARG_ENABLE(hga-dumps,
|
||||
[ --enable-hga-dumps=Nmicroseconds copy memory to HGA buffer every N usec],
|
||||
AC_DEFINE_UNQUOTED(BX_EMULATE_HGA_DUMPS, $enableval),
|
||||
)
|
||||
|
||||
AC_MSG_CHECKING(for I/O Interface to the debugger)
|
||||
IODEBUG_OBJS=''
|
||||
AC_ARG_ENABLE(iodebug,
|
||||
|
||||
@ -45,9 +45,6 @@ top_builddir = ..
|
||||
LIBTOOL=@LIBTOOL@
|
||||
WIN32_DLL_IMPORT_LIBRARY=../dllexports.a
|
||||
|
||||
VIDEO_OBJS_VGA = vga.o
|
||||
VIDEO_OBJS_HGA = hga.o
|
||||
VIDEO_OBJS = @VIDEO_OBJS@
|
||||
CDROM_OBJS = @CDROM_OBJS@
|
||||
IOAPIC_OBJS = @IOAPIC_OBJS@
|
||||
|
||||
@ -76,7 +73,7 @@ OBJS_THAT_CAN_BE_PLUGINS = \
|
||||
parallel.o \
|
||||
floppy.o \
|
||||
keyboard.o \
|
||||
$(VIDEO_OBJS) \
|
||||
vga.o \
|
||||
biosdev.o \
|
||||
cmos.o \
|
||||
harddrv.o \
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
// $Id: devices.cc,v 1.39 2002-10-25 12:28:34 bdenney Exp $
|
||||
// $Id: devices.cc,v 1.40 2002-10-26 13:14:03 bdenney Exp $
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2002 MandrakeSoft S.A.
|
||||
@ -86,7 +86,7 @@ bx_devices_c::init(BX_MEM_C *newmem)
|
||||
{
|
||||
unsigned i;
|
||||
|
||||
BX_DEBUG(("Init $Id: devices.cc,v 1.39 2002-10-25 12:28:34 bdenney Exp $"));
|
||||
BX_DEBUG(("Init $Id: devices.cc,v 1.40 2002-10-26 13:14:03 bdenney Exp $"));
|
||||
mem = newmem;
|
||||
|
||||
/* no read / write handlers defined */
|
||||
@ -173,13 +173,8 @@ bx_devices_c::init(BX_MEM_C *newmem)
|
||||
sb16->init();
|
||||
#endif
|
||||
|
||||
#if BX_SUPPORT_VGA
|
||||
/*--- VGA adapter ---*/
|
||||
pluginVgaDevice->init ();
|
||||
#else
|
||||
/*--- HGA adapter ---*/
|
||||
bx_init_hga_hardware();
|
||||
#endif
|
||||
|
||||
/*--- 8259A PIC ---*/
|
||||
pluginPicDevice->init();
|
||||
@ -269,11 +264,7 @@ bx_devices_c::reset(unsigned type)
|
||||
#if BX_SUPPORT_SB16
|
||||
sb16->reset(type);
|
||||
#endif
|
||||
#if BX_SUPPORT_VGA
|
||||
pluginVgaDevice->reset(type);
|
||||
#else
|
||||
// reset hga hardware?
|
||||
#endif
|
||||
pluginPicDevice->reset(type);
|
||||
pit->reset(type);
|
||||
#if BX_USE_SLOWDOWN_TIMER
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
// $Id: iodev.h,v 1.20 2002-10-25 11:44:40 bdenney Exp $
|
||||
// $Id: iodev.h,v 1.21 2002-10-26 13:14:04 bdenney Exp $
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2002 MandrakeSoft S.A.
|
||||
@ -352,11 +352,7 @@ private:
|
||||
|
||||
#include "iodev/pci.h"
|
||||
#include "iodev/pci2isa.h"
|
||||
#if BX_SUPPORT_VGA
|
||||
# include "iodev/vga.h"
|
||||
#else
|
||||
# include "iodev/hga.h"
|
||||
#endif
|
||||
#include "iodev/vga.h"
|
||||
#if BX_SUPPORT_APIC
|
||||
# include "iodev/ioapic.h"
|
||||
#endif
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
// $Id: main.cc,v 1.165 2002-10-25 12:36:42 bdenney Exp $
|
||||
// $Id: main.cc,v 1.166 2002-10-26 13:14:04 bdenney Exp $
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2002 MandrakeSoft S.A.
|
||||
@ -66,7 +66,6 @@ void bx_close_harddrive(void);
|
||||
|
||||
|
||||
void bx_init_bx_dbg (void);
|
||||
void bx_emulate_hga_dumps_timer(void);
|
||||
static char *divider = "========================================================================";
|
||||
static logfunctions thePluginLog;
|
||||
logfunctions *pluginlog = &thePluginLog;
|
||||
@ -1897,16 +1896,6 @@ bx_atexit(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#if (BX_PROVIDE_CPU_MEMORY==1) && (BX_EMULATE_HGA_DUMPS>0)
|
||||
void
|
||||
bx_emulate_hga_dumps_timer(void)
|
||||
{
|
||||
void bx_hga_set_video_memory(Bit8u *ptr);
|
||||
|
||||
bx_hga_set_video_memory(&bx_phy_memory[0xb0000]);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if BX_PROVIDE_MAIN
|
||||
|
||||
char *
|
||||
|
||||
Loading…
Reference in New Issue
Block a user