From 6291d52a5c099f4e73c78e7acbb705db32779b08 Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Thu, 21 Jan 2016 14:03:29 -0800 Subject: [PATCH] Cleaned up the 5170 machines a bit (and eliminated some redundant ones) --- ...014-09-13-the-ibm-pc-at-alive-and-booting.md | 2 +- _posts/2014-10-13-the-8mhz-ibm-pc-at-5170.md | 2 +- _posts/2014-10-17-release-of-pcjs-v1.15.5.md | 2 +- _posts/2014-10-23-release-of-pcjs-v1.15.6.md | 13 +++++++------ _posts/2015-01-17-pcjs-uncompiled.md | 4 ++-- _posts/2015-01-28-new-pcjs-control-panel.md | 2 +- ...range-case-of-the-ega-graphics-scroll-bug.md | 2 +- .../ega/1152kb/rev1/{ => debugger}/machine.md | 2 +- .../ega/1152kb/rev1/{ => debugger}/machine.xml | 2 +- .../rev3/{ => debugger}/backtrack/machine.md | 4 ++-- .../rev3/{ => debugger}/backtrack/machine.xml | 2 +- .../ega/1152kb/rev3/{ => debugger}/machine.md | 2 +- .../ega/1152kb/rev3/{ => debugger}/machine.xml | 2 +- .../ega/640kb/rev1/{ => debugger}/machine.md | 2 +- .../5170/ega/640kb/rev1/debugger}/machine.xml | 6 ++++-- .../ega/640kb/rev1/{ => debugger}/manifest.xml | 4 ++-- .../pc/machine/5170/ega/640kb/rev1/machine.xml | 8 +++----- devices/pc/machine/README.md | 8 ++++---- disks/pc/dos/compaq/3.10/manifest.xml | 2 +- disks/pc/dos/compaq/3.31/manifest.xml | 2 +- disks/pc/dos/microsoft/3.20/README.md | 17 +++++++++++++++-- disks/pc/dos/microsoft/4.00/README.md | 5 +++++ disks/pc/dos/microsoft/4.01/README.md | 5 +++++ disks/pc/dos/microsoft/4.01/machine.xml | 17 ----------------- disks/pc/os2/misc/1.0/88286/README.md | 2 +- disks/pc/os2/misc/cpdos/86295/README.md | 2 +- 26 files changed, 64 insertions(+), 57 deletions(-) rename devices/pc/machine/5170/ega/1152kb/rev1/{ => debugger}/machine.md (74%) rename devices/pc/machine/5170/ega/1152kb/rev1/{ => debugger}/machine.xml (94%) rename devices/pc/machine/5170/ega/1152kb/rev3/{ => debugger}/backtrack/machine.md (65%) rename devices/pc/machine/5170/ega/1152kb/rev3/{ => debugger}/backtrack/machine.xml (94%) rename devices/pc/machine/5170/ega/1152kb/rev3/{ => debugger}/machine.md (74%) rename devices/pc/machine/5170/ega/1152kb/rev3/{ => debugger}/machine.xml (94%) rename devices/pc/machine/5170/ega/640kb/rev1/{ => debugger}/machine.md (72%) rename {disks/pc/dos/microsoft/4.00 => devices/pc/machine/5170/ega/640kb/rev1/debugger}/machine.xml (68%) rename devices/pc/machine/5170/ega/640kb/rev1/{ => debugger}/manifest.xml (80%) delete mode 100644 disks/pc/dos/microsoft/4.01/machine.xml 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 9a97775f9..26593c0bf 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 @@ -6,7 +6,7 @@ category: Releases permalink: /blog/2014/09/13/ --- -My first IBM PC AT (Model 5170) [Test Configuration](/devices/pc/machine/5170/ega/640kb/rev1/) finally +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/), dated January 10, 1984. 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 84fd75ea1..3eb1562e7 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 @@ -6,7 +6,7 @@ category: JavaScript permalink: /blog/2014/10/13/ --- -I just added my first [8Mhz IBM PC AT](/devices/pc/machine/5170/ega/1152kb/rev3/) machine configuration +I just added my first [8Mhz IBM PC AT](/devices/pc/machine/5170/ega/1152kb/rev3/debugger/) machine configuration to the list of [IBM PC Machine Configurations](/devices/pc/machine/), and not surprisingly, the new machine fails to boot. diff --git a/_posts/2014-10-17-release-of-pcjs-v1.15.5.md b/_posts/2014-10-17-release-of-pcjs-v1.15.5.md index 40d2bb33e..c7639df5f 100644 --- a/_posts/2014-10-17-release-of-pcjs-v1.15.5.md +++ b/_posts/2014-10-17-release-of-pcjs-v1.15.5.md @@ -6,7 +6,7 @@ category: Releases permalink: /blog/2014/10/17/ --- -The [8Mhz IBM PC AT](/devices/pc/machine/5170/ega/1152kb/rev3/) machine configuration boots in +The [8Mhz IBM PC AT](/devices/pc/machine/5170/ega/1152kb/rev3/debugger/) machine configuration boots in v1.15.5 of PCjs now, which includes the following fixes: + The BIOS expects memory refresh to occur roughly every 16us, which I've resolved by tying the state diff --git a/_posts/2014-10-23-release-of-pcjs-v1.15.6.md b/_posts/2014-10-23-release-of-pcjs-v1.15.6.md index 8e23b930a..e45e48fcd 100644 --- a/_posts/2014-10-23-release-of-pcjs-v1.15.6.md +++ b/_posts/2014-10-23-release-of-pcjs-v1.15.6.md @@ -13,13 +13,14 @@ There are also some Debugger improvements; for example, if you turn on "fdc" and Debugger using the "m fdc on" and "m int on" commands, all FDC (INT 0x13) software interrupts will be logged, including descriptions and register values. -PC-DOS 7.00 still can't be setup from its specially-formatted 1.84Mb [XDF](http://www.os2museum.com/wp/the-xdf-diskette-format/) -distribution disk images, "PC-DOS 7.00 (SETUP Disk 2)" through "PC-DOS 7.00 (SETUP Disk 5)", so your best bet is to boot -from the 1.44Mb "PC-DOS 7.00 (Boot Disk)". +PC-DOS 7.00 still can't be setup from its specially-formatted 1.84Mb +[XDF](http://www.os2museum.com/wp/the-xdf-diskette-format/) distribution disk images, "PC-DOS 7.00 (SETUP Disk 2)" +through "PC-DOS 7.00 (SETUP Disk 5)", so your best bet is to boot from the 1.44Mb "PC-DOS 7.00 (Boot Disk)". -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/), -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/). +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/). *[@jeffpar](http://twitter.com/jeffpar)* *October 23, 2014* diff --git a/_posts/2015-01-17-pcjs-uncompiled.md b/_posts/2015-01-17-pcjs-uncompiled.md index f6e702a17..8d4bcd51e 100644 --- a/_posts/2015-01-17-pcjs-uncompiled.md +++ b/_posts/2015-01-17-pcjs-uncompiled.md @@ -7,7 +7,7 @@ permalink: /blog/2015/01/17/ machines: - type: pc-dbg id: at-ega-1152k-rev3 - config: /devices/pc/machine/5170/ega/1152kb/rev3/machine.xml + config: /devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml uncompiled: true --- @@ -31,7 +31,7 @@ Here's what a typical Markdown file would look like: machines: - type: pc-dbg id: at-ega-1152k-rev3 - config: /devices/pc/machine/5170/ega/1152kb/rev3/machine.xml + config: /devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml uncompiled: true --- ... diff --git a/_posts/2015-01-28-new-pcjs-control-panel.md b/_posts/2015-01-28-new-pcjs-control-panel.md index 19bd83f0f..6179015bd 100644 --- a/_posts/2015-01-28-new-pcjs-control-panel.md +++ b/_posts/2015-01-28-new-pcjs-control-panel.md @@ -7,7 +7,7 @@ permalink: /blog/2015/01/28/ machines: - type: pc-dbg id: at-ega-1152k-rev3 - config: /devices/pc/machine/5170/ega/1152kb/rev3/backtrack/machine.xml + config: /devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml uncompiled: true --- diff --git a/_posts/2015-06-05-the-strange-case-of-the-ega-graphics-scroll-bug.md b/_posts/2015-06-05-the-strange-case-of-the-ega-graphics-scroll-bug.md index d3d7de1db..c39089e4c 100644 --- a/_posts/2015-06-05-the-strange-case-of-the-ega-graphics-scroll-bug.md +++ b/_posts/2015-06-05-the-strange-case-of-the-ega-graphics-scroll-bug.md @@ -6,7 +6,7 @@ category: Video permalink: /blog/2015/06/05/ --- -I was playing with different video modes using this [IBM PC AT w/EGA](/devices/pc/machine/5170/ega/640kb/rev1/), +I was playing with different video modes using this [IBM PC AT w/EGA](/devices/pc/machine/5170/ega/640kb/rev1/debugger/), and I discovered an odd problem. For example, when I ran this code: diff --git a/devices/pc/machine/5170/ega/1152kb/rev1/machine.md b/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.md similarity index 74% rename from devices/pc/machine/5170/ega/1152kb/rev1/machine.md rename to devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.md index 760bc6e64..4a6493d18 100644 --- a/devices/pc/machine/5170/ega/1152kb/rev1/machine.md +++ b/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.md @@ -1,7 +1,7 @@ --- layout: page title: "IBM PC AT (Model 5170, 1152Kb) with EGA Display and 20Mb Hard Disk" -permalink: /devices/pc/machine/5170/ega/1152kb/rev1/ +permalink: /devices/pc/machine/5170/ega/1152kb/rev1/debugger/ machines: - type: pc-dbg id: ibm5170 diff --git a/devices/pc/machine/5170/ega/1152kb/rev1/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml similarity index 94% rename from devices/pc/machine/5170/ega/1152kb/rev1/machine.xml rename to devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml index 0a8ad323a..938c0eaed 100644 --- a/devices/pc/machine/5170/ega/1152kb/rev1/machine.xml +++ b/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml @@ -1,7 +1,7 @@ - IBM PC AT (6Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk + IBM PC AT (6Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk diff --git a/devices/pc/machine/5170/ega/1152kb/rev3/backtrack/machine.md b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.md similarity index 65% rename from devices/pc/machine/5170/ega/1152kb/rev3/backtrack/machine.md rename to devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.md index 8177da941..7b3214bae 100644 --- a/devices/pc/machine/5170/ega/1152kb/rev3/backtrack/machine.md +++ b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.md @@ -1,9 +1,9 @@ --- layout: page title: "IBM PC AT (Model 5170, 1152Kb) with EGA Display and 20Mb Hard Disk" -permalink: /devices/pc/machine/5170/ega/1152kb/rev3/backtrack/ +permalink: /devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/ machines: - - type: pc + - type: pc-dbg id: ibm5170rev3 --- diff --git a/devices/pc/machine/5170/ega/1152kb/rev3/backtrack/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml similarity index 94% rename from devices/pc/machine/5170/ega/1152kb/rev3/backtrack/machine.xml rename to devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml index 59adb9879..55b2949a9 100644 --- a/devices/pc/machine/5170/ega/1152kb/rev3/backtrack/machine.xml +++ b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml @@ -1,7 +1,7 @@ - IBM PC AT (8Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk + IBM PC AT (8Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk diff --git a/devices/pc/machine/5170/ega/1152kb/rev3/machine.md b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.md similarity index 74% rename from devices/pc/machine/5170/ega/1152kb/rev3/machine.md rename to devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.md index 8429452f3..1400f2dfd 100644 --- a/devices/pc/machine/5170/ega/1152kb/rev3/machine.md +++ b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.md @@ -1,7 +1,7 @@ --- layout: page title: "IBM PC AT (Model 5170, 1152Kb) with EGA Display and 20Mb Hard Disk" -permalink: /devices/pc/machine/5170/ega/1152kb/rev3/ +permalink: /devices/pc/machine/5170/ega/1152kb/rev3/debugger/ machines: - type: pc-dbg id: ibm5170 diff --git a/devices/pc/machine/5170/ega/1152kb/rev3/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml similarity index 94% rename from devices/pc/machine/5170/ega/1152kb/rev3/machine.xml rename to devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml index 541acd680..7dc7f7039 100644 --- a/devices/pc/machine/5170/ega/1152kb/rev3/machine.xml +++ b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml @@ -1,7 +1,7 @@ - IBM PC AT (8Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk + IBM PC AT (8Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk diff --git a/devices/pc/machine/5170/ega/640kb/rev1/machine.md b/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.md similarity index 72% rename from devices/pc/machine/5170/ega/640kb/rev1/machine.md rename to devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.md index 6f5f59e0b..3686baf40 100644 --- a/devices/pc/machine/5170/ega/640kb/rev1/machine.md +++ b/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.md @@ -1,7 +1,7 @@ --- layout: page title: "IBM PC AT (Model 5170, 640Kb) with EGA Display" -permalink: /devices/pc/machine/5170/ega/640kb/rev1/ +permalink: /devices/pc/machine/5170/ega/640kb/rev1/debugger/ machines: - type: pc-dbg id: ibm5170 diff --git a/disks/pc/dos/microsoft/4.00/machine.xml b/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml similarity index 68% rename from disks/pc/dos/microsoft/4.00/machine.xml rename to devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml index 98ecad019..b87901c01 100644 --- a/disks/pc/dos/microsoft/4.00/machine.xml +++ b/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml @@ -8,8 +8,10 @@