Tweaked MDA aspect ratio, and turned 40-column font scaling back on

jeffpar · Apr 2, 2016 · 7c0c047 · 7c0c047
1 parent 07ded8e
commit 7c0c047
Show file tree

Hide file tree

Showing 18 changed files with 194 additions and 194 deletions.
diff --git a/devices/pc/machine/5170/cga/640kb/rev3/machine.xml b/devices/pc/machine/5170/cga/640kb/rev3/machine.xml
@@ -6,7 +6,7 @@
 	<cpu id="cpu286" model="80286"/>
 	<ram id="ramLow" addr="0x00000" size="0xa0000"/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/1985-11-15/ATBIOS-REV3.json"/>
-	<video ref="/devices/pc/video/ibm/mda/ibm-mda.xml"/>
+	<video ref="/devices/pc/video/ibm/cga/ibm-cga.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "PC-DOS 3.00 (Disk 1)", path: "/disks/pc/dos/ibm/3.00/PCDOS300-DISK1.json"}, B: {name: "PC-DOS 3.00 (Disk 2)", path: "/disks/pc/dos/ibm/3.00/PCDOS300-DISK2.json"}}'/>
 	<keyboard ref="/devices/pc/keyboard/us84-buttons-functions.xml"/>
 	<chipset id="chipset" model="5170" floppies="[1200,1200]" monitor="color"/>

diff --git a/devices/pc/machine/5170/ega/1152kb/rev3/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev3/machine.xml
@@ -8,13 +8,13 @@
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pc/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pc/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
+	<hdc ref="/disks/pc/fixed/20mb/pcdos330-empty.xml"/>
 	<keyboard ref="/devices/pc/keyboard/us84-buttons-arrows.xml"/>
 	<cpu id="cpu286" model="80286" cycles="8000000" autostart="true" pos="right" padright="8px" padbottom="8px">
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
 		<control type="button" binding="setSpeed">Speed</control>
 	</cpu>
-	<hdc ref="/disks/pc/fixed/20mb/pcdos330-empty.xml"/>
 	<chipset id="chipset" model="5170" floppies="[1440,1200]"/>
 	<serial id="com1" adapter="1"/>
 	<mouse serial="com1"/>

diff --git a/devices/pc/machine/5170/ega/2048kb/rev3/machine.xml b/devices/pc/machine/5170/ega/2048kb/rev3/machine.xml
@@ -9,8 +9,8 @@
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-lockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pc/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pc/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
-	<keyboard ref="/devices/pc/keyboard/us84-buttons-arrows.xml"/>
 	<hdc ref="/disks/pc/fixed/20mb/pcdos330-empty.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us84-buttons-arrows.xml"/>
 	<chipset id="chipset" model="5170" floppies="[1440,1200]"/>
 	<serial id="com1" adapter="1"/>
 	<mouse serial="com1"/>

diff --git a/devices/pc/machine/5170/vga/2048kb/debugger/machine.xml b/devices/pc/machine/5170/vga/2048kb/debugger/machine.xml
@@ -11,8 +11,8 @@
 	<keyboard ref="/devices/pc/keyboard/us84-buttons-arrows.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
-	<cpu id="cpu286" model="80286" cycles="8000000"/>
 	<hdc ref="/disks/pc/fixed/20mb/pcdos330-empty.xml"/>
+	<cpu id="cpu286" model="80286" cycles="8000000"/>
 	<chipset id="chipset" model="5170" floppies="[1440,1200]"/>
 	<serial id="com1" adapter="1"/>
 	<serial id="com2" adapter="2" binding="print"/>

diff --git a/devices/pc/machine/5170/vga/2048kb/machine.xml b/devices/pc/machine/5170/vga/2048kb/machine.xml
@@ -8,13 +8,13 @@
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pc/video/ibm/vga/1986-10-27/256kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pc/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pc/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
+	<hdc ref="/disks/pc/fixed/20mb/pcdos330-empty.xml"/>
 	<keyboard ref="/devices/pc/keyboard/us84-buttons-arrows.xml"/>
 	<cpu id="cpu286" model="80286" cycles="8000000" autostart="true" pos="right" padright="8px" padbottom="8px">
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
 		<control type="button" binding="setSpeed">Speed</control>
 	</cpu>
-	<hdc ref="/disks/pc/fixed/20mb/pcdos330-empty.xml"/>
 	<chipset id="chipset" model="5170" floppies="[1440,1200]"/>
 	<serial id="com1" adapter="1"/>
 	<mouse serial="com1"/>

diff --git a/devices/pc/machine/5170/vga/4096kb/debugger/machine.xml b/devices/pc/machine/5170/vga/4096kb/debugger/machine.xml
@@ -11,8 +11,8 @@
 	<keyboard ref="/devices/pc/keyboard/us84-buttons-arrows.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
-	<cpu id="cpu286" model="80286" cycles="8000000"/>
 	<hdc ref="/disks/pc/fixed/20mb/pcdos330-empty.xml"/>
+	<cpu id="cpu286" model="80286" cycles="8000000"/>
 	<chipset id="chipset" model="5170" floppies="[1440,1200]"/>
 	<serial id="com1" adapter="1"/>
 	<serial id="com2" adapter="2" binding="print"/>

diff --git a/devices/pc/machine/5170/vga/4096kb/machine.xml b/devices/pc/machine/5170/vga/4096kb/machine.xml
@@ -8,13 +8,13 @@
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pc/video/ibm/vga/1986-10-27/256kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pc/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pc/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
+	<hdc ref="/disks/pc/fixed/20mb/pcdos330-empty.xml"/>
 	<keyboard ref="/devices/pc/keyboard/us84-buttons-arrows.xml"/>
 	<cpu id="cpu286" model="80286" cycles="8000000" autostart="true" pos="right" padright="8px" padbottom="8px">
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
 		<control type="button" binding="setSpeed">Speed</control>
 	</cpu>
