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

- removed plugins 'acpi' and 'ioapic' from the optional plugin control to avoid

Browse Source 
trouble. In the future they may depend on the selected PCI chipset.
This commit is contained in:
Volker Ruppert 2011-12-27 13:02:35 +00:00
parent c32eaa5d05
commit 8ef4c8abaa
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bochs/.bochsrc
View File

@ -7,8 +7,8 @@
# directly with this option and some of them install a config option that is
# only available when the plugin device is loaded. The value "1" means to load
# the plugin and "0" will unload it (if loaded before).
# These plugins are currently supported: 'acpi', 'biosdev', 'e1000', 'es1370',
# 'extfpuirq', 'gameport', 'ioapic', 'iodebug', 'speaker' and 'unmapped'.
# These plugins are currently supported: 'biosdev', 'e1000', 'es1370',
# 'extfpuirq', 'gameport', 'iodebug', 'speaker' and 'unmapped'.
#=======================================================================
#plugin_ctrl: unmapped=1, biosdev=1, speaker=1, e1000=1

4
bochs/iodev/devices.cc
View File

@ -183,11 +183,15 @@ void bx_devices_c::init(BX_MEM_C *newmem)
#if BX_SUPPORT_PCIUSB
PLUG_load_plugin(usb_common, PLUGTYPE_CORE);
#endif
PLUG_load_plugin(acpi, PLUGTYPE_OPTIONAL);
#else
BX_ERROR(("Bochs is not compiled with PCI support"));
#endif
}
#if BX_SUPPORT_APIC
PLUG_load_plugin(ioapic, PLUGTYPE_OPTIONAL);
#endif
PLUG_load_plugin(keyboard, PLUGTYPE_OPTIONAL);
#if BX_SUPPORT_BUSMOUSE
if (mouse_type == BX_MOUSE_TYPE_BUS) {

6
bochs/plugin.cc
View File

@ -830,12 +830,6 @@ static builtin_plugin_t builtin_opt_plugins[] = {
#if BX_SUPPORT_IODEBUG
BUILTIN_PLUGIN_ENTRY(iodebug),
#endif
#if BX_SUPPORT_PCI
BUILTIN_PLUGIN_ENTRY(acpi),
#endif
#if BX_SUPPORT_APIC
BUILTIN_PLUGIN_ENTRY(ioapic),
#endif
#if BX_SUPPORT_E1000
BUILTIN_PLUGIN_ENTRY(e1000),
#endif