From 5072a272925c4990493c2b35962d7256987ee514 Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Sun, 20 Mar 2016 11:38:38 -0700 Subject: [PATCH] Simplified ROM folder structure --- ...4-09-13-the-ibm-pc-at-alive-and-booting.md | 2 +- _posts/2014-10-13-the-8mhz-ibm-pc-at-5170.md | 2 +- .../2014-10-23-improved-pc-dos-700-support.md | 2 +- _posts/2015-02-22-compaq-deskpro-386.md | 2 +- .../2015-04-16-compaq-deskpro-386-update.md | 6 +++--- _posts/2016-02-08-super-bowl-winner-pcjs.md | 8 ++++---- _posts/2016-02-24-remembering-compaq.md | 2 +- apps/pc/1985/rogue/cache.manifest | 8 ++++---- devices/pc/README.md | 2 +- .../5150/cga/384kb/softkbd/machine.xml | 2 +- .../5150/cga/64kb/donkey/debugger/machine.xml | 2 +- .../machine/5150/cga/64kb/donkey/machine.xml | 2 +- .../machine/5150/cga/64kb/softkbd/machine.xml | 2 +- devices/pc/machine/5150/dual/64kb/machine.xml | 2 +- .../5150/mda/64kb/debugger/machine.xml | 2 +- devices/pc/machine/5150/mda/64kb/machine.xml | 2 +- .../machine/5150/mda/64kb/softkbd/machine.xml | 2 +- .../machine/5160/cga/256kb/array/machine.xml | 2 +- .../5160/cga/256kb/demo/debugger/machine.xml | 2 +- .../machine/5160/cga/256kb/demo/machine.xml | 2 +- .../5160/cga/256kb/softkbd/machine.xml | 2 +- .../cga/256kb/win101/debugger/machine.xml | 2 +- .../machine/5160/cga/256kb/win101/machine.xml | 2 +- .../5160/cga/256kb/win101/softkbd/machine.xml | 2 +- .../5160/cga/512kb/win101/softkbd/machine.xml | 2 +- .../5160/cga/640kb/debugger/machine.xml | 2 +- devices/pc/machine/5160/cga/640kb/machine.xml | 2 +- .../5160/cga/640kb/softkbd/machine.xml | 2 +- .../5160/ega/256kb/debugger/machine.xml | 2 +- devices/pc/machine/5160/ega/256kb/machine.xml | 2 +- .../machine/5160/ega/640kb/array/machine.xml | 2 +- .../5160/ega/640kb/debugger/machine.xml | 2 +- devices/pc/machine/5160/ega/640kb/machine.xml | 2 +- .../5160/mda/256kb/debugger/machine.xml | 2 +- .../mda/256kb/fake188/debugger/machine.xml | 2 +- .../5160/mda/256kb/fake188/machine.xml | 2 +- devices/pc/machine/5160/mda/256kb/machine.xml | 2 +- .../machine/5160/mda/64kb/softkbd/machine.xml | 2 +- .../5170/ega/1152kb/rev1/debugger/machine.xml | 2 +- .../rev3/debugger/backtrack/machine.xml | 2 +- .../5170/ega/1152kb/rev3/debugger/machine.xml | 2 +- .../machine/5170/ega/1152kb/rev3/machine.xml | 2 +- .../rev3/debugger/backtrack/machine.xml | 2 +- .../5170/ega/2048kb/rev3/debugger/machine.xml | 2 +- .../machine/5170/ega/2048kb/rev3/machine.xml | 2 +- .../5170/ega/640kb/rev1/debugger/machine.xml | 2 +- .../machine/5170/ega/640kb/rev1/machine.xml | 2 +- .../5170/vga/2048kb/debugger/machine.xml | 2 +- .../pc/machine/5170/vga/2048kb/machine.xml | 2 +- .../5170/vga/4096kb/debugger/machine.xml | 2 +- .../pc/machine/5170/vga/4096kb/machine.xml | 2 +- .../mpc1600/cga/640kb/debugger/machine.xml | 2 +- .../machine/cdp/mpc1600/cga/640kb/machine.xml | 2 +- devices/pc/machine/compaq/README.md | 6 +++--- .../ega/2048kb/debugger/machine.xml | 2 +- .../compaq/deskpro386/ega/2048kb/machine.xml | 2 +- .../ega/4096kb/debugger/machine.xml | 2 +- .../compaq/deskpro386/ega/4096kb/machine.xml | 2 +- .../2048kb/debugger/backtrack/machine.xml | 2 +- .../other/2048kb/debugger/machine.xml | 2 +- .../vga/2048kb/debugger/machine.xml | 2 +- .../compaq/deskpro386/vga/2048kb/machine.xml | 2 +- .../vga/4096kb/debugger/machine.xml | 2 +- .../compaq/deskpro386/vga/4096kb/machine.xml | 2 +- devices/pc/machine/custom/machine.xml | 2 +- .../z150/cga/640kb/debugger/machine.xml | 2 +- .../machine/zenith/z150/cga/640kb/machine.xml | 2 +- .../{bios => }/1981-04-24/PCBIOS-REV1.json | 0 .../{bios => }/1981-04-24/PCBIOS-REV1.rom | Bin .../{bios => }/1981-10-19/PCBIOS-REV2.json | 0 .../{bios => }/1981-10-19/PCBIOS-REV2.rom | Bin .../{bios => }/1982-10-27/PCBIOS-REV3.json | 0 .../{bios => }/1982-10-27/PCBIOS-REV3.rom | Bin .../{bios => }/1982-11-08/XTBIOS-REV1.json | 0 .../{bios => }/1982-11-08/XTBIOS-REV1.rom | Bin .../{bios => }/1986-05-09/XTBIOS-REV3.json | 0 .../{bios => }/1986-05-09/XTBIOS-REV3.rom | Bin .../{bios => }/1984-01-10/ATBIOS-REV1.json | 0 .../{bios => }/1984-01-10/ATBIOS-REV1.map | 0 .../{bios => }/1984-01-10/ATBIOS-REV1.rom | Bin .../{bios => }/1985-06-10/ATBIOS-REV2.json | 0 .../{bios => }/1985-11-15/ATBIOS-REV3.json | 0 .../{bios => }/1985-11-15/ATBIOS-REV3.map | 0 devices/pc/rom/5170/{bios => }/README.md | 15 ++++++++------- devices/pc/rom/README.md | 18 +++++++++--------- .../rom/cdp/{bios => }/mpc1600/MPC4.34.json | 0 .../pc/rom/cdp/{bios => }/mpc1600/mpc-443.xml | 2 +- devices/pc/rom/compaq/{bios => }/README.md | 2 +- .../deskpro386/1988-01-28/109591-001.hex | 0 .../deskpro386/1988-01-28/109592-001.hex | 0 .../deskpro386/1988-01-28/1988-01-28.asm | 0 .../deskpro386/1988-01-28/1988-01-28.json | 0 .../{bios => }/deskpro386/1988-01-28/makefile | 0 .../deskpro386/1988-05-10/109591-003.hex | 0 .../deskpro386/1988-05-10/109592-003.hex | 0 .../deskpro386/1988-05-10/1988-05-10.json | 0 .../{bios => }/deskpro386/1988-05-10/makefile | 0 .../deskpro386/1989-04-14/1989-04-14.json | 0 .../{bios => }/deskpro386/1989-04-14/makefile | 0 .../compaq/{bios => }/deskpro386/README.md | 6 +++--- .../{bios => }/portable/100666-001-REVC.hex | 0 .../{bios => }/portable/100666-001-REVC.json | 0 .../rom/compaq/{bios => }/portable/README.md | 2 +- .../{bios => }/portable/cpqpatch/CPQPATCH.C | 0 .../{bios => }/portable/cpqpatch/CPQPATCH.EXE | Bin .../{bios => }/portable/cpqpatch/CPQPATCH.TXT | 0 .../{bios => }/portable3/1987-01-29.json | 0 .../rom/compaq/{bios => }/portable3/README.md | 4 ++-- .../rom/zenith/{bios => }/z150/Z150-1988.json | 0 .../rom/zenith/{bios => }/z150/z150-1988.xml | 2 +- devices/pc/video/compaq/vga/README.md | 4 ++-- devices/pc/video/paradise/vga/README.md | 2 +- disks/pc/cpm/1.1b/machine.xml | 2 +- disks/pc/diags/ibm/2.20/machine.xml | 2 +- disks/pc/games/infocom/machine-debug.xml | 2 +- disks/pc/games/infocom/machine.xml | 2 +- .../games/infocom/zork1/debugger/machine.xml | 2 +- .../pc/games/microsoft/adventure/machine.xml | 2 +- docs/pcjs/hdc/README.md | 2 +- modules/build/lib/build.js | 2 +- modules/pcjs/bin/ibm5150.json | 2 +- modules/shared/lib/dumpapi.js | 4 ++-- modules/textout/lib/textout.js | 2 +- 123 files changed, 118 insertions(+), 117 deletions(-) rename devices/pc/rom/5150/{bios => }/1981-04-24/PCBIOS-REV1.json (100%) rename devices/pc/rom/5150/{bios => }/1981-04-24/PCBIOS-REV1.rom (100%) rename devices/pc/rom/5150/{bios => }/1981-10-19/PCBIOS-REV2.json (100%) rename devices/pc/rom/5150/{bios => }/1981-10-19/PCBIOS-REV2.rom (100%) rename devices/pc/rom/5150/{bios => }/1982-10-27/PCBIOS-REV3.json (100%) rename devices/pc/rom/5150/{bios => }/1982-10-27/PCBIOS-REV3.rom (100%) rename devices/pc/rom/5160/{bios => }/1982-11-08/XTBIOS-REV1.json (100%) rename devices/pc/rom/5160/{bios => }/1982-11-08/XTBIOS-REV1.rom (100%) rename devices/pc/rom/5160/{bios => }/1986-05-09/XTBIOS-REV3.json (100%) rename devices/pc/rom/5160/{bios => }/1986-05-09/XTBIOS-REV3.rom (100%) rename devices/pc/rom/5170/{bios => }/1984-01-10/ATBIOS-REV1.json (100%) rename devices/pc/rom/5170/{bios => }/1984-01-10/ATBIOS-REV1.map (100%) rename devices/pc/rom/5170/{bios => }/1984-01-10/ATBIOS-REV1.rom (100%) rename devices/pc/rom/5170/{bios => }/1985-06-10/ATBIOS-REV2.json (100%) rename devices/pc/rom/5170/{bios => }/1985-11-15/ATBIOS-REV3.json (100%) rename devices/pc/rom/5170/{bios => }/1985-11-15/ATBIOS-REV3.map (100%) rename devices/pc/rom/5170/{bios => }/README.md (81%) rename devices/pc/rom/cdp/{bios => }/mpc1600/MPC4.34.json (100%) rename devices/pc/rom/cdp/{bios => }/mpc1600/mpc-443.xml (73%) rename devices/pc/rom/compaq/{bios => }/README.md (93%) rename devices/pc/rom/compaq/{bios => }/deskpro386/1988-01-28/109591-001.hex (100%) rename devices/pc/rom/compaq/{bios => }/deskpro386/1988-01-28/109592-001.hex (100%) rename devices/pc/rom/compaq/{bios => }/deskpro386/1988-01-28/1988-01-28.asm (100%) rename devices/pc/rom/compaq/{bios => }/deskpro386/1988-01-28/1988-01-28.json (100%) rename devices/pc/rom/compaq/{bios => }/deskpro386/1988-01-28/makefile (100%) rename devices/pc/rom/compaq/{bios => }/deskpro386/1988-05-10/109591-003.hex (100%) rename devices/pc/rom/compaq/{bios => }/deskpro386/1988-05-10/109592-003.hex (100%) rename devices/pc/rom/compaq/{bios => }/deskpro386/1988-05-10/1988-05-10.json (100%) rename devices/pc/rom/compaq/{bios => }/deskpro386/1988-05-10/makefile (100%) rename devices/pc/rom/compaq/{bios => }/deskpro386/1989-04-14/1989-04-14.json (100%) rename devices/pc/rom/compaq/{bios => }/deskpro386/1989-04-14/makefile (100%) rename devices/pc/rom/compaq/{bios => }/deskpro386/README.md (97%) rename devices/pc/rom/compaq/{bios => }/portable/100666-001-REVC.hex (100%) rename devices/pc/rom/compaq/{bios => }/portable/100666-001-REVC.json (100%) rename devices/pc/rom/compaq/{bios => }/portable/README.md (97%) rename devices/pc/rom/compaq/{bios => }/portable/cpqpatch/CPQPATCH.C (100%) rename devices/pc/rom/compaq/{bios => }/portable/cpqpatch/CPQPATCH.EXE (100%) rename devices/pc/rom/compaq/{bios => }/portable/cpqpatch/CPQPATCH.TXT (100%) rename devices/pc/rom/compaq/{bios => }/portable3/1987-01-29.json (100%) rename devices/pc/rom/compaq/{bios => }/portable3/README.md (82%) rename devices/pc/rom/zenith/{bios => }/z150/Z150-1988.json (100%) rename devices/pc/rom/zenith/{bios => }/z150/z150-1988.xml (72%) diff --git a/_posts/2014-09-13-the-ibm-pc-at-alive-and-booting.md b/_posts/2014-09-13-the-ibm-pc-at-alive-and-booting.md index 26593c0bf..566aa6e27 100644 --- a/_posts/2014-09-13-the-ibm-pc-at-alive-and-booting.md +++ b/_posts/2014-09-13-the-ibm-pc-at-alive-and-booting.md @@ -7,7 +7,7 @@ permalink: /blog/2014/09/13/ --- My first IBM PC AT (Model 5170) [Test Configuration](/devices/pc/machine/5170/ega/640kb/rev1/debugger/) finally -boots to a PC-DOS prompt. The configuration uses the original [IBM Model 5170 ROM BIOS](/devices/pc/bios/5170/), +boots to a PC-DOS prompt. The configuration uses the original [IBM Model 5170 ROM BIOS](/devices/pc/rom/5170/), dated January 10, 1984. Getting through the BIOS "POST" (Power-On Self Test) diagnostics was like running an obstacle course, with various diff --git a/_posts/2014-10-13-the-8mhz-ibm-pc-at-5170.md b/_posts/2014-10-13-the-8mhz-ibm-pc-at-5170.md index 3eb1562e7..fdf9581af 100644 --- a/_posts/2014-10-13-the-8mhz-ibm-pc-at-5170.md +++ b/_posts/2014-10-13-the-8mhz-ibm-pc-at-5170.md @@ -10,7 +10,7 @@ I just added my first [8Mhz IBM PC AT](/devices/pc/machine/5170/ega/1152kb/rev3/ to the list of [IBM PC Machine Configurations](/devices/pc/machine/), and not surprisingly, the new machine fails to boot. -This machine uses the 3rd [ROM BIOS](/devices/pc/bios/5170/) that IBM released for the PC AT, a revision that +This machine uses the 3rd [ROM BIOS](/devices/pc/rom/5170/) that IBM released for the PC AT, a revision that included support for 3.5-inch 1.44Mb diskettes -- which will be nice, because I have a number of 1.44Mb diskette images I would like to be able to read in a PCjs machine. diff --git a/_posts/2014-10-23-improved-pc-dos-700-support.md b/_posts/2014-10-23-improved-pc-dos-700-support.md index 14f32d3f8..0e115a3b9 100644 --- a/_posts/2014-10-23-improved-pc-dos-700-support.md +++ b/_posts/2014-10-23-improved-pc-dos-700-support.md @@ -21,7 +21,7 @@ through "PC-DOS 7.00 (Disk 5)", so your best bet is to boot from the 1.44Mb "PC- Note that you must also use a fairly new 80286 machine configuration, like this [8Mhz IBM PC AT](/devices/pc/machine/5170/ega/1152kb/rev3/debugger/), in order to use 1.44Mb diskette images; previous models did not support 3.5-inch diskette drives, unless they had been -retrofitted with a newer [BIOS](/devices/pc/bios/5170/). +retrofitted with a newer [BIOS](/devices/pc/rom/5170/). *[@jeffpar](http://twitter.com/jeffpar)* *October 23, 2014* diff --git a/_posts/2015-02-22-compaq-deskpro-386.md b/_posts/2015-02-22-compaq-deskpro-386.md index 85b807eae..02b5874ac 100644 --- a/_posts/2015-02-22-compaq-deskpro-386.md +++ b/_posts/2015-02-22-compaq-deskpro-386.md @@ -12,7 +12,7 @@ machines: config: /devices/pc/machine/compaq/deskpro386/ega/2048kb/debugger/machine.xml --- -I finally dumped the [COMPAQ DeskPro 386/16 ROMs](/devices/pc/bios/compaq/deskpro386/) from the motherboard I bought +I finally dumped the [COMPAQ DeskPro 386/16 ROMs](/devices/pc/rom/compaq/deskpro386/) from the motherboard I bought on ebay last year, so I'm ready to begin adding 80386 support to PCjs. I'd also like to locate a copy of the "COMPAQ DeskPro 386 Technical Reference Guide, Volumes 1 and 2". It's not hard diff --git a/_posts/2015-04-16-compaq-deskpro-386-update.md b/_posts/2015-04-16-compaq-deskpro-386-update.md index 9a2b15663..943e8b1d1 100644 --- a/_posts/2015-04-16-compaq-deskpro-386-update.md +++ b/_posts/2015-04-16-compaq-deskpro-386-update.md @@ -12,15 +12,15 @@ machines: config: /devices/pc/machine/compaq/deskpro386/ega/2048kb/debugger/machine.xml --- -PCjs can now boot the [COMPAQ DeskPro 386/16 ROM BIOS](/devices/pc/bios/compaq/deskpro386/). +PCjs can now boot the [COMPAQ DeskPro 386/16 ROM BIOS](/devices/pc/rom/compaq/deskpro386/). There's still a problem with the hard disk controller, which I haven't looked into yet, but booting from a floppy works. While working through issues with this ROM BIOS, I created some lightly-annotated -[source code](/devices/pc/bios/compaq/deskpro386/1988-01-28/1988-01-28.asm) that can be re-assembled +[source code](/devices/pc/rom/compaq/deskpro386/1988-01-28/1988-01-28.asm) that can be re-assembled with [NASM](http://www.nasm.us/). The initial process of creating the source code is -explained [here](/devices/pc/bios/compaq/deskpro386/#recreating-rom-source-code). +explained [here](/devices/pc/rom/compaq/deskpro386/#recreating-rom-source-code). At the top of the source code, I explain a few important details about ROM addresses that are worth recapping here: diff --git a/_posts/2016-02-08-super-bowl-winner-pcjs.md b/_posts/2016-02-08-super-bowl-winner-pcjs.md index 82bfc79d7..7342150bb 100644 --- a/_posts/2016-02-08-super-bowl-winner-pcjs.md +++ b/_posts/2016-02-08-super-bowl-winner-pcjs.md @@ -32,10 +32,10 @@ I've also tidied up a few things in the [Devices](/devices/) folder. ROM images `/devices/pc/basic/` and `/devices/pc/bios/`, but BASIC and BIOS ROM images aren't actually devices; they are the *contents* of ROM devices. So, with that in mind, I've made the following rearrangements: -* `/devices/pc/bios/5150/*` => `/devices/pc/rom/5150/bios/*` -* `/devices/pc/bios/5160/*` => `/devices/pc/rom/5160/bios/*` -* `/devices/pc/bios/5170/*` => `/devices/pc/rom/5170/bios/*` -* `/devices/pc/bios/compaq/*` => `/devices/pc/rom/compaq/bios/*` +* `/devices/pc/bios/5150/*` => `/devices/pc/rom/5150/*` +* `/devices/pc/bios/5160/*` => `/devices/pc/rom/5160/*` +* `/devices/pc/bios/5170/*` => `/devices/pc/rom/5170/*` +* `/devices/pc/bios/compaq/*` => `/devices/pc/rom/compaq/*` * `/devices/pc/basic/ibm-basic-1.00.json` => `/devices/pc/rom/5150/basic/BASIC100.json` * `/devices/pc/basic/ibm-basic-1.10.json` => `/devices/pc/rom/5160/basic/BASIC110.json` diff --git a/_posts/2016-02-24-remembering-compaq.md b/_posts/2016-02-24-remembering-compaq.md index 79d11642b..5bca60fd1 100644 --- a/_posts/2016-02-24-remembering-compaq.md +++ b/_posts/2016-02-24-remembering-compaq.md @@ -50,7 +50,7 @@ all we have are the memories. ### Speaking of Memories In particular, Read-Only Memories: we have precious few of those, too. I finally obtained -a [ROM Dump](/devices/pc/rom/compaq/bios/portable/) from COMPAQ's first machine, the COMPAQ Portable, but I had to buy +a [ROM Dump](/devices/pc/rom/compaq/portable/) from COMPAQ's first machine, the COMPAQ Portable, but I had to buy a system board on ebay to get it. Considering all the effort (and money) that COMPAQ invested in writing that code, it's a bit depressing that these things haven't been properly preserved and memorialized. diff --git a/apps/pc/1985/rogue/cache.manifest b/apps/pc/1985/rogue/cache.manifest index c530f72da..c14f43ae6 100644 --- a/apps/pc/1985/rogue/cache.manifest +++ b/apps/pc/1985/rogue/cache.manifest @@ -4,7 +4,7 @@ CACHE MANIFEST /versions/pcjs/1.16.0/common.xsl /versions/pcjs/1.16.0/components.xsl /devices/pc/machine/5160/cga/640kb/machine.xml -/devices/pc/keyboard/keyboard-minimal.xml +/devices/pc/keyboard/us83-buttons-minimal.xml /disks/pc/library.xml /disks/pc/dos/microsoft/3.20/manifest.xml /disks/pc/dos/microsoft/4.0M/manifest.xml @@ -25,9 +25,9 @@ CACHE MANIFEST /versions/pcjs/1.16.0/components.css /versions/pcjs/1.16.0/pc.js /devices/pc/hdc/ibm-xebec-1982.json -/devices/pc/basic/ibm-basic-1.10.json -/devices/pc/bios/5160/1982-11-08.json -/devices/pc/video/ibm-mda-cga.json +/devices/pc/rom/5160/basic/BASIC110.json +/devices/pc/rom/5160/1982-11-08/XTBIOS-REV1.json +/devices/pc/video/ibm/cga/ibm-cga.json /disks/pc/dos/ibm/2.00/PCDOS200-DISK1.json /disks/pc/dos/ibm/2.00/PCDOS200-DISK2.json /apps/pc/1985/rogue/state.json diff --git a/devices/pc/README.md b/devices/pc/README.md index 8500c0583..325a087dc 100644 --- a/devices/pc/README.md +++ b/devices/pc/README.md @@ -36,7 +36,7 @@ For example, here's what the machine located at - +