diff --git a/_posts/2015-02-22-compaq-deskpro-386.md b/_posts/2015-02-22-compaq-deskpro-386.md index 9a9430f40..85b807eae 100644 --- a/_posts/2015-02-22-compaq-deskpro-386.md +++ b/_posts/2015-02-22-compaq-deskpro-386.md @@ -8,8 +8,8 @@ machines: - type: pc id: deskpro386 debugger: true - config: /devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml uncompiled: true + 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 @@ -20,7 +20,7 @@ to find COMPAQ Maintenance and Service guides online, but their Technical Refere they were expensive ($149) and not many were sold. Anyway, I'm hoping to either borrow or buy a copy, and then scan and post it. -A [COMPAQ DeskPro 386](/devices/pc/machine/compaq/deskpro386/ega/2048kb/) test configuration is displayed below. +A [COMPAQ DeskPro 386](/devices/pc/machine/compaq/deskpro386/ega/2048kb/debugger/) test configuration is displayed below. The configuration doesn't run, and the debugger can't disassemble 80386-specific code yet, but this is what I will be using to test and debug my changes over the next few months. diff --git a/_posts/2015-04-16-compaq-deskpro-386-update.md b/_posts/2015-04-16-compaq-deskpro-386-update.md index 293bdd2e8..811596b0b 100644 --- a/_posts/2015-04-16-compaq-deskpro-386-update.md +++ b/_posts/2015-04-16-compaq-deskpro-386-update.md @@ -8,8 +8,8 @@ machines: - type: pc id: deskpro386 debugger: true - config: /devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml uncompiled: true + 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/). @@ -143,10 +143,10 @@ to match that of the 1st megabyte whenever A20 is disabled. I could probably ge only the first 64Kb of the 2nd megabyte, but until I'm actually able to run some tests on a real DeskPro 386, I'm going to assume COMPAQ's A20 implementation affected the entire 2nd megabyte. -Here's my [COMPAQ DeskPro 386/16](/devices/pc/machine/compaq/deskpro386/ega/2048kb/) test configuration. -Set a breakpoint at F000:F498 ("bp f000:f498") in the Debugger panel to see the above code in action. -When the machine is operating in real-mode, you can use the "rp" command to dump all the registers, -including the current base and limit values loaded into the segment registers. +Here's my [COMPAQ DeskPro 386/16](/devices/pc/machine/compaq/deskpro386/ega/2048kb/debugger/) test +configuration. Set a breakpoint at F000:F498 ("bp f000:f498") in the Debugger panel to see the above +code in action. When the machine is operating in real-mode, you can use the "rp" command to dump all +the registers, including the current base and limit values loaded into the segment registers. {% include machine.html id="deskpro386" %} diff --git a/_posts/2015-06-01-debugging-the-ibm-vga-rom.md b/_posts/2015-06-01-debugging-the-ibm-vga-rom.md index 2f2b8b7b1..934f2d311 100644 --- a/_posts/2015-06-01-debugging-the-ibm-vga-rom.md +++ b/_posts/2015-06-01-debugging-the-ibm-vga-rom.md @@ -24,7 +24,7 @@ the source code for its ROMs, so I've created some assemblable source code from [here](/devices/pc/video/ibm/vga/). I've finally started debugging a machine configuration that uses the IBM VGA ROM. Since the VGA and the 80386 are -contemporaries, I'm using an [80386 machine configuration](/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml). +contemporaries, I'm using an [80386 machine configuration](/devices/pc/machine/compaq/deskpro386/vga/2048kb/debugger/). However, I don't expect the IBM VGA ROM to require any 80386 support or PS/2-specific features. The first problem I ran into was here: diff --git a/_posts/2015-07-17-windows-95.md b/_posts/2015-07-17-windows-95.md index 18487ef5f..520a1d9ce 100644 --- a/_posts/2015-07-17-windows-95.md +++ b/_posts/2015-07-17-windows-95.md @@ -9,7 +9,7 @@ machines: id: deskpro386 debugger: true state: /disks/pc/windows/win95/4.00.950/deskpro386.json - config: /devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml + config: /devices/pc/machine/compaq/deskpro386/vga/4096kb/debugger/machine.xml drives: '[{name:"68Mb Hard Disk",type:4,path:"http://archive.pcjs.org/disks/pc/fixed/68mb/win95.json"}]' autoMount: '' --- diff --git a/_posts/2015-09-21-windows-95-in-your-web-browser.md b/_posts/2015-09-21-windows-95-in-your-web-browser.md index 920fbc377..11ea1ecd6 100644 --- a/_posts/2015-09-21-windows-95-in-your-web-browser.md +++ b/_posts/2015-09-21-windows-95-in-your-web-browser.md @@ -7,7 +7,6 @@ permalink: /blog/2015/09/21/ machines: - type: pc id: deskpro386 - debugger: true state: /disks/pc/windows/win95/4.00.950/deskpro386.json config: /devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml drives: '[{name:"68Mb Hard Disk",type:4,path:"http://archive.pcjs.org/disks/pc/fixed/68mb/win95.json"}]' diff --git a/_posts/2015-12-10-rebuilding-the-pcjs-website.md b/_posts/2015-12-10-rebuilding-the-pcjs-website.md index 67b5d3372..39822a0f9 100644 --- a/_posts/2015-12-10-rebuilding-the-pcjs-website.md +++ b/_posts/2015-12-10-rebuilding-the-pcjs-website.md @@ -95,7 +95,7 @@ FDC `autoMount` setting, making it easy to reuse the same machine XML file with autoMount: A: path: /disks/pc/os2/misc/football/FOOTBALL-76817.json - config: /devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml + config: /devices/pc/machine/compaq/deskpro386/ega/4096kb/debugger/machine.xml Other settings that can currently be overridden include: diff --git a/_posts/2016-02-08-super-bowl-winner-pcjs.md b/_posts/2016-02-08-super-bowl-winner-pcjs.md index 7e7c99800..82bfc79d7 100644 --- a/_posts/2016-02-08-super-bowl-winner-pcjs.md +++ b/_posts/2016-02-08-super-bowl-winner-pcjs.md @@ -12,9 +12,9 @@ and blank screens. A hard-error popup would occur when FOOTBALL tried to initialize a non-existent PRN device. To resolve that, PCjs now provides basic parallel port emulation, in the form of a [ParallelPort](/docs/pcjs/parallel/) component that you include in a machine XML file with the <parallel> element, in much the same way you include the -[SerialPort](/docs/pcjs/serial/) component with the <serial> element. The Compaq DeskPro 386 -[Test Machine](/devices/pc/machine/compaq/deskpro386/ega/4096kb/) used to run FOOTBALL has now been updated to include -one parallel port. +[SerialPort](/docs/pcjs/serial/) component with the <serial> element. This [Compaq DeskPro 386] +(/devices/pc/machine/compaq/deskpro386/ega/4096kb/debugger/) machine used to run FOOTBALL has now been updated to +include one parallel port. The other problem was that switching between sessions with the **SysReq** key would often result in a blank screen; the new session was active, but you couldn't see it. This was a side-effect of how FOOTBALL reprograms the video diff --git a/devices/pc/machine/compaq/deskpro386/README.md b/devices/pc/machine/compaq/deskpro386/README.md index e8137359e..39419cff1 100644 --- a/devices/pc/machine/compaq/deskpro386/README.md +++ b/devices/pc/machine/compaq/deskpro386/README.md @@ -7,8 +7,9 @@ permalink: /devices/pc/machine/compaq/deskpro386/ COMPAQ DeskPro 386 Machines --- -* [COMPAQ DeskPro 386 with 2Mb RAM and COMPAQ EGA](ega/2048kb/) -* [COMPAQ DeskPro 386 with 4Mb RAM and COMPAQ EGA](ega/4096kb/) -* [COMPAQ DeskPro 386 with 2Mb RAM and IBM VGA](vga/2048kb/) -* [COMPAQ DeskPro 386 with 4Mb RAM and IBM VGA](vga/4096kb/) +* [COMPAQ DeskPro 386 with 2Mb RAM and COMPAQ EGA](ega/2048kb/) ([Debugger](ega/2048kb/debugger/)) +* [COMPAQ DeskPro 386 with 4Mb RAM and COMPAQ EGA](ega/4096kb/) ([Debugger](ega/4096kb/debugger/)) +* [COMPAQ DeskPro 386 with 2Mb RAM and COMPAQ VGA (Debugger)](other/2048kb/debugger/) +* [COMPAQ DeskPro 386 with 2Mb RAM and IBM VGA](vga/2048kb/) ([Debugger](vga/2048kb/debugger/)) +* [COMPAQ DeskPro 386 with 4Mb RAM and IBM VGA](vga/4096kb/) ([Debugger](vga/4096kb/debugger/)) * [COMPAQ DeskPro 386 with 4Mb RAM and IBM VGA running Windows 95](/disks/pc/windows/win95/4.00.950/) diff --git a/devices/pc/machine/compaq/deskpro386/ega/2048kb/debugger/machine.md b/devices/pc/machine/compaq/deskpro386/ega/2048kb/debugger/machine.md new file mode 100644 index 000000000..30037320a --- /dev/null +++ b/devices/pc/machine/compaq/deskpro386/ega/2048kb/debugger/machine.md @@ -0,0 +1,11 @@ +--- +layout: page +title: "COMPAQ DeskPro 386 (2Mb) with COMPAQ EGA" +permalink: /devices/pc/machine/compaq/deskpro386/ega/2048kb/debugger/ +machines: + - type: pc + id: deskpro386 + debugger: true +--- + +{% include machine.html id="deskpro386" %} diff --git a/devices/pc/machine/compaq/deskpro386/ega/2048kb/debugger/machine.xml b/devices/pc/machine/compaq/deskpro386/ega/2048kb/debugger/machine.xml new file mode 100644 index 000000000..4c05633f3 --- /dev/null +++ b/devices/pc/machine/compaq/deskpro386/ega/2048kb/debugger/machine.xml @@ -0,0 +1,21 @@ + + + + COMPAQ DeskPro 386, 2Mb RAM, 128Kb EGA + + + + + + + diff --git a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.md b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.md index 52190d807..70f34ad19 100644 --- a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.md +++ b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.md @@ -5,7 +5,6 @@ permalink: /devices/pc/machine/compaq/deskpro386/ega/2048kb/ machines: - type: pc id: deskpro386 - debugger: true --- {% include machine.html id="deskpro386" %} diff --git a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml index 4c05633f3..9fe579a73 100644 --- a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml +++ b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml @@ -11,8 +11,6 @@