From ced512d85f3651cb37ad76d80d9e802b30019732 Mon Sep 17 00:00:00 2001
From: Jeff Parsons <Jeff@pcjs.org>
Date: Wed, 29 Oct 2014 18:12:41 -0700
Subject: [PATCH] Restore original machine.xml, and use local.xml test machine
 for local.html instead

---
 .../machines/8kb/large/debugger/local.html    |  5 +--
 .../c1p/machines/8kb/large/debugger/local.xml | 31 +++++++++++++++++++
 .../machines/8kb/large/debugger/machine.xml   | 12 +++----
 3 files changed, 40 insertions(+), 8 deletions(-)
 create mode 100644 configs/c1p/machines/8kb/large/debugger/local.xml

diff --git a/configs/c1p/machines/8kb/large/debugger/local.html b/configs/c1p/machines/8kb/large/debugger/local.html
index c753f7314..dc9a44028 100644
--- a/configs/c1p/machines/8kb/large/debugger/local.html
+++ b/configs/c1p/machines/8kb/large/debugger/local.html
@@ -34,7 +34,8 @@
 		<div class="common-sidebar">
 			<ul class="common-list">
 				<li><a href="../../../../../../configs/c1p/machines/8kb/large">\..</a></li>
-				<li><a href="../../../../../../configs/c1p/machines/8kb/large/debugger/demo.html">\DEMO.HTML</a></li>
+				<li><a href="../../../../../../configs/c1p/machines/8kb/large/debugger/local.html">\LOCAL.HTML</a></li>
+				<li><a href="../../../../../../configs/c1p/machines/8kb/large/debugger/local.xml">\LOCAL.XML</a></li>
 				<li><a href="../../../../../../configs/c1p/machines/8kb/large/debugger/machine.xml">\MACHINE.XML</a></li>
 			</ul>
 
@@ -70,7 +71,7 @@
 <script type="text/javascript" src="../../../../../../my_modules/c1pjs-client/lib/debugger.js"></script>
 <script type="text/javascript" src="../../../../../../my_modules/c1pjs-client/lib/computer.js"></script>
 <script type="text/javascript" src="../../../../../../my_modules/shared/lib/embed.js"></script>
-<script type="text/javascript">window.embedC1P("c1p8kb","machine.xml","../../../../../../my_modules/c1pjs-client/templates/components.xsl");</script>
+<script type="text/javascript">window.embedC1P("c1p8kb","local.xml","../../../../../../my_modules/c1pjs-client/templates/components.xsl");</script>
 
 </body>
 </html>
diff --git a/configs/c1p/machines/8kb/large/debugger/local.xml b/configs/c1p/machines/8kb/large/debugger/local.xml
new file mode 100644
index 000000000..460c40873
--- /dev/null
+++ b/configs/c1p/machines/8kb/large/debugger/local.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="../../../../../../versions/c1pjs/1.15.7/machine.xsl"?>
+<machine id="c1p8kb" class="c1p" border="1" width="100%" style="background-color:#FAEBD7;padding-bottom:8px">
+	<name>OSI Challenger 1P (8Kb) with Debugger</name>
+	<computer id="c1p" name="Challenger 1P">
+		<module type="cpu" refid="cpu6502" start="0x0000" end="0xffff"/>
+		<module type="ram" refid="ram8K" start="0x0000" end="0x1fff"/>
+		<module type="rom" refid="romNull" start="0x2000" end="0x9fff"/>
+		<module type="rom" refid="romBasic" start="0xa000" end="0xbfff"/>
+		<module type="video" refid="video" start="0xd000" end="0xd3ff"/>
+		<module type="keyboard" refid="keyboard" start="0xdf00" end="0xdfff"/>
+		<module type="serial" refid="serialPort" start="0xf000" end="0xf0ff"/>
+		<module type="rom" refid="romSystem" start="0xf800" end="0xffff"/>
+	</computer>
+	<cpu id="cpu6502"/>
+	<debugger id="debugger"/>
+	<ram id="ram8K" size="0x2000"/>
+	<rom id="romNull" size="0x8000"/>
+	<rom id="romBasic" size="0x2000" image="../../../../../../devices/c1p/roms/basic-gcpatch.hex"/>
+	<rom id="romSystem" size="0x0800" image="../../../../../../devices/c1p/roms/system.hex"/>
+	<video id="video" screenwidth="512" screenheight="384" cols="32" rows="32" charset="../../../../../../devices/c1p/video/chargen2x.png" width="512px" padding="8px">
+		<name>Video Display</name>
+	</video>
+	<keyboard id="keyboard" padleft="8px">
+		<control type="button" class="input" binding="ctrl-c">CTRL-C</control>
+		<control type="button" class="input" binding="ctrl-o">CTRL-O</control>
+		<control type="button" class="input" binding="break">BREAK</control>
+	</keyboard>
+	<serial ref="../../../../serial/samples.xml"/>
+	<panel ref="../../../../panels/default.xml"/>
+</machine>
diff --git a/configs/c1p/machines/8kb/large/debugger/machine.xml b/configs/c1p/machines/8kb/large/debugger/machine.xml
index 460c40873..d27785bbe 100644
--- a/configs/c1p/machines/8kb/large/debugger/machine.xml
+++ b/configs/c1p/machines/8kb/large/debugger/machine.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="../../../../../../versions/c1pjs/1.15.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/versions/c1pjs/1.15.7/machine.xsl"?>
 <machine id="c1p8kb" class="c1p" border="1" width="100%" style="background-color:#FAEBD7;padding-bottom:8px">
 	<name>OSI Challenger 1P (8Kb) with Debugger</name>
 	<computer id="c1p" name="Challenger 1P">
@@ -16,9 +16,9 @@
 	<debugger id="debugger"/>
 	<ram id="ram8K" size="0x2000"/>
 	<rom id="romNull" size="0x8000"/>
-	<rom id="romBasic" size="0x2000" image="../../../../../../devices/c1p/roms/basic-gcpatch.hex"/>
-	<rom id="romSystem" size="0x0800" image="../../../../../../devices/c1p/roms/system.hex"/>
-	<video id="video" screenwidth="512" screenheight="384" cols="32" rows="32" charset="../../../../../../devices/c1p/video/chargen2x.png" width="512px" padding="8px">
+	<rom id="romBasic" size="0x2000" image="/devices/c1p/roms/basic-gcpatch.hex"/>
+	<rom id="romSystem" size="0x0800" image="/devices/c1p/roms/system.hex"/>
+	<video id="video" screenwidth="512" screenheight="384" cols="32" rows="32" charset="/devices/c1p/video/chargen2x.png" width="512px" padding="8px">
 		<name>Video Display</name>
 	</video>
 	<keyboard id="keyboard" padleft="8px">
@@ -26,6 +26,6 @@
 		<control type="button" class="input" binding="ctrl-o">CTRL-O</control>
 		<control type="button" class="input" binding="break">BREAK</control>
 	</keyboard>
-	<serial ref="../../../../serial/samples.xml"/>
-	<panel ref="../../../../panels/default.xml"/>
+	<serial ref="/configs/c1p/serial/samples.xml"/>
+	<panel ref="/configs/c1p/panels/default.xml"/>
 </machine>