- Configure option --enable-acpi is deprecated and should not be used anymore.
The ACPI support is always automatically compiled in if PCI is compiled in.
The ACPI still could be disabled using .bochsrc 'plugin_ctrl' option.
Updated CHANGES and docs as well.
This commit is contained in:
Stanislav Shwartsman
parent
01ba2ef2b0
commit
76c11e1a40
@ -22,7 +22,6 @@
|
||||
--enable-instrumentation=instrument/example1 \
|
||||
--enable-ne2000 \
|
||||
--enable-pci \
|
||||
--enable-acpi \
|
||||
--enable-clgd54xx \
|
||||
--enable-usb \
|
||||
--enable-usb-ohci \
|
||||
|
||||
@ -26,6 +26,9 @@ Bochs repository moved to the SVN version control !
|
||||
The VBE support is always automatically compiled in, in order to enable
|
||||
VBE support the bochsrc option "vga: extension=" has to be set to "vbe". If
|
||||
PCI is present, the "pcivga" device can be assigned to PCI slot.
|
||||
- Configure option --enable-acpi is deprecated and should not be used anymore.
|
||||
The ACPI support is always automatically compiled in if PCI is compiled in.
|
||||
The ACPI still could be disabled using .bochsrc 'plugin_ctrl' option.
|
||||
|
||||
- I/O Devices
|
||||
- Networking
|
||||
|
||||
@ -1707,8 +1707,6 @@ void bx_init_options()
|
||||
#endif
|
||||
#if BX_SUPPORT_PCI
|
||||
new bx_param_bool_c(menu, "pci_ide", "Enable 'pci_ide'", "", 1);
|
||||
#endif
|
||||
#if BX_SUPPORT_ACPI
|
||||
new bx_param_bool_c(menu, "acpi", "Enable 'acpi'", "", 1);
|
||||
#endif
|
||||
#if BX_SUPPORT_APIC
|
||||
|
||||
@ -630,13 +630,6 @@ typedef
|
||||
// CLGD54XX emulation
|
||||
#define BX_SUPPORT_CLGD54XX 0
|
||||
|
||||
// ACPI controller
|
||||
#define BX_SUPPORT_ACPI 0
|
||||
|
||||
#if (BX_SUPPORT_ACPI && !BX_SUPPORT_PCI)
|
||||
#error To enable ACPI support, you must also enable PCI
|
||||
#endif
|
||||
|
||||
// Experimental host PCI device mapping
|
||||
#define BX_SUPPORT_PCIDEV 0
|
||||
|
||||
@ -669,7 +662,6 @@ typedef
|
||||
#endif
|
||||
|
||||
#define BX_SupportRepeatSpeedups 0
|
||||
#define BX_SupportHostAsms 0
|
||||
|
||||
#define BX_SUPPORT_TRACE_CACHE 0
|
||||
|
||||
|
||||
139
bochs/configure
vendored
139
bochs/configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in 10316 2011-04-21 13:27:42Z sshwarts .
|
||||
# From configure.in Id: configure.in 10333 2011-04-25 15:20:27Z sshwarts .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.67.
|
||||
#
|
||||
@ -837,7 +837,6 @@ INSMOD
|
||||
LSMOD
|
||||
KERNELDIR
|
||||
PCI_OBJ
|
||||
BX_SUPPORT_ACPI
|
||||
NE2K_OBJS
|
||||
BX_COMPRESSED_HD_SUPPORT
|
||||
OBJS64
|
||||
@ -946,7 +945,6 @@ enable_cpu_level
|
||||
enable_long_phy_address
|
||||
enable_compressed_hd
|
||||
enable_ne2000
|
||||
enable_acpi
|
||||
enable_pci
|
||||
enable_pcidev
|
||||
enable_usb
|
||||
@ -955,7 +953,6 @@ enable_pnic
|
||||
enable_repeat_speedups
|
||||
enable_trace_cache
|
||||
enable_fast_function_calls
|
||||
enable_host_specific_asms
|
||||
enable_configurable_msrs
|
||||
enable_show_ips
|
||||
enable_cpp
|
||||
@ -1017,6 +1014,7 @@ enable_global_pages
|
||||
enable_daz
|
||||
enable_vme
|
||||
enable_vbe
|
||||
enable_acpi
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
host_alias
|
||||
@ -1668,7 +1666,6 @@ Optional Features:
|
||||
--enable-long-phy-address compile in support for physical address larger than 32 bit
|
||||
--enable-compressed-hd allows compressed (zlib) hard disk image (not implemented yet)
|
||||
--enable-ne2000 enable limited ne2000 support
|
||||
--enable-acpi enable ACPI support
|
||||
--enable-pci enable limited i440FX PCI support
|
||||
--enable-pcidev enable PCI host device mapping support (linux host only)
|
||||
--enable-usb enable limited USB UHCI support
|
||||
@ -1677,7 +1674,6 @@ Optional Features:
|
||||
--enable-repeat-speedups support repeated IO and mem copy speedups
|
||||
--enable-trace-cache support instruction trace cache
|
||||
--enable-fast-function-calls support for fast function calls (gcc on x86 only)
|
||||
--enable-host-specific-asms support for host specific inline assembly
|
||||
--enable-configurable-msrs support for configurable MSR registers
|
||||
--enable-show-ips show IPS in Bochs log file
|
||||
--enable-cpp use .cpp as C++ suffix
|
||||
@ -1726,6 +1722,7 @@ Optional Features:
|
||||
--enable-daz enables denormals-are-zeroes support (deprecated)
|
||||
--enable-vme virtual 8086 mode extensions (deprecated)
|
||||
--enable-vbe use VESA BIOS extensions (deprecated)
|
||||
--enable-acpi use ACPI extensions support (deprecated)
|
||||
|
||||
Optional Packages:
|
||||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||
@ -5113,7 +5110,7 @@ ia64-*-hpux*)
|
||||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 5116 "configure"' > conftest.$ac_ext
|
||||
echo '#line 5113 "configure"' > conftest.$ac_ext
|
||||
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
@ -6801,11 +6798,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:6804: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:6801: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:6808: \$? = $ac_status" >&5
|
||||
echo "$as_me:6805: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -7034,11 +7031,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7037: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7034: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:7041: \$? = $ac_status" >&5
|
||||
echo "$as_me:7038: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -7101,11 +7098,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7104: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7101: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:7108: \$? = $ac_status" >&5
|
||||
echo "$as_me:7105: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -8891,7 +8888,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8894 "configure"
|
||||
#line 8891 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -8989,7 +8986,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8992 "configure"
|
||||
#line 8989 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -11104,11 +11101,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:11107: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:11104: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:11111: \$? = $ac_status" >&5
|
||||
echo "$as_me:11108: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -11171,11 +11168,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:11174: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:11171: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:11178: \$? = $ac_status" >&5
|
||||
echo "$as_me:11175: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -12196,7 +12193,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12199 "configure"
|
||||
#line 12196 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -12294,7 +12291,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12297 "configure"
|
||||
#line 12294 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -13117,11 +13114,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:13120: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13117: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:13124: \$? = $ac_status" >&5
|
||||
echo "$as_me:13121: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -13184,11 +13181,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:13187: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13184: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:13191: \$? = $ac_status" >&5
|
||||
echo "$as_me:13188: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -15149,11 +15146,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:15152: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15149: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:15156: \$? = $ac_status" >&5
|
||||
echo "$as_me:15153: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -15382,11 +15379,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:15385: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15382: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:15389: \$? = $ac_status" >&5
|
||||
echo "$as_me:15386: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -15449,11 +15446,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:15452: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15449: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:15456: \$? = $ac_status" >&5
|
||||
echo "$as_me:15453: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -17239,7 +17236,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17242 "configure"
|
||||
#line 17239 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -17337,7 +17334,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17340 "configure"
|
||||
#line 17337 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -19023,7 +19020,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19026 "configure"
|
||||
#line 19023 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -22013,33 +22010,6 @@ fi
|
||||
|
||||
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ACPI support" >&5
|
||||
$as_echo_n "checking for ACPI support... " >&6; }
|
||||
# Check whether --enable-acpi was given.
|
||||
if test "${enable_acpi+set}" = set; then :
|
||||
enableval=$enable_acpi; if test "$enableval" = yes; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
$as_echo "#define BX_SUPPORT_ACPI 1" >>confdefs.h
|
||||
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
$as_echo "#define BX_SUPPORT_ACPI 0" >>confdefs.h
|
||||
|
||||
fi
|
||||
else
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
$as_echo "#define BX_SUPPORT_ACPI 0" >>confdefs.h
|
||||
|
||||
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for i440FX PCI support" >&5
|
||||
$as_echo_n "checking for i440FX PCI support... " >&6; }
|
||||
# Check whether --enable-pci was given.
|
||||
@ -22462,29 +22432,6 @@ $as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for host specific inline assembly accelerations" >&5
|
||||
$as_echo_n "checking for host specific inline assembly accelerations... " >&6; }
|
||||
# Check whether --enable-host-specific-asms was given.
|
||||
if test "${enable_host_specific_asms+set}" = set; then :
|
||||
enableval=$enable_host_specific_asms; if test "$enableval" = yes; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
speedup_host_specific_asms=1
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
speedup_host_specific_asms=0
|
||||
fi
|
||||
else
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
speedup_host_specific_asms=0
|
||||
|
||||
|
||||
fi
|
||||
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking support for configurable MSR registers" >&5
|
||||
$as_echo_n "checking support for configurable MSR registers... " >&6; }
|
||||
# Check whether --enable-configurable-msrs was given.
|
||||
@ -22738,14 +22685,6 @@ else
|
||||
|
||||
fi
|
||||
|
||||
if test "$speedup_host_specific_asms" = 1; then
|
||||
$as_echo "#define BX_SupportHostAsms 1" >>confdefs.h
|
||||
|
||||
else
|
||||
$as_echo "#define BX_SupportHostAsms 0" >>confdefs.h
|
||||
|
||||
fi
|
||||
|
||||
if test "$speedup_fastcall" = 1; then
|
||||
$as_echo "#define BX_FAST_FUNC_CALL 1" >>confdefs.h
|
||||
|
||||
@ -25403,6 +25342,22 @@ $as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ACPI extensions support (deprecated)" >&5
|
||||
$as_echo_n "checking for ACPI extensions support (deprecated)... " >&6; }
|
||||
# Check whether --enable-acpi was given.
|
||||
if test "${enable_acpi+set}" = set; then :
|
||||
enableval=$enable_acpi; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
|
||||
$as_echo "$enableval" >&6; }
|
||||
as_fn_error $? "DEPRECATED - this feature enabled with PCI configure option and could be turned on through .bochsrc option" "$LINENO" 5
|
||||
|
||||
else
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Create some subdirectories for when you run configure from some other
|
||||
# directory.
|
||||
|
||||
@ -661,23 +661,6 @@ AC_ARG_ENABLE(ne2000,
|
||||
)
|
||||
AC_SUBST(NE2K_OBJS)
|
||||
|
||||
AC_MSG_CHECKING(for ACPI support)
|
||||
AC_ARG_ENABLE(acpi,
|
||||
[ --enable-acpi enable ACPI support],
|
||||
[if test "$enableval" = yes; then
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(BX_SUPPORT_ACPI, 1)
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(BX_SUPPORT_ACPI, 0)
|
||||
fi],
|
||||
[
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(BX_SUPPORT_ACPI, 0)
|
||||
]
|
||||
)
|
||||
AC_SUBST(BX_SUPPORT_ACPI)
|
||||
|
||||
AC_MSG_CHECKING(for i440FX PCI support)
|
||||
AC_ARG_ENABLE(pci,
|
||||
[ --enable-pci enable limited i440FX PCI support],
|
||||
@ -956,22 +939,6 @@ AC_ARG_ENABLE(fast-function-calls,
|
||||
]
|
||||
)
|
||||
|
||||
AC_MSG_CHECKING(for host specific inline assembly accelerations)
|
||||
AC_ARG_ENABLE(host-specific-asms,
|
||||
[ --enable-host-specific-asms support for host specific inline assembly],
|
||||
[if test "$enableval" = yes; then
|
||||
AC_MSG_RESULT(yes)
|
||||
speedup_host_specific_asms=1
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
speedup_host_specific_asms=0
|
||||
fi],
|
||||
[
|
||||
AC_MSG_RESULT(no)
|
||||
speedup_host_specific_asms=0
|
||||
]
|
||||
)
|
||||
|
||||
AC_MSG_CHECKING(support for configurable MSR registers)
|
||||
AC_ARG_ENABLE(configurable-msrs,
|
||||
[ --enable-configurable-msrs support for configurable MSR registers],
|
||||
@ -1155,12 +1122,6 @@ else
|
||||
AC_DEFINE(BX_SupportRepeatSpeedups, 0)
|
||||
fi
|
||||
|
||||
if test "$speedup_host_specific_asms" = 1; then
|
||||
AC_DEFINE(BX_SupportHostAsms, 1)
|
||||
else
|
||||
AC_DEFINE(BX_SupportHostAsms, 0)
|
||||
fi
|
||||
|
||||
if test "$speedup_fastcall" = 1; then
|
||||
AC_DEFINE(BX_FAST_FUNC_CALL, 1)
|
||||
else
|
||||
@ -2804,6 +2765,16 @@ AC_ARG_ENABLE(vbe,
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
AC_MSG_CHECKING(for ACPI extensions support (deprecated))
|
||||
AC_ARG_ENABLE(acpi,
|
||||
[ --enable-acpi use ACPI extensions support (deprecated)],
|
||||
[AC_MSG_RESULT($enableval)
|
||||
AC_MSG_ERROR([DEPRECATED - this feature enabled with PCI configure option and could be turned on through .bochsrc option])
|
||||
],
|
||||
[
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
|
||||
# Create some subdirectories for when you run configure from some other
|
||||
# directory.
|
||||
|
||||
@ -6006,7 +6006,7 @@ structures are dynamically created by Bochs.
|
||||
</para></listitem>
|
||||
<listitem><para> ACPI support is required to boot SMP system in most of modern
|
||||
operating systems. For example WinXP 64 bit require ACPI support even for
|
||||
single processor configuration. Still not supported by Bochs. (FIXME)
|
||||
single processor configuration.
|
||||
</para></listitem>
|
||||
</itemizedlist>
|
||||
</para>
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
|
||||
#include "iodev.h"
|
||||
|
||||
#if BX_SUPPORT_PCI && BX_SUPPORT_ACPI
|
||||
#if BX_SUPPORT_PCI
|
||||
|
||||
#include "pci.h"
|
||||
#include "acpi.h"
|
||||
|
||||
@ -70,9 +70,7 @@ void bx_devices_c::init_stubs()
|
||||
pluginPciBridge = &stubPci;
|
||||
pluginPci2IsaBridge = &stubPci2Isa;
|
||||
pluginPciIdeController = &stubPciIde;
|
||||
#if BX_SUPPORT_ACPI
|
||||
pluginACPIController = &stubACPIController;
|
||||
#endif
|
||||
#endif
|
||||
pluginKeyboard = &stubKeyboard;
|
||||
pluginDmaDevice = &stubDma;
|
||||
@ -232,8 +230,6 @@ void bx_devices_c::init(BX_MEM_C *newmem)
|
||||
else if (!strcmp(plugname, BX_PLUGIN_PCI_IDE)) {
|
||||
PLUG_load_plugin(pci_ide, PLUGTYPE_OPTIONAL);
|
||||
}
|
||||
#endif
|
||||
#if BX_SUPPORT_ACPI
|
||||
else if (!strcmp(plugname, BX_PLUGIN_ACPI)) {
|
||||
PLUG_load_plugin(acpi, PLUGTYPE_OPTIONAL);
|
||||
}
|
||||
|
||||
@ -314,7 +314,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
#if BX_SUPPORT_ACPI
|
||||
#if BX_SUPPORT_PCI
|
||||
class BOCHSAPI bx_acpi_ctrl_stub_c : public bx_devmodel_c, public bx_pci_device_stub_c {
|
||||
public:
|
||||
virtual void generate_smi(Bit8u value) {}
|
||||
@ -436,7 +436,7 @@ public:
|
||||
bx_pci_bridge_stub_c *pluginPciBridge;
|
||||
bx_pci2isa_stub_c *pluginPci2IsaBridge;
|
||||
bx_pci_ide_stub_c *pluginPciIdeController;
|
||||
#if BX_SUPPORT_ACPI
|
||||
#if BX_SUPPORT_PCI
|
||||
bx_acpi_ctrl_stub_c *pluginACPIController;
|
||||
#endif
|
||||
bx_devmodel_c *pluginPitDevice;
|
||||
@ -484,7 +484,7 @@ public:
|
||||
bx_pci_ide_stub_c stubPciIde;
|
||||
bx_ne2k_stub_c stubNE2k;
|
||||
bx_speaker_stub_c stubSpeaker;
|
||||
#if BX_SUPPORT_ACPI
|
||||
#if BX_SUPPORT_PCI
|
||||
bx_acpi_ctrl_stub_c stubACPIController;
|
||||
#endif
|
||||
#if BX_SUPPORT_IODEBUG
|
||||
|
||||
@ -289,10 +289,10 @@ void bx_piix3_c::write(Bit32u address, Bit32u value, unsigned io_len)
|
||||
|
||||
switch (address) {
|
||||
case 0x00b2:
|
||||
#if BX_SUPPORT_ACPI
|
||||
#if BX_SUPPORT_PCI
|
||||
DEV_acpi_generate_smi((Bit8u)value);
|
||||
#else
|
||||
BX_ERROR(("write %08x: APM command register not supported yet", value));
|
||||
BX_ERROR(("write %08x: APM command register not supported without ACPI", value));
|
||||
#endif
|
||||
BX_P2I_THIS s.apmc = value & 0xff;
|
||||
break;
|
||||
|
||||
@ -1080,7 +1080,6 @@ void bx_init_hardware()
|
||||
BX_INFO((" Trace cache support: %s",BX_SUPPORT_TRACE_CACHE?"yes":"no"));
|
||||
BX_INFO((" Fast function calls: %s",BX_FAST_FUNC_CALL?"yes":"no"));
|
||||
BX_INFO(("Devices configuration"));
|
||||
BX_INFO((" ACPI support: %s",BX_SUPPORT_ACPI?"yes":"no"));
|
||||
BX_INFO((" NE2000 support: %s",BX_SUPPORT_NE2K?"yes":"no"));
|
||||
BX_INFO((" PCI support: %s, enabled=%s",BX_SUPPORT_PCI?"yes":"no",
|
||||
SIM->get_param_bool(BXPN_I440FX_SUPPORT)->get() ? "yes" : "no"));
|
||||
|
||||
Loading…
Reference in New Issue
Block a user