From 12b760f912f79945b334c79bc3d9739405af67cc Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Mon, 18 Jan 2016 16:11:08 -0800 Subject: [PATCH] Changed the last embedPC() parameter from sStateFile to sParms, although for backward compatibility, if sParms is not a JSON object definition (ie, beginning with a brace), it continues to be treated as a state filename. This change allows us to pass any number of additional properties to embedPC(), which in turn can override properties contained in the XML file; the only property overrides currently supported are 'state' (which overrides any 'state' property set in the XML's element) and 'automount' (which overrides any 'automount' property set in the XML's element). The goal is to make it easier to reuse XML machine definitions, by allowing commonly altered component attributes to be overridden. --- _config.yml | 3 + _includes/machine-engines.html | 8 +- devices/pc/keyboard/keyboard-minimal.xml | 1 - devices/pc/machine/README.md | 7 +- .../compaq/deskpro386/ega/2048kb/machine.xml | 8 +- disks/pc/README.md | 7 +- disks/pc/dos/microsoft/4.00/README.md | 3 - disks/pc/dos/microsoft/4.01/README.md | 3 - disks/pc/os2/misc/1.0/debugger/README.md | 4 +- disks/pc/os2/misc/README.md | 51 +- disks/pc/os2/misc/football/debugger/README.md | 25 + disks/pc/os2/misc/manifest.xml | 3 + docs/pcjs/demos/components.xsl | 41 +- docs/pcjs/demos/pc-dbg.js | 1051 ++++++++--------- docs/pcjs/demos/pc.js | 867 +++++++------- modules/c1pjs/templates/components.xsl | 16 +- modules/pcjs/lib/computer.js | 29 +- modules/pcjs/lib/fdc.js | 38 +- modules/pcjs/templates/components.xsl | 41 +- modules/shared/lib/component.js | 2 +- modules/shared/lib/embed.js | 47 +- pubs/pc/magazines/README.md | 4 +- versions/c1pjs/1.20.4/c1p-dbg.js | 6 +- versions/c1pjs/1.20.4/c1p.js | 6 +- versions/c1pjs/1.20.4/components.xsl | 16 +- versions/pcjs/1.20.4/components.xsl | 41 +- versions/pcjs/1.20.4/pc-dbg.js | 1051 ++++++++--------- versions/pcjs/1.20.4/pc.js | 867 +++++++------- 28 files changed, 2187 insertions(+), 2059 deletions(-) create mode 100644 disks/pc/os2/misc/football/debugger/README.md diff --git a/_config.yml b/_config.yml index 37a987bf0..928b5b6aa 100644 --- a/_config.yml +++ b/_config.yml @@ -12,6 +12,9 @@ url: "http://www.pcjs.org" # "http://jeffpar.github.io" or "http://www.pcjs.org twitter_username: jeffpar github_username: jeffpar +left_brace: "{" +right_brace: "}" + # Build settings exclude: ["index.html", "**/index.html", "logs", "node_modules", "**/c64", "src", "**/src", "**/static", "tmp", "videos", "web"] diff --git a/_includes/machine-engines.html b/_includes/machine-engines.html index 7c4e1a317..c55626f5b 100644 --- a/_includes/machine-engines.html +++ b/_includes/machine-engines.html @@ -10,11 +10,7 @@ {% else %} {% assign machine_template = machine.template %} {% endunless %} - {% unless machine.state %} - {% assign machine_state = '' %} - {% else %} - {% assign machine_state = machine.state %} - {% endunless %} + {% capture machine_parms %}{{ site.left_brace }}state:"{{ machine.state }}",autoMount:{{ machine.automount|jsonify }}{{ site.right_brace }}{% endcapture %} {% if site.pcjs.compiled == true and machine.uncompiled != true %} {% capture machine_script %}{% endcapture %} {% unless machine_scripts contains machine_script %} @@ -38,5 +34,5 @@ {% capture machine_template %}{{ site.baseurl }}/modules/{{ machine.type | remove:'-dbg' }}js/templates/components.xsl{% endcapture %} {% endif %} {% endif %} - + {% endfor %} diff --git a/devices/pc/keyboard/keyboard-minimal.xml b/devices/pc/keyboard/keyboard-minimal.xml index c967db9b6..f3ba3ddf6 100644 --- a/devices/pc/keyboard/keyboard-minimal.xml +++ b/devices/pc/keyboard/keyboard-minimal.xml @@ -1,7 +1,6 @@ ESC - CTRL-C F1 F10 diff --git a/devices/pc/machine/README.md b/devices/pc/machine/README.md index 89ce1d98c..95c9f15a7 100644 --- a/devices/pc/machine/README.md +++ b/devices/pc/machine/README.md @@ -37,8 +37,13 @@ Machines from our [IBM PC Application Archive](/apps/pc/): And here are some machines from our [IBM PC Disk Archive](/disks/pc/): -* [CP/M-86 v1.1B](/disks/pc/cpm/1.1b/) +* [PC-DOS 1.00](/disks/pc/dos/ibm/1.00/) +* [PC-DOS 1.10](/disks/pc/dos/ibm/1.10/) +* [Multitasking MS-DOS 4.00](/disks/pc/dos/microsoft/4.0M/) * [IBM Diagnostics v2.20](/disks/pc/diags/ibm/2.20/) +* [IBM OS/2 1.0](/disks/pc/os2/ibm/1.0/) +* [OS/2 1.0 Debugger Boot Disk](/disks/pc/os2/misc/1.0/debugger/) +* [CP/M-86 v1.1B](/disks/pc/cpm/1.1b/) * [Infocom Zork I](/disks/pc/games/infocom/zork1/) --- diff --git a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml index af1ab3c8b..81c0a74f3 100644 --- a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml +++ b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml @@ -3,16 +3,16 @@ - +