joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-09 03:41:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move the IBM PC to PC-98 switchover into the end of BIOS POST routine

Browse Source
This commit is contained in:
Jonathan Campbell 2018-02-15 00:20:12 -08:00
parent 77533fb77e
commit 3c63a8b8f3
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/ints/bios.cpp
View File

@ -4550,8 +4550,16 @@ private:
phys_writeb(data+9,0); // Feature Byte 5
}
/* 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;
DispatchVMEvent(VM_EVENT_ENTER_PC98_MODE); /* IBM PC unregistration/shutdown */
DispatchVMEvent(VM_EVENT_ENTER_PC98_MODE_END); /* PC-98 registration/startup */
}
// ISA Plug & Play I/O ports
if (1) {
if (!IS_PC98_ARCH) {
ISAPNP_PNP_ADDRESS_PORT = new IO_WriteHandleObject;
ISAPNP_PNP_ADDRESS_PORT->Install(0x279,isapnp_write_port,IO_MB);
ISAPNP_PNP_DATA_PORT = new IO_WriteHandleObject;
@ -4561,7 +4569,7 @@ private:
LOG(LOG_MISC,LOG_DEBUG)("Registered ISA PnP read port at 0x%03x",ISA_PNP_WPORT);
}
if (enable_integration_device) {
if (!IS_PC98_ARCH && enable_integration_device) {
/* integration device callout */
if (dosbox_int_iocallout == IO_Callout_t_none)
dosbox_int_iocallout = IO_AllocateCallout(IO_TYPE_MB);
@ -4584,7 +4592,7 @@ private:
// ISA Plug & Play BIOS entrypoint
// NTS: Apparently, Windows 95, 98, and ME will re-enumerate and re-install PnP devices if our entry point changes it's address.
if (ISAPNPBIOS) {
if (!IS_PC98_ARCH && ISAPNPBIOS) {
int i;
Bitu base;
unsigned char c,tmp[256];
@ -4871,15 +4879,6 @@ private:
const char *msg = PACKAGE_STRING " (C) 2002-" COPYRIGHT_END_YEAR " The DOSBox Team\nA fork of DOSBox 0.74 by TheGreatCodeholio\nFor more info visit http://dosbox-x.com\nBased on DOSBox (http://dosbox.com)\n\n";
int logo_x,logo_y,x,y,rowheight=8;
/* if we're supposed to run in PC-98 mode, then do it NOW.
* sdlmain.cpp will come back around when it's made the change to this call. */
if (enable_pc98_jump) {
machine = MCH_PC98;
enable_pc98_jump = false;
DispatchVMEvent(VM_EVENT_ENTER_PC98_MODE); /* IBM PC unregistration/shutdown */
DispatchVMEvent(VM_EVENT_ENTER_PC98_MODE_END); /* PC-98 registration/startup */
}
y = 2;
x = 2;
logo_y = 2;