Relax checksum test in disk.restore()

This commit is contained in:
Jeff Parsons 2014-11-10 15:10:58 -08:00 • committed by jeffpar
commit 605146075b
12 changed files with 1108 additions and 1080 deletions

View file

@ -14,7 +14,7 @@
<keyboard ref="/devices/pc/keyboard/minimal.xml"/>
<debugger id="debugger"/>
<panel ref="/devices/pc/panel/default.xml"/>
<fdc id="fdcNEC" width="280px" pos="left" padleft="8px" automount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pc/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"Executive Suite (1982)",path:"/apps/pc/1982/esuite/disk.json"}}'>
<fdc id="fdcNEC" width="280px" pos="left" padleft="8px" padbottom="8px" automount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pc/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"Executive Suite (1982)",path:"/apps/pc/1982/esuite/disk.json"}}'>
<control type="list" class="input" binding="listDrives"/>
<control type="list" class="input" binding="listDisks">
<disk path="">None</disk>

View file

@ -14,7 +14,7 @@
<control type="button" class="input" binding="run">Run</control>
</cpu>
<keyboard ref="/devices/pc/keyboard/minimal.xml"/>
<fdc id="fdcNEC" width="360px" pos="left" padleft="8px" automount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pc/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"Executive Suite (1982)",path:"/apps/pc/1982/esuite/disk.json"}}'>
<fdc id="fdcNEC" width="360px" pos="left" padleft="8px" padbottom="8px" automount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pc/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"Executive Suite (1982)",path:"/apps/pc/1982/esuite/disk.json"}}'>
<control type="list" class="input" binding="listDrives"/>
<control type="list" class="input" binding="listDisks">
<disk path="">None</disk>

View file

@ -33,6 +33,11 @@
font-family: Monaco, monospace;
font-size: x-small;
}
.pcjs-fieldset {
border: none;
margin: 0;
padding: 0;
}
.pcjs-flag {
font-family: "Lucida Console", monospace;
font-size: small;

View file

@ -355,6 +355,14 @@
<xsl:when test="@type = 'heading'">
<div><xsl:value-of select="."/></div>
</xsl:when>
<xsl:when test="@type = 'file'">
<form class="{$APPCLASS}-{@class}" data-value="{$type},{$binding}">
<fieldset class="{$APPCLASS}-fieldset">
<input type="file"/>
<input type="submit" value="Mount" disabled="true"/>
</fieldset>
</form>
</xsl:when>
<xsl:when test="@type = 'separator'">
<hr/>
</xsl:when>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -1554,7 +1554,7 @@ Disk.prototype.restore = function(deltas)
* just as well, since v1.01 also failed to properly deal with situations where the user mounted different diskette(s)
* prior to exiting (hopefully fixed in v1.02).
*/
else if (aDiskInfo[1] != null && aDiskInfo[1] != this.dwChecksum) {
else if (aDiskInfo[1] != null && this.dwChecksum != null && aDiskInfo[1] != this.dwChecksum) {
sReason = "original checksum (" + aDiskInfo[1] + ") differs from current checksum (" + this.dwChecksum + ")";
nChanges = -1;
}

View file

@ -126,6 +126,7 @@ pre a, code a {
width: 140px; /* should be <= margin-left of common-main */
padding-bottom: 20px;
overflow: hidden;
white-space: nowrap;
word-wrap: break-word;
}
.common-list {
@ -237,6 +238,7 @@ pre a, code a {
*/
.common-sidebar {
width: 100%;
white-space: normal;
}
.common-list {
padding-left: 0;

View file

@ -122,6 +122,7 @@ pre a, code a {
width: 140px;
padding-bottom: 20px;
overflow: hidden;
white-space: nowrap;
word-wrap: break-word;
}
.common-list {
@ -227,6 +228,7 @@ pre a, code a {
.common-sidebar {
width: 100%;
white-space: normal;
}
.common-list {
padding-left: 0;

View file

@ -122,6 +122,7 @@ pre a, code a {
width: 140px;
padding-bottom: 20px;
overflow: hidden;
white-space: nowrap;
word-wrap: break-word;
}
.common-list {
@ -227,6 +228,7 @@ pre a, code a {
.common-sidebar {
width: 100%;
white-space: normal;
}
.common-list {
padding-left: 0;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long