diff --git a/src/dosbox.cpp b/src/dosbox.cpp index 418674393..4481143ae 100644 --- a/src/dosbox.cpp +++ b/src/dosbox.cpp @@ -127,8 +127,6 @@ extern bool VIDEO_BIOS_enable_CGA_8x8_second_half; extern bool allow_more_than_640kb; extern bool adapter_rom_is_ram; -bool enable_pc98_jump = false; - bool dos_con_use_int16_to_detect_input = true; bool dbg_zero_on_dos_allocmem = true; @@ -811,18 +809,6 @@ void DOSBOX_RealInit() { clockdom_8250_UART.set_name("8250 UART"); clockdom_ISA_BCLK.set_name("ISA BCLK"); clockdom_PCI_BCLK.set_name("PCI BCLK"); - - /* the changes are so large to begin supporting PC-98 that it's probably better - * to boot up in IBM PC/XT/AT mode and then switch into PC-98 */ - if (IS_PC98_ARCH) { - LOG_MSG("PC-98 WARNING: Implementation is very early, and not the initial state."); - - enable_pc98_jump = true; - int10.vesa_nolfb = false; - int10.vesa_oldvbe = false; - svgaCard = SVGA_None; - machine = MCH_VGA; - } } void DOSBOX_SetupConfigSections(void) { diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp index bab0e8a7a..e2c369460 100644 --- a/src/gui/sdlmain.cpp +++ b/src/gui/sdlmain.cpp @@ -5660,12 +5660,6 @@ int main(int argc, char* argv[]) { MAPPER_RunInternal(); } - /* if we're supposed to run in PC-98 mode, then do it NOW */ - if (enable_pc98_jump) { - machine = MCH_PC98; - enable_pc98_jump = false; - } - /* The machine just "powered on", and then reset finished */ if (!VM_PowerOn()) E_Exit("VM failed to power on"); diff --git a/src/hardware/adlib.cpp b/src/hardware/adlib.cpp index a43aa6b93..499f6aa53 100644 --- a/src/hardware/adlib.cpp +++ b/src/hardware/adlib.cpp @@ -698,8 +698,6 @@ void OPL_SaveRawEvent(bool pressed) { } } -extern bool enable_pc98_jump; - namespace Adlib { Module::Module( Section* configuration ) : Module_base(configuration) { @@ -783,9 +781,6 @@ OPL_Mode Module::oplmode=OPL_none; void OPL_Init(Section* sec,OPL_Mode oplmode) { - // HACK: Don't register anything if we know we're going to unregister later to enter PC-98 mode. - if (enable_pc98_jump) return; - Adlib::Module::oplmode = oplmode; module = new Adlib::Module( sec ); } diff --git a/src/hardware/vga.cpp b/src/hardware/vga.cpp index 041140531..533d8f2ba 100644 --- a/src/hardware/vga.cpp +++ b/src/hardware/vga.cpp @@ -643,13 +643,8 @@ void VGA_Reset(Section*) { else vga.vmemsize = _KB_bytes(256); break; case MCH_VGA: - if (enable_pc98_jump) { - if (vga.vmemsize < _KB_bytes(512)) vga.vmemsize = _KB_bytes(512); - } - else { - if (vga.vmemsize < _KB_bytes(256)) vga.vmemsize = _KB_bytes(256); - } - break; + if (vga.vmemsize < _KB_bytes(256)) vga.vmemsize = _KB_bytes(256); + break; case MCH_AMSTRAD: if (vga.vmemsize < _KB_bytes(64)) vga.vmemsize = _KB_bytes(64); /* FIXME: Right? */ break;