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

fix BIOS screen after DOS/V reset

Browse Source
This commit is contained in:
Wengier
2021-11-20 20:29:29 -05:00
parent ed25b520c0
commit 3dcfcf3828
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/windows/installer/dosbox-x.reference.setup.conf
View File

@@ -707,7 +707,7 @@ pc-98 anex86 font =
# j3100: With the setting dosv=jp and a non-off value of this option, the Toshiba J-3100 machine will be emulated with DCGA support. # j3100: With the setting dosv=jp and a non-off value of this option, the Toshiba J-3100 machine will be emulated with DCGA support.
# Setting to "on" or "auto" starts J-3100 automatically, and with the setting "manual" you can enter J-3100 mode with DCGA command. # Setting to "on" or "auto" starts J-3100 automatically, and with the setting "manual" you can enter J-3100 mode with DCGA command.
# Possible values: off, on, auto, manual, 0, 1, 2. # Possible values: off, on, auto, manual, 0, 1, 2.
# j3100type: Specifies the machine type for the Toshiba J-3100 emulation if enabled. # j3100type: Specifies the Toshiba J-3100 machine type if J-3100 mode is enabled. The color palette will be changed with different machine types.
# Possible values: default, gt, sgt, gx, gl, sl, sgx, ss, gs, sx, sxb, sxw, sxp, ez, zs, zx. # Possible values: default, gt, sgt, gx, gl, sl, sgx, ss, gs, sx, sxb, sxw, sxp, ez, zs, zx.
dosv = off dosv = off
getsysfont = true getsysfont = true

2
dosbox-x.reference.conf
View File

@@ -342,7 +342,7 @@ pc-98 anex86 font =
# j3100: With the setting dosv=jp and a non-off value of this option, the Toshiba J-3100 machine will be emulated with DCGA support. # j3100: With the setting dosv=jp and a non-off value of this option, the Toshiba J-3100 machine will be emulated with DCGA support.
# Setting to "on" or "auto" starts J-3100 automatically, and with the setting "manual" you can enter J-3100 mode with DCGA command. # Setting to "on" or "auto" starts J-3100 automatically, and with the setting "manual" you can enter J-3100 mode with DCGA command.
# Possible values: off, on, auto, manual, 0, 1, 2. # Possible values: off, on, auto, manual, 0, 1, 2.
# j3100type: Specifies the machine type for the Toshiba J-3100 emulation if enabled. # j3100type: Specifies the Toshiba J-3100 machine type if J-3100 mode is enabled. The color palette will be changed with different machine types.
# Possible values: default, gt, sgt, gx, gl, sl, sgx, ss, gs, sx, sxb, sxw, sxp, ez, zs, zx. # Possible values: default, gt, sgt, gx, gl, sl, sgx, ss, gs, sx, sxb, sxw, sxp, ez, zs, zx.
dosv = off dosv = off
getsysfont = true getsysfont = true

2
dosbox-x.reference.full.conf
View File

@@ -687,7 +687,7 @@ pc-98 show graphics layer on initialize = true
# j3100: With the setting dosv=jp and a non-off value of this option, the Toshiba J-3100 machine will be emulated with DCGA support. # j3100: With the setting dosv=jp and a non-off value of this option, the Toshiba J-3100 machine will be emulated with DCGA support.
# Setting to "on" or "auto" starts J-3100 automatically, and with the setting "manual" you can enter J-3100 mode with DCGA command. # Setting to "on" or "auto" starts J-3100 automatically, and with the setting "manual" you can enter J-3100 mode with DCGA command.
# Possible values: off, on, auto, manual, 0, 1, 2. # Possible values: off, on, auto, manual, 0, 1, 2.
# j3100type: Specifies the machine type for the Toshiba J-3100 emulation if enabled. # j3100type: Specifies the Toshiba J-3100 machine type if J-3100 mode is enabled. The color palette will be changed with different machine types.
# Possible values: default, gt, sgt, gx, gl, sl, sgx, ss, gs, sx, sxb, sxw, sxp, ez, zs, zx. # Possible values: default, gt, sgt, gx, gl, sl, sgx, ss, gs, sx, sxb, sxw, sxp, ez, zs, zx.
dosv = off dosv = off
getsysfont = true getsysfont = true

6
include/dos_inc.h
View File

@@ -38,8 +38,10 @@ struct CommandTail{
#pragma pack () #pragma pack ()
#endif #endif
#define IS_DOS_JAPANESE (mem_readb(Real2Phys(dos.tables.dbcs) + 0x02) == 0x81 && mem_readb(Real2Phys(dos.tables.dbcs) + 0x03) == 0x9F) extern bool dos_kernel_disabled;
#define IS_DOS_CJK ((mem_readb(Real2Phys(dos.tables.dbcs) + 0x02) == 0x81 || mem_readb(Real2Phys(dos.tables.dbcs) + 0x02) == 0xA1) && (mem_readb(Real2Phys(dos.tables.dbcs) + 0x03) == 0x9F || mem_readb(Real2Phys(dos.tables.dbcs) + 0x03) == 0xFE))
#define IS_DOS_JAPANESE (!dos_kernel_disabled && mem_readb(Real2Phys(dos.tables.dbcs) + 0x02) == 0x81 && mem_readb(Real2Phys(dos.tables.dbcs) + 0x03) == 0x9F)
#define IS_DOS_CJK (!dos_kernel_disabled && ((mem_readb(Real2Phys(dos.tables.dbcs) + 0x02) == 0x81 || mem_readb(Real2Phys(dos.tables.dbcs) + 0x02) == 0xA1) && (mem_readb(Real2Phys(dos.tables.dbcs) + 0x03) == 0x9F || mem_readb(Real2Phys(dos.tables.dbcs) + 0x03) == 0xFE)))
#define IS_DOSV (dos.set_jdosv_enabled || dos.set_kdosv_enabled || dos.set_cdosv_enabled || dos.set_pdosv_enabled) #define IS_DOSV (dos.set_jdosv_enabled || dos.set_kdosv_enabled || dos.set_cdosv_enabled || dos.set_pdosv_enabled)
#define IS_JDOSV (dos.set_jdosv_enabled) #define IS_JDOSV (dos.set_jdosv_enabled)
#define IS_KDOSV (dos.set_kdosv_enabled) #define IS_KDOSV (dos.set_kdosv_enabled)

2
src/dosbox.cpp
View File

@@ -2153,7 +2153,7 @@ void DOSBOX_SetupConfigSections(void) {
Pstring = secprop->Add_string("j3100type",Property::Changeable::OnlyAtStart,"default"); Pstring = secprop->Add_string("j3100type",Property::Changeable::OnlyAtStart,"default");
Pstring->Set_values(j3100_types); Pstring->Set_values(j3100_types);
Pstring->Set_help("Specifies the machine type for the Toshiba J-3100 emulation if enabled."); Pstring->Set_help("Specifies the Toshiba J-3100 machine type if J-3100 mode is enabled. The color palette will be changed with different machine types.");
Pstring->SetBasic(true); Pstring->SetBasic(true);
secprop=control->AddSection_prop("video",&Null_Init); secprop=control->AddSection_prop("video",&Null_Init);