Retro/pcjs
Watch
1
0
Fork
You've already forked pcjs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Start leveraging the new ability to specify machine overrides (/disks/pc/os2/misc/1.0/debugger/machine.xml is no longer needed)

Browse source
This commit is contained in:
Jeff Parsons 2016-01-18 16:31:10 -08:00
commit 99346be3ba
4 changed files with 7 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
disks/pc/os2/misc/1.0/debugger/README.md
View file

@ -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

21
disks/pc/os2/misc/1.0/debugger/machine.xml
View file

@ -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>

1
disks/pc/os2/misc/football/debugger/README.md
View file

@ -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)

4
modules/shared/lib/embed.js
View file

@ -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 = '{';