From 99346be3bae0091967eed369dbe3afa77cbee9f6 Mon Sep 17 00:00:00 2001
From: Jeff Parsons <Jeff@pcjs.org>
Date: Mon, 18 Jan 2016 16:31:10 -0800
Subject: [PATCH] Start leveraging the new ability to specify machine overrides
 (/disks/pc/os2/misc/1.0/debugger/machine.xml is no longer needed)

---
 disks/pc/os2/misc/1.0/debugger/README.md      |  5 +++++
 disks/pc/os2/misc/1.0/debugger/machine.xml    | 21 -------------------
 disks/pc/os2/misc/football/debugger/README.md |  1 -
 modules/shared/lib/embed.js                   |  4 ++--
 4 files changed, 7 insertions(+), 24 deletions(-)
 delete mode 100644 disks/pc/os2/misc/1.0/debugger/machine.xml

diff --git a/disks/pc/os2/misc/1.0/debugger/README.md b/disks/pc/os2/misc/1.0/debugger/README.md
index 44a75ec20..461f9caab 100644
--- a/disks/pc/os2/misc/1.0/debugger/README.md
+++ b/disks/pc/os2/misc/1.0/debugger/README.md
@@ -5,6 +5,11 @@ permalink: /disks/pc/os2/misc/1.0/debugger/
 machines:
   - type: pc-dbg
     id: ibm5170
+    config: /devices/pc/machine/5170/ega/1152kb/rev3/machine.xml
+    automount:
+        A:
+          name: OS/2 1.0 Debugger Boot Disk
+          path: /disks/pc/os2/misc/1.0/debugger/OS210-BOOT.json
 ---
 
 OS/2 1.0 Debugger Boot Disk
diff --git a/disks/pc/os2/misc/1.0/debugger/machine.xml b/disks/pc/os2/misc/1.0/debugger/machine.xml
deleted file mode 100644
index fcb8a1079..000000000
--- a/disks/pc/os2/misc/1.0/debugger/machine.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.4/machine.xsl"?>
-<machine id="ibm5170" class="pc" border="1" pos="center" background="#FAEBD7">
-	<name>IBM PC AT (8Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk</name>
-	<computer id="at-ega-1152k" name="IBM PC AT" buswidth="24"/>
-	<cpu id="cpu286" model="80286" cycles="8000000"/>
-	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="ROM BIOS memory test has been disabled"/>
-	<ram id="ramExt" addr="0x100000" size="0x80000" comment=""/>
-	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/ibm-ega.json" notify="videoEGA"/>
-	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/bios/5170/1985-11-15.json"/>
-	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
-	<debugger id="debugger" messages="fault" commands=""/>
-	<panel ref="/devices/pc/panel/wide.xml"/>
-	<fdc ref="/disks/pc/library.xml" automount='{A:{name:"OS/2 1.0 Debugger Boot Disk",path:"/disks/pc/os2/misc/1.0/debugger/OS210-BOOT.json"}}'/>
-	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2}]'/>
-	<chipset id="chipset" model="5170" floppies="[1440,1200]"/>
-	<serial id="com1" adapter="1"/>
-	<serial id="com2" adapter="2" binding="print"/>
-	<mouse serial="com1"/>
-</machine>
diff --git a/disks/pc/os2/misc/football/debugger/README.md b/disks/pc/os2/misc/football/debugger/README.md
index 82f958b9f..4f3221576 100644
--- a/disks/pc/os2/misc/football/debugger/README.md
+++ b/disks/pc/os2/misc/football/debugger/README.md
@@ -6,7 +6,6 @@ machines:
   - type: pc-dbg
     id: deskpro386
     config: /devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml
-    uncompiled: true
     automount:
         A:
           name: OS/2 FOOTBALL Boot Disk (v7.68.17)
diff --git a/modules/shared/lib/embed.js b/modules/shared/lib/embed.js
index b8e62fbe8..df2694487 100644
--- a/modules/shared/lib/embed.js
+++ b/modules/shared/lib/embed.js
@@ -126,8 +126,8 @@ function parseXML(sXML, sXMLFile, idMachine, sParms, fResolve, display, done)
             var sURL = sXMLFile;
             if (sURL && sURL.indexOf('/') < 0) sURL = window.location.pathname + sURL;
             /*
-             * We embed the URL to the XML file both as a separate "xml" attribute for easy access from the
-             * XSL file and as part of the "parms" attribute for easy access from JavaScript.
+             * We embed the URL of the XML file both as a separate "xml" attribute for easy access from the
+             * XSL file, and as part of the "parms" attribute for easy access from machines (see getMachineParm()).
              */
             if (!sParms) {
                 sParms = '{';