From a3d19ff7dffff54964050f73feba452b032b37b0 Mon Sep 17 00:00:00 2001
From: Jeff Parsons <Jeff@pcjs.org>
Date: Tue, 19 Jan 2016 13:40:02 -0800
Subject: [PATCH] More redundant machines eliminated, thanks to the new support
 for 'automount' overrides

---
 disks/pc/dos/ibm/1.00/README.md   |  5 +++++
 disks/pc/dos/ibm/1.00/machine.xml | 17 -----------------
 disks/pc/dos/ibm/1.10/README.md   |  5 +++++
 disks/pc/dos/ibm/1.10/machine.xml | 17 -----------------
 4 files changed, 10 insertions(+), 34 deletions(-)
 delete mode 100644 disks/pc/dos/ibm/1.00/machine.xml
 delete mode 100644 disks/pc/dos/ibm/1.10/machine.xml

diff --git a/disks/pc/dos/ibm/1.00/README.md b/disks/pc/dos/ibm/1.00/README.md
index 30a98b879..f69cf8152 100644
--- a/disks/pc/dos/ibm/1.00/README.md
+++ b/disks/pc/dos/ibm/1.00/README.md
@@ -5,6 +5,11 @@ permalink: /disks/pc/dos/ibm/1.00/
 machines:
   - type: pc
     id: ibm5150-pcdos100
+    config: /devices/pc/machine/5150/mda/64kb/machine.xml
+    automount:
+      A:
+        name: PC-DOS 1.00
+        path: /disks/pc/dos/ibm/1.00/PCDOS100.json
 ---
 
 PC-DOS 1.00
diff --git a/disks/pc/dos/ibm/1.00/machine.xml b/disks/pc/dos/ibm/1.00/machine.xml
deleted file mode 100644
index 66394d7c7..000000000
--- a/disks/pc/dos/ibm/1.00/machine.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.4/machine.xsl"?>
-<machine id="ibm5150" class="pc" border="1" pos="center" background="#FAEBD7">
-	<name pos="center">IBM PC (Model 5150) with Monochrome Display</name>
-	<computer id="pc-mda-64k" name="IBM PC" resume="1"/>
-	<ram id="ramLow" addr="0x00000"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
-	<video ref="/devices/pc/video/ibm/mda/ibm-mda.xml"/>
-	<cpu id="cpu8088" model="8088" autostart="true" padleft="8px">
-		<control type="button" binding="run">Run</control>
-		<control type="button" binding="reset">Reset</control>
-	</cpu>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
-	<fdc ref="/disks/pc/samples.xml" automount='{A:{name:"PC-DOS 1.00",path:"/disks/pc/dos/ibm/1.00/PCDOS100.json"}}' pos="right"/>
-	<chipset id="chipset" model="5150" sw1="01000001" sw2="11110000"/>
-</machine>
diff --git a/disks/pc/dos/ibm/1.10/README.md b/disks/pc/dos/ibm/1.10/README.md
index 56e961df4..320998b53 100644
--- a/disks/pc/dos/ibm/1.10/README.md
+++ b/disks/pc/dos/ibm/1.10/README.md
@@ -5,6 +5,11 @@ permalink: /disks/pc/dos/ibm/1.10/
 machines:
   - type: pc
     id: ibm5150-pcdos110
+    config: /devices/pc/machine/5150/mda/64kb/machine.xml
+    automount:
+      A:
+        name: PC-DOS 1.10
+        path: /disks/pc/dos/ibm/1.10/PCDOS110.json
 ---
 
 PC-DOS 1.10
diff --git a/disks/pc/dos/ibm/1.10/machine.xml b/disks/pc/dos/ibm/1.10/machine.xml
deleted file mode 100644
index 100465142..000000000
--- a/disks/pc/dos/ibm/1.10/machine.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.20.4/machine.xsl"?>
-<machine id="ibm5150" class="pc" border="1" pos="center" background="#FAEBD7">
-	<name pos="center">IBM PC (Model 5150) with Monochrome Display</name>
-	<computer id="pc-mda-64k" name="IBM PC" resume="1"/>
-	<ram id="ramLow" addr="0x00000"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
-	<video ref="/devices/pc/video/ibm/mda/ibm-mda.xml"/>
-	<cpu id="cpu8088" model="8088" autostart="true" padleft="8px">
-		<control type="button" binding="run">Run</control>
-		<control type="button" binding="reset">Reset</control>
-	</cpu>
-	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
-	<fdc ref="/disks/pc/samples.xml" automount='{A:{name:"PC-DOS 1.10",path:"/disks/pc/dos/ibm/1.10/PCDOS110.json"}}' pos="right"/>
-	<chipset id="chipset" model="5150" sw1="01000001" sw2="11110000"/>
-</machine>