-	<hdc ref="/disks/pc/fixed/20mb/pcdos330-empty.xml"/>
 	<chipset id="chipset" model="5170" floppies="[1440,1200]"/>
 	<serial id="com1" adapter="1"/>
 	<mouse serial="com1"/>

diff --git a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml
@@ -10,8 +10,8 @@
 	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pc/rom/compaq/deskpro386/1988-01-28/1988-01-28.json"/>
 	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pc/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pc/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
-	<keyboard ref="/devices/pc/keyboard/us84-buttons-arrows.xml"/>
 	<hdc ref="/disks/pc/fixed/20mb/pcdos330-empty.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us84-buttons-arrows.xml"/>
 	<chipset id="chipset" model="deskpro386" floppies="[1200,1200]"/>
 	<serial id="com1" adapter="1"/>
 	<serial id="com2" adapter="2" binding="print"/>

diff --git a/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml b/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml
@@ -10,8 +10,8 @@
 	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pc/rom/compaq/deskpro386/1988-01-28/1988-01-28.json"/>
 	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pc/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pc/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
-	<keyboard ref="/devices/pc/keyboard/us84-buttons-arrows.xml"/>
 	<hdc ref="/disks/pc/fixed/20mb/pcdos330-empty.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us84-buttons-arrows.xml"/>
 	<chipset id="chipset" model="deskpro386" floppies="[1200,1200]"/>
 	<parallel id="lpt1" adapter="2"/>
 	<serial id="com1" adapter="1"/>

diff --git a/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml b/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml
@@ -10,8 +10,8 @@
 	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pc/rom/compaq/deskpro386/1988-01-28/1988-01-28.json"/>
 	<video ref="/devices/pc/video/ibm/vga/1986-10-27/256kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "COMPAQ MS-DOS 3.31 (Disk 2)", path: "/disks/pc/dos/compaq/3.31/COMPAQ-DOS331-DISK2.json"}, B: {name: "COMPAQ MS-DOS 3.31 (Disk 3)", path: "/disks/pc/dos/compaq/3.31/COMPAQ-DOS331-DISK3.json"}}'/>
-	<keyboard ref="/devices/pc/keyboard/us84-buttons-functions.xml"/>
 	<hdc ref="/disks/pc/fixed/20mb/pcdos330-empty.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us84-buttons-functions.xml"/>
 	<chipset id="chipset" model="deskpro386" floppies="[1200,1200]" monitor="vga"/>
 	<serial id="com1" adapter="1"/>
 	<serial id="com2" adapter="2" binding="print"/>

diff --git a/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml b/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml
@@ -10,8 +10,8 @@
 	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pc/rom/compaq/deskpro386/1988-01-28/1988-01-28.json"/>
 	<video ref="/devices/pc/video/ibm/vga/1986-10-27/256kb-autolockfs.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pc/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pc/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
-	<keyboard id="keyboard"/>
 	<hdc ref="/disks/pc/fixed/20mb/pcdos330-empty.xml"/>
+	<keyboard id="keyboard"/>
 	<chipset id="chipset" model="deskpro386" floppies="[1200,1200]" monitor="vga"/>
 	<serial id="com1" adapter="1"/>
 	<serial id="com2" adapter="2" binding="print"/>

diff --git a/devices/pc/video/ibm/cga/ibm-cga-dual.xml b/devices/pc/video/ibm/cga/ibm-cga-dual.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoCGA" model="cga" screenwidth="960" screenheight="600" scale="true" charset="/devices/pc/video/ibm/cga/ibm-cga.json" pos="center" padding="8px">
+<video id="videoCGA" model="cga" screenwidth="1280" screenheight="800" scale="true" charset="/devices/pc/video/ibm/cga/ibm-cga.json" pos="center" padding="8px">
 	<menu>
 		<title>Color Display</title>
 	</menu>

diff --git a/devices/pc/video/ibm/mda/ibm-mda-dual.xml b/devices/pc/video/ibm/mda/ibm-mda-dual.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoMDA" model="mda" screenwidth="720" screenheight="350" scale="true" charset="/devices/pc/video/ibm/mda/ibm-mda.json" pos="center" padding="8px">
+<video id="videoMDA" model="mda" screenwidth="1440" screenheight="900" scale="true" charset="/devices/pc/video/ibm/mda/ibm-mda.json" pos="center" padding="8px">
 	<menu>
 		<title>Monochrome Display</title>
 		<control type="container" pos="right">

diff --git a/devices/pc/video/ibm/mda/ibm-mda.xml b/devices/pc/video/ibm/mda/ibm-mda.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoMDA" screenwidth="1440" screenheight="700" scale="true" charset="/devices/pc/video/ibm/mda/ibm-mda.json" pos="center" padding="8px">
+<video id="videoMDA" screenwidth="1440" screenheight="900" scale="true" charset="/devices/pc/video/ibm/mda/ibm-mda.json" pos="center" padding="8px">
 	<menu>
 		<title>Monochrome Display</title>
 		<control type="container" pos="right">

diff --git a/disks/pc/fixed/20mb/pcdos330-empty.xml b/disks/pc/fixed/20mb/pcdos330-empty.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/PCDOS330-EMPTY.json"}]'>
-	<control type="button" binding="saveHD0" padright="8px">Save HD</control>
+<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/PCDOS330-EMPTY.json"}]' pos="left" padleft="8px" padbottom="8px">
+	<control type="button" binding="saveHD0">Save HD</control>
 </hdc>