Retro/pcjs
Watch
1
0
Fork
You've already forked pcjs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

When a 'state' file is passed as a URL parameter, that's supposed to override a machine's 'resume' setting, but if a 'state' file is passed as EITHER a computer parameter (the original XML-based method) OR as a machine parameter (a newer method that allows a web page to override certain XML settings), that is NOT supposed to override the 'resume' setting. This restores the ability of the DONKEY.BAS demo to BOTH define a state file AND allow the machine to be suspended and resumed. Additionally, a new-ish Video card property (offStartAddr), which was originally added for the EGA/VGA, was not properly initialized for other cards, so when we restored the display of a suspended machine with a CGA, nothing would be displayed, due to lots of NaN buffer address calculations.

Browse source
This commit is contained in:
Jeff Parsons 2017-06-22 17:45:36 -07:00 • committed by Jeff Parsons
commit 0bd1be0df9
12 changed files with 1799 additions and 1779 deletions
Download patch file Download diff file Expand all files Collapse all files

2
devices/pcx86/machine/5150/cga/64kb/README.md
View file

@ -7,7 +7,7 @@ redirect_from:
---
IBM PC with Color Graphics (CGA) Display
---
----------------------------------------
All our 64Kb configurations of the IBM PC Model 5150 w/CGA are located here, including:

2
devices/pcx86/machine/5150/cga/64kb/debugger/machine.xml
View file

@ -2,7 +2,7 @@
<?xml-stylesheet type="text/xsl" href="/versions/pcx86/1.35.1/machine.xsl"?>
<machine id="ibm5150" type="pcx86" border="1" pos="center" background="default">
<name pos="center">IBM PC (Model 5150), CGA, 64K</name>
<computer id="pc-cga-64k" name="IBM PC"/>
<computer id="pc-cga-64k" name="IBM PC" resume="1"/>
<ram id="ramLow" addr="0x00000"/>
<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pcx86/rom/5150/basic/BASIC100.json"/>
<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pcx86/rom/5150/1981-04-24/PCBIOS-REV1.json"/>

2
devices/pcx86/machine/5150/cga/64kb/machine.xml
View file

@ -2,7 +2,7 @@
<?xml-stylesheet type="text/xsl" href="/versions/pcx86/1.35.1/machine.xsl"?>
<machine id="ibm5150" type="pcx86" border="1" pos="center" background="default">
<name pos="center">IBM PC (Model 5150), CGA, 64K</name>
<computer id="pc-cga-64k" name="IBM PC"/>
<computer id="pc-cga-64k" name="IBM PC" resume="1"/>
<ram id="ramLow" addr="0x00000"/>
<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pcx86/rom/5150/basic/BASIC100.json"/>
<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pcx86/rom/5150/1981-04-24/PCBIOS-REV1.json"/>