diff --git a/.gitignore b/.gitignore index 11564cc62..e15d6c8f7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ *.IMG *.dsk *.img +*.log +*.dump *.heapsnapshot .DS_Store .buildpath diff --git a/README.md b/README.md index e7193ba29..e2668de52 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Some pre-configured machines are shown below, ready to run BASIC, DOS, Windows 1 ![IBM PC w/MDA, Microsoft Adventure](/disks/pc/games/microsoft/adventure/thumbnail.jpg "link:/disks/pc/games/microsoft/adventure/:200:120") ![IBM PC w/CGA, Zork I](/disks/pc/games/infocom/zork1/thumbnail.jpg "link:/disks/pc/games/infocom/zork1/:200:120") -Check out the rest of the PCjs [Application](/apps/pc/), [Boot Disk](/disks/pc/) and [Machine](/devices/pc/machine/) +Check out the rest of the PCjs [Application](/apps/pc/), [Disk](/disks/pc/), and [Machine](/devices/pc/machine/) demos, including an [IBM PC Dual Display System](/devices/pc/machine/5150/dual/64kb/) demo of multiple monitor support, and [IBM PC XT "Server Array"](/devices/pc/machine/5160/cga/256kb/array/) and [Windows 1.01 "Server Array"](/devices/pc/machine/5160/ega/640kb/array/) demos of multiple machines running side-by-side. diff --git a/_config.yml b/_config.yml index bd0459cbb..d32fad925 100644 --- a/_config.yml +++ b/_config.yml @@ -12,9 +12,12 @@ url: "http://www.pcjs.org" # "http://jeffpar.github.io" or "http://www.pcjs.org twitter_username: jeffpar github_username: jeffpar +left_brace: "{" +right_brace: "}" + # Build settings -exclude: ["index.html", "logs", "node_modules", "**/c64", "**/private", "**/src", "**/static", "tmp", "videos", "web"] +exclude: ["index.html", "**/index.html", "logs", "node_modules", "**/c64", "src", "**/src", "**/static", "tmp", "videos", "web", ".git", ".idea"] markdown: kramdown kramdown: input: GFM @@ -28,7 +31,7 @@ gems: pcjs: domain: pcjs.org # whereas site.url is used for linking purposes, site.pcjs.domain is used for display purposes - version: 1.20.3 # IMPORTANT: keep pcjs.version in sync with package.json:version + version: 1.20.4 # IMPORTANT: keep pcjs.version in sync with package.json:version compiled: true # by default, the compiled pcjs.version scripts will be used (eg, pc.js or pc-dbg.js) pc_scripts: # if pcjs.compiled is false, the following scripts will be included instead, in the order listed - /modules/shared/lib/defines.js diff --git a/_includes/google-analytics.html b/_includes/google-analytics.html index 6cf019a35..b53967674 100644 --- a/_includes/google-analytics.html +++ b/_includes/google-analytics.html @@ -1,8 +1,10 @@ - + +{% endif %} diff --git a/_includes/machine-engines.html b/_includes/machine-engines.html index 7c4e1a317..a299df49c 100644 --- a/_includes/machine-engines.html +++ b/_includes/machine-engines.html @@ -10,11 +10,7 @@ {% else %} {% assign machine_template = machine.template %} {% endunless %} - {% unless machine.state %} - {% assign machine_state = '' %} - {% else %} - {% assign machine_state = machine.state %} - {% endunless %} + {% capture machine_parms %}{{ site.left_brace }}state:"{{ machine.state }}",autoMount:{{ machine.automount|jsonify }}{{ site.right_brace }}{% endcapture %} {% if site.pcjs.compiled == true and machine.uncompiled != true %} {% capture machine_script %}{% endcapture %} {% unless machine_scripts contains machine_script %} @@ -38,5 +34,5 @@ {% capture machine_template %}{{ site.baseurl }}/modules/{{ machine.type | remove:'-dbg' }}js/templates/components.xsl{% endcapture %} {% endif %} {% endif %} - + {% endfor %} diff --git a/_layouts/viewer.html b/_layouts/viewer.html index ca9c43a68..7cda7240e 100644 --- a/_layouts/viewer.html +++ b/_layouts/viewer.html @@ -70,6 +70,9 @@ } })(); + + {% include google-analytics.html %} + diff --git a/_posts/2014-12-04-os2-10.md b/_posts/2014-12-04-os2-10.md index 9268bd8d7..94b350c0b 100644 --- a/_posts/2014-12-04-os2-10.md +++ b/_posts/2014-12-04-os2-10.md @@ -11,20 +11,20 @@ Exciting news for OS/2 fans: PCjs (v1.16.1) is now able to run OS/2 1.0 on of recent work in PCjs to fully emulate the Intel 80286 processor and 16-bit protected-mode, including undocumented features like [LOADALL](/pubs/pc/reference/intel/80286/loadall/) and triple-fault resets. -For a quick demo, try the "[OS/2 1.0 Debugger Boot Disk](/disks/pc/os2/misc/)". In a few seconds, +For a quick demo, try the [OS/2 1.0 Debugger Boot Disk](/disks/pc/os2/misc/1.0/88286/). In a few seconds, you'll see a very rudimentary OS/2 shell (a slimmed-down version of the OS/2 Program Selector) that allows you to start the protected-mode command interpreter ("Start a Program") or the real-mode command interpreter ("command.com"). -[OS/2 1.0 With Kernel Debugger](/disks/pc/os2/misc/) +[OS/2 1.0 With Kernel Debugger](/disks/pc/os2/misc/1.0/88286/) As an added bonus, the Model 5170 machines feature two serial ports, with COM1 connected to a simulated serial mouse and COM2 connected to the **Control Panel** output window. -Once you've booted the "OS/2 1.0 Debugger Boot Disk" from the assortment of [OS/2 Miscellaneous Disks](/disks/pc/os2/misc/), -you can click on the **Control Panel** output window, press Ctrl-C, and find yourself magically transported -into the OS/2 Kernel Debugger. The **Control Panel** display is functioning as both the output window for all PCjs -messages and PCjs Debugger commands, as well as a serial input/output device (aka "Dumb Terminal") for any software -inside the machine communicating via COM2: in this case, the OS/2 Kernel Debugger. +Once you've booted the [OS/2 1.0 Debugger Boot Disk](/disks/pc/os2/misc/1.0/88286/) from the assortment of +[Other OS/2 Disks](/disks/pc/os2/misc/), you can click on the **Control Panel** output window, press Ctrl-C, and +find yourself magically transported into the OS/2 Kernel Debugger. The **Control Panel** display is functioning +as both the output window for all PCjs messages and PCjs Debugger commands, as well as a serial input/output device +(aka "Dumb Terminal") for any software inside the machine communicating via COM2: in this case, the OS/2 Kernel Debugger. > SIDEBAR: You can perform similar tricks with DOS in these machines. Boot any DOS disk (version 2.00 and up) and type "CTTY COM2" at the DOS prompt. All DOS input/output will now be routed to the **Control Panel** display. diff --git a/_posts/2015-12-27-revisiting-os2.md b/_posts/2015-12-27-revisiting-os2.md index 40f521d59..0f94bf32e 100644 --- a/_posts/2015-12-27-revisiting-os2.md +++ b/_posts/2015-12-27-revisiting-os2.md @@ -20,8 +20,8 @@ drive C. Next, I installed the [MS OS/2 SDK 1.02](/disks/pc/tools/microsoft/os2/sdk/1.02/). This SDK was released in December 1987 along with [Microsoft OS/2 1.0](/disks/pc/os2/microsoft/1.0/). I don't have any of the printed documentation that came with the SDK, such as the *Installation Guide*, but I do have the -[Microsoft® Operating System/2 Programmer’s Toolkit](/docs/os2/microsoft/ptk/1.0/) documentation from March 1988, -thanks to the [OS/2 Museum](http://www.os2museum.com/wp/os2-history/os2-library/os2-1-x-programming/). +[Microsoft® Operating System/2 Programmer’s Toolkit](/pubs/pc/programming/os2/microsoft/ptk/1.0/) documentation +from March 1988, thanks to the [OS/2 Museum](http://www.os2museum.com/wp/os2-history/os2-library/os2-1-x-programming/). Aside from Microsoft's assembler (MASM) and C compiler (CL), the SDK included some other useful tools, such as the **SDK Editor** (SDKED), which was essentially an OS/2 port of Mark Zbikowski's Editor (Z) that was used internally diff --git a/apps/README.md b/apps/README.md index e92725e6e..4d9521f35 100644 --- a/apps/README.md +++ b/apps/README.md @@ -11,10 +11,10 @@ and [C1Pjs](/docs/c1pjs/). ### Software Application Manifests -Every complete software package is stored in its own folder, either as a set of individual files -(under [/apps](/apps/)) or as a set of disk images (under [/disks](/disks/)), along with a **manifest.xml** -file that describes the software. The manifest format is still being developed, but at a minimum, it -should contain the following information about the software: +In the PCjs Project, every complete software package is stored in its own folder, either as a set of individual +files (under [/apps](/apps/)) or as a set of disk images (under [/disks](/disks/)), along with a **manifest.xml** +file that describes the software. The manifest format is still being developed, but at a minimum, it should contain +the following information about the software: - Title - Version diff --git a/apps/pc/1981/visicalc/manifest.xml b/apps/pc/1981/visicalc/manifest.xml index 537fcda72..624ad9f50 100644 --- a/apps/pc/1981/visicalc/manifest.xml +++ b/apps/pc/1981/visicalc/manifest.xml @@ -1,5 +1,5 @@ - + VisiCalc diff --git a/apps/pc/1982/esuite/manifest.xml b/apps/pc/1982/esuite/manifest.xml index 6256a522b..02099fe33 100644 --- a/apps/pc/1982/esuite/manifest.xml +++ b/apps/pc/1982/esuite/manifest.xml @@ -1,5 +1,5 @@ - + Executive Suite diff --git a/apps/pc/1985/rogue/manifest.xml b/apps/pc/1985/rogue/manifest.xml index e004f20c0..34df2be30 100644 --- a/apps/pc/1985/rogue/manifest.xml +++ b/apps/pc/1985/rogue/manifest.xml @@ -1,5 +1,5 @@ - + Rogue diff --git a/apps/pc/1987/thinktank/manifest.xml b/apps/pc/1987/thinktank/manifest.xml index 381d7f07e..c3fd31d05 100644 --- a/apps/pc/1987/thinktank/manifest.xml +++ b/apps/pc/1987/thinktank/manifest.xml @@ -1,5 +1,5 @@ - + ThinkTank 2.41NP diff --git a/apps/pc/1988/moria/manifest.xml b/apps/pc/1988/moria/manifest.xml index 2b624eaa6..1a126fa5d 100644 --- a/apps/pc/1988/moria/manifest.xml +++ b/apps/pc/1988/moria/manifest.xml @@ -1,5 +1,5 @@ - + The Dungeons of Moria 4.872 diff --git a/apps/pc/1992/moria/manifest.xml b/apps/pc/1992/moria/manifest.xml index d98184e45..5b8566bfb 100644 --- a/apps/pc/1992/moria/manifest.xml +++ b/apps/pc/1992/moria/manifest.xml @@ -1,5 +1,5 @@ - + The Dungeons of Moria 5.5 diff --git a/apps/pc/README.md b/apps/pc/README.md index caf5e8f5a..9d2e18cb5 100644 --- a/apps/pc/README.md +++ b/apps/pc/README.md @@ -17,27 +17,25 @@ Below are selected demos of classic IBM PC applications running on [PCjs](/docs/ Additional software is available in the [IBM PC Disk Archive](/disks/pc/). -More information about creating [Application Demos](https://github.com/jeffpar/pcjs/tree/master/apps/pc) -is available in the [PCjs Project](https://github.com/jeffpar/pcjs) on [GitHub](https://github.com/). +### Creating IBM PC Application Demos -{% if page.developer %} - -### Developer Notes: How To Produce A Demo +Demos in our [Application Archives](/apps/) combine [Software Application Manifests](/apps/#software-application-manifests) +with [Machine Configurations](/devices/pc/machine/). We'll use the [VisiCalc Demo](1981/visicalc/) as an example. First you must choose a machine configuration. For VisiCalc, we chose a Model 5150 machine with a Monochrome Display, and then inserted a link to that machine -in the demo's [Manifest](1981/visicalc/manifest.xml): +in the demo's [manifest](1981/visicalc/manifest.xml): -Next, the [Manifest](1981/visicalc/manifest.xml) required a disk image containing the VisiCalc program +Next, the [manifest](1981/visicalc/manifest.xml) required a disk image containing the VisiCalc program (VC.COM). We used the [DiskDump](/modules/diskdump/) module to create that disk image: cd apps/pc/1981/visicalc node ../../../../modules/diskdump/bin/diskdump --path="static/VC.COM;../README.md" --format=json --output=disk.json --manifest The DiskDump command created a disk image named "disk.json" containing two files ("VC.COM" from the "static" subdirectory, -and "README.md" from the "static" parent directory) and automatically added that disk image to the demo's [Manifest](1981/visicalc/manifest.xml): +and "README.md" from the "static" parent directory) and automatically added that disk image to the demo's [manifest](1981/visicalc/manifest.xml): VC.COM @@ -49,7 +47,7 @@ Now that the manifest contains a disk image, we were able to add the manifest to Next, we started a version of our chosen machine that's also configured to use the Debugger, by loading -the following machine.xml into a web browser (it's assumed the Node web server is already running on port 8088): +the following **machine.xml** into a web browser (it's assumed the Node web server is already running on port 8088): http://localhost:8088/devices/pc/machine/5150/mda/64kb/debugger/machine.xml @@ -59,12 +57,9 @@ clear the Debugger's output window, and typed the following Debugger command: d state We copied-and-pasted the entire contents of the Debugger's output window into a file named "state.json", and then updated -the <machine> entry in the [Manifest](1981/visicalc/manifest.xml): +the <machine> entry in the [manifest](1981/visicalc/manifest.xml): It's important to use a state file *only* with the machine configuration it was created with; in this case, we're OK, because the only difference between the two chosen Model 5150 machines is the addition of the Debugger. - -{% endif %} - diff --git a/devices/c1p/machine/32kb/machine.xml b/devices/c1p/machine/32kb/machine.xml index 206d0f239..d941486a1 100644 --- a/devices/c1p/machine/32kb/machine.xml +++ b/devices/c1p/machine/32kb/machine.xml @@ -1,5 +1,5 @@ - + OSI Challenger 1P (32Kb) with Disk Support diff --git a/devices/c1p/machine/8kb/all/debugger/machine.xml b/devices/c1p/machine/8kb/all/debugger/machine.xml index f1f2b13af..837a816f4 100644 --- a/devices/c1p/machine/8kb/all/debugger/machine.xml +++ b/devices/c1p/machine/8kb/all/debugger/machine.xml @@ -1,5 +1,5 @@ - + OSI Challenger 1P (8Kb, Additional Software) diff --git a/devices/c1p/machine/8kb/array/machine.xml b/devices/c1p/machine/8kb/array/machine.xml index f49ba07a5..ba55cc690 100644 --- a/devices/c1p/machine/8kb/array/machine.xml +++ b/devices/c1p/machine/8kb/array/machine.xml @@ -1,5 +1,5 @@ - + Challenger 1P (8Kb) "Server Array" diff --git a/devices/c1p/machine/8kb/large/debugger/machine.xml b/devices/c1p/machine/8kb/large/debugger/machine.xml index e7f752c81..3eb39bc21 100644 --- a/devices/c1p/machine/8kb/large/debugger/machine.xml +++ b/devices/c1p/machine/8kb/large/debugger/machine.xml @@ -1,5 +1,5 @@ - + OSI Challenger 1P (8Kb) with Debugger diff --git a/devices/c1p/machine/8kb/large/machine.xml b/devices/c1p/machine/8kb/large/machine.xml index c8390ee85..7bce5c54b 100644 --- a/devices/c1p/machine/8kb/large/machine.xml +++ b/devices/c1p/machine/8kb/large/machine.xml @@ -1,5 +1,5 @@ - + OSI Challenger 1P (circa 1978) diff --git a/devices/c1p/machine/8kb/small/machine.xml b/devices/c1p/machine/8kb/small/machine.xml index 72d914480..6ff14475f 100644 --- a/devices/c1p/machine/8kb/small/machine.xml +++ b/devices/c1p/machine/8kb/small/machine.xml @@ -1,5 +1,5 @@ - + diff --git a/devices/pc/bios/compaq/deskpro386/1988-01-28/makefile b/devices/pc/bios/compaq/deskpro386/1988-01-28/makefile index 0c0dd6a67..5499bec10 100644 --- a/devices/pc/bios/compaq/deskpro386/1988-01-28/makefile +++ b/devices/pc/bios/compaq/deskpro386/1988-01-28/makefile @@ -1,19 +1,22 @@ # -# Steps to produce a binary ROM from a JSON-encoded ROM, and then disassemble and re-assemble it. +# Steps to regenerate a ROM by disassembling and re-assembling the JSON-encoded ROM. # FILEDUMP=node ../../../../../../modules/filedump/bin/filedump TEXTOUT=node ../../../../../../modules/textout/bin/textout -all: 1988-01-28-test.rom +all: tmp tmp/1988-01-28-regen.rom -1988-01-28.rom: 1988-01-28.json - $(FILEDUMP) --file=1988-01-28.json --output=1988-01-28.rom --format=rom +tmp: + mkdir tmp -1988-01-28-test.nasm: 1988-01-28.rom - ndisasm -o0x8000 -se105h -se05ah -se6ffh -sf025h -sf8aah 1988-01-28.rom > 1988-01-28-test.nasm - $(TEXTOUT) --file=1988-01-28-test.nasm --nasm > temp.nasm - mv temp.nasm 1988-01-28-test.nasm +tmp/1988-01-28.rom: 1988-01-28.json + $(FILEDUMP) --file=1988-01-28.json --output=tmp/1988-01-28.rom --format=rom -1988-01-28-test.rom: 1988-01-28-test.nasm - nasm -f bin 1988-01-28-test.nasm -l 1988-01-28-test.lst -o 1988-01-28-test.rom +tmp/1988-01-28-regen.nasm: tmp/1988-01-28.rom + ndisasm -o0x8000 -se105h -se05ah -se6ffh -sf025h -sf8aah tmp/1988-01-28.rom > tmp/1988-01-28-regen.nasm + $(TEXTOUT) --file=tmp/1988-01-28-regen.nasm --nasm > tmp/t.nasm + mv tmp/t.nasm tmp/1988-01-28-regen.nasm + +tmp/1988-01-28-regen.rom: tmp/1988-01-28-regen.nasm + nasm -f bin tmp/1988-01-28-regen.nasm -l tmp/1988-01-28-regen.lst -o tmp/1988-01-28-regen.rom diff --git a/devices/pc/keyboard/keyboard-minimal.xml b/devices/pc/keyboard/keyboard-minimal.xml index c967db9b6..f3ba3ddf6 100644 --- a/devices/pc/keyboard/keyboard-minimal.xml +++ b/devices/pc/keyboard/keyboard-minimal.xml @@ -1,7 +1,6 @@ ESC - CTRL-C F1 F10 diff --git a/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml b/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml index d46c6d4eb..d3cb62906 100644 --- a/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml +++ b/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml @@ -1,5 +1,5 @@ - + IBM PC (Model 5150), CGA, 384K diff --git a/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml b/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml index ef1fe6b00..12209b16d 100644 --- a/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml +++ b/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC (Model 5150), CGA, 64K diff --git a/devices/pc/machine/5150/cga/64kb/donkey/machine.xml b/devices/pc/machine/5150/cga/64kb/donkey/machine.xml index 92dcf3066..badab684d 100644 --- a/devices/pc/machine/5150/cga/64kb/donkey/machine.xml +++ b/devices/pc/machine/5150/cga/64kb/donkey/machine.xml @@ -1,5 +1,5 @@ - + IBM PC (Model 5150), CGA, 64K diff --git a/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml b/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml index 841c5f516..be7205f85 100644 --- a/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml +++ b/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml @@ -1,5 +1,5 @@ - + IBM PC (Model 5150), CGA, 64K diff --git a/devices/pc/machine/5150/dual/64kb/machine.xml b/devices/pc/machine/5150/dual/64kb/machine.xml index 58672fb81..cc3303e84 100644 --- a/devices/pc/machine/5150/dual/64kb/machine.xml +++ b/devices/pc/machine/5150/dual/64kb/machine.xml @@ -1,5 +1,5 @@ - + IBM PC (Model 5150) with Dual Display diff --git a/devices/pc/machine/5150/mda/64kb/debugger/machine.xml b/devices/pc/machine/5150/mda/64kb/debugger/machine.xml index 27bcf4a9f..0bb467744 100644 --- a/devices/pc/machine/5150/mda/64kb/debugger/machine.xml +++ b/devices/pc/machine/5150/mda/64kb/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC Model 5150 with Monochrome Display diff --git a/devices/pc/machine/5150/mda/64kb/machine.xml b/devices/pc/machine/5150/mda/64kb/machine.xml index 519779906..a9dd5213d 100644 --- a/devices/pc/machine/5150/mda/64kb/machine.xml +++ b/devices/pc/machine/5150/mda/64kb/machine.xml @@ -1,5 +1,5 @@ - + IBM PC (Model 5150) with Monochrome Display diff --git a/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml b/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml index 006961819..f054439d9 100644 --- a/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml +++ b/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml @@ -1,5 +1,5 @@ - + IBM PC (Model 5150), MDA, 64K diff --git a/devices/pc/machine/5160/cga/256kb/array/machine.xml b/devices/pc/machine/5160/cga/256kb/array/machine.xml index eb4daa912..f5df3f756 100644 --- a/devices/pc/machine/5160/cga/256kb/array/machine.xml +++ b/devices/pc/machine/5160/cga/256kb/array/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), CGA, 256K, 10Mb Drive diff --git a/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml b/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml index 149d814ed..ec49290f8 100644 --- a/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml +++ b/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), CGA, 256Kb, 10Mb Drive diff --git a/devices/pc/machine/5160/cga/256kb/demo/machine.xml b/devices/pc/machine/5160/cga/256kb/demo/machine.xml index 4f4d7b1ca..7807f82ad 100644 --- a/devices/pc/machine/5160/cga/256kb/demo/machine.xml +++ b/devices/pc/machine/5160/cga/256kb/demo/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), CGA, 256Kb, 10Mb Drive diff --git a/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml b/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml index a463a7da5..a9d20aaa0 100644 --- a/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml +++ b/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), CGA, 256K, 10Mb Drive diff --git a/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml b/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml index 04279a040..c226e36a2 100644 --- a/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml +++ b/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160) running Windows v1.01 diff --git a/devices/pc/machine/5160/cga/256kb/win101/machine.xml b/devices/pc/machine/5160/cga/256kb/win101/machine.xml index ecfd39c4c..0ed5735c3 100644 --- a/devices/pc/machine/5160/cga/256kb/win101/machine.xml +++ b/devices/pc/machine/5160/cga/256kb/win101/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160) running Windows v1.01 diff --git a/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml b/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml index c10779113..5c1d44a3f 100644 --- a/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml +++ b/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), CGA, 256K, WIN101 diff --git a/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml b/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml index 7f5ec9075..b6035f514 100644 --- a/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml +++ b/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), CGA, 512K, WIN101 diff --git a/devices/pc/machine/5160/cga/640kb/debugger/machine.xml b/devices/pc/machine/5160/cga/640kb/debugger/machine.xml index 99df59998..7aa320f5c 100644 --- a/devices/pc/machine/5160/cga/640kb/debugger/machine.xml +++ b/devices/pc/machine/5160/cga/640kb/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), CGA, 640K, 10Mb Drive diff --git a/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml b/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml index 7b0333462..9d6e7775e 100644 --- a/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml +++ b/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), CGA, 640K, 10Mb Drive diff --git a/devices/pc/machine/5160/cga/640kb/machine.xml b/devices/pc/machine/5160/cga/640kb/machine.xml index c03366769..3966b0c7c 100644 --- a/devices/pc/machine/5160/cga/640kb/machine.xml +++ b/devices/pc/machine/5160/cga/640kb/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), CGA, 640K, 10Mb Drive diff --git a/devices/pc/machine/5160/ega/256kb/debugger/machine.xml b/devices/pc/machine/5160/ega/256kb/debugger/machine.xml index e925d03e7..4d99c7709 100644 --- a/devices/pc/machine/5160/ega/256kb/debugger/machine.xml +++ b/devices/pc/machine/5160/ega/256kb/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), 64K EGA, 256K RAM, 10Mb Hard Drive diff --git a/devices/pc/machine/5160/ega/640kb/array/machine.xml b/devices/pc/machine/5160/ega/640kb/array/machine.xml index 13f64a2b4..aba15843e 100644 --- a/devices/pc/machine/5160/ega/640kb/array/machine.xml +++ b/devices/pc/machine/5160/ega/640kb/array/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Drive diff --git a/devices/pc/machine/5160/ega/640kb/debugger/machine.xml b/devices/pc/machine/5160/ega/640kb/debugger/machine.xml index 53e6faddc..ccefe26b6 100644 --- a/devices/pc/machine/5160/ega/640kb/debugger/machine.xml +++ b/devices/pc/machine/5160/ega/640kb/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Drive diff --git a/devices/pc/machine/5160/ega/640kb/machine.xml b/devices/pc/machine/5160/ega/640kb/machine.xml index ec18855fd..7094c8143 100644 --- a/devices/pc/machine/5160/ega/640kb/machine.xml +++ b/devices/pc/machine/5160/ega/640kb/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Drive diff --git a/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml b/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml index dabfb24d7..4ec3ae450 100644 --- a/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml +++ b/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Drive diff --git a/devices/pc/machine/5160/ega/640kb/win101/machine.xml b/devices/pc/machine/5160/ega/640kb/win101/machine.xml index 21c80fa97..8e9aa4419 100644 --- a/devices/pc/machine/5160/ega/640kb/win101/machine.xml +++ b/devices/pc/machine/5160/ega/640kb/win101/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Drive diff --git a/devices/pc/machine/5160/mda/256kb/debugger/machine.xml b/devices/pc/machine/5160/mda/256kb/debugger/machine.xml index ebc349b0c..30d92199c 100644 --- a/devices/pc/machine/5160/mda/256kb/debugger/machine.xml +++ b/devices/pc/machine/5160/mda/256kb/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), MDA, 256Kb, 10Mb Drive diff --git a/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml b/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml index 64c390608..beaf94463 100644 --- a/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml +++ b/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), MDA, 256Kb, 10Mb Drive diff --git a/devices/pc/machine/5160/mda/256kb/fake188/machine.xml b/devices/pc/machine/5160/mda/256kb/fake188/machine.xml index af6d795bb..eb65238c1 100644 --- a/devices/pc/machine/5160/mda/256kb/fake188/machine.xml +++ b/devices/pc/machine/5160/mda/256kb/fake188/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), MDA, 256Kb, 10Mb Drive diff --git a/devices/pc/machine/5160/mda/256kb/machine.xml b/devices/pc/machine/5160/mda/256kb/machine.xml index 59c511147..d27451b5d 100644 --- a/devices/pc/machine/5160/mda/256kb/machine.xml +++ b/devices/pc/machine/5160/mda/256kb/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), MDA, 256Kb, 10Mb Drive diff --git a/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml b/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml index c006f03a7..9a4822739 100644 --- a/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml +++ b/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml @@ -1,5 +1,5 @@ - + IBM PC XT (Model 5160), MDA, 64K, 10Mb Drive diff --git a/devices/pc/machine/5170/ega/1152kb/rev1/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev1/machine.xml index 28ec00820..3e83b1e88 100644 --- a/devices/pc/machine/5170/ega/1152kb/rev1/machine.xml +++ b/devices/pc/machine/5170/ega/1152kb/rev1/machine.xml @@ -1,5 +1,5 @@ - + IBM PC AT (6Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk diff --git a/devices/pc/machine/5170/ega/1152kb/rev3/backtrack/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev3/backtrack/machine.xml index df3be8ba9..ffca1470e 100644 --- a/devices/pc/machine/5170/ega/1152kb/rev3/backtrack/machine.xml +++ b/devices/pc/machine/5170/ega/1152kb/rev3/backtrack/machine.xml @@ -1,5 +1,5 @@ - + IBM PC AT (8Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk diff --git a/devices/pc/machine/5170/ega/1152kb/rev3/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev3/machine.xml index e8eb07691..ff5934f3d 100644 --- a/devices/pc/machine/5170/ega/1152kb/rev3/machine.xml +++ b/devices/pc/machine/5170/ega/1152kb/rev3/machine.xml @@ -1,5 +1,5 @@ - + IBM PC AT (8Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk diff --git a/devices/pc/machine/5170/ega/640kb/rev1/machine.xml b/devices/pc/machine/5170/ega/640kb/rev1/machine.xml index cdc024c9a..3e2ff953b 100644 --- a/devices/pc/machine/5170/ega/640kb/rev1/machine.xml +++ b/devices/pc/machine/5170/ega/640kb/rev1/machine.xml @@ -1,5 +1,5 @@ - + IBM PC AT, 128K EGA, 640K RAM diff --git a/devices/pc/machine/5170/ega/640kb/rev1/manifest.xml b/devices/pc/machine/5170/ega/640kb/rev1/manifest.xml index f16ebab8f..19cdf40b5 100644 --- a/devices/pc/machine/5170/ega/640kb/rev1/manifest.xml +++ b/devices/pc/machine/5170/ega/640kb/rev1/manifest.xml @@ -1,5 +1,5 @@ - + IBM PC AT References diff --git a/devices/pc/machine/README.md b/devices/pc/machine/README.md index e0f44a276..9ca9b56fa 100644 --- a/devices/pc/machine/README.md +++ b/devices/pc/machine/README.md @@ -21,7 +21,7 @@ along with these IBM PC-compatibles: We also support a few non-IBM [Devices](/devices/): -* 6502-based [Challenger 1P](/devices/c1p/machine/) +* [6502 Challenger 1P](/devices/c1p/machine/) ### Ready-To-Run App Demos @@ -37,8 +37,12 @@ Machines from our [IBM PC Application Archive](/apps/pc/): And here are some machines from our [IBM PC Disk Archive](/disks/pc/): -* [CP/M-86 v1.1B](/disks/pc/cpm/1.1b/) +* [PC-DOS 1.00](/disks/pc/dos/ibm/1.00/) +* [PC-DOS 1.10](/disks/pc/dos/ibm/1.10/) +* [Multitasking MS-DOS](/disks/pc/dos/microsoft/4.0M/) * [IBM Diagnostics v2.20](/disks/pc/diags/ibm/2.20/) +* [OS/2 Prototype Disks](/disks/pc/os2/misc/) +* [CP/M-86 v1.1B](/disks/pc/cpm/1.1b/) * [Infocom Zork I](/disks/pc/games/infocom/zork1/) --- diff --git a/devices/pc/machine/compaq/deskpro386/README.md b/devices/pc/machine/compaq/deskpro386/README.md index 0ed870a24..6d8be7b0f 100644 --- a/devices/pc/machine/compaq/deskpro386/README.md +++ b/devices/pc/machine/compaq/deskpro386/README.md @@ -7,5 +7,6 @@ permalink: /devices/pc/machine/compaq/deskpro386/ Compaq DeskPro 386 Machines --- +* [Compaq DeskPro 386 with EGA, 2Mb RAM](ega/2048kb/) * [Compaq DeskPro 386 with VGA, 2Mb RAM](vga/2048kb/) * [Compaq DeskPro 386 with VGA, 4Mb RAM, running Windows 95](vga/4096kb/) diff --git a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml index a8b0bff42..81c0a74f3 100644 --- a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml +++ b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml @@ -1,18 +1,18 @@ - + - +