diff --git a/Gruntfile.js b/Gruntfile.js index 84ec5eeb2e..11f87e1382 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -398,7 +398,7 @@ module.exports = function(grunt) { files: [ { cwd: "disks/pc/", - src: ["library.xml", "samples.xml"], + src: ["library.xml", "samples.xml", "private/library.xml"], dest: "disks/pc/compiled/", expand: true } diff --git a/_config.yml b/_config.yml index 7bceab3c49..f4a4e6d96c 100644 --- a/_config.yml +++ b/_config.yml @@ -17,7 +17,7 @@ right_brace: "}" # Build settings -exclude: ["index.html", "**/index.html", "**/archive", "**/c64", "logs", "node_modules", "**/private", "src", "**/src", "tmp", "**/tmp", "videos", "web", ".git", ".idea"] +exclude: ["index.html", "**/index.html", "**/archive", "**/c64", "logs", "node_modules", "src", "**/src", "tmp", "**/tmp", "videos", "web", ".git", ".idea"] markdown: kramdown kramdown: input: GFM @@ -31,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.21.3 # IMPORTANT: keep pcjs.version in sync with package.json:version + version: 1.21.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/apps/pc/1981/visicalc/manifest.xml b/apps/pc/1981/visicalc/manifest.xml index 64904a111b..5602930cde 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 0ab20a272a..35bb2c7d44 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 d41006966d..0af4a9b128 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 5b00380431..e969ac22da 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 caa26bc3a5..27b9c05eb1 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 32cc67ce5b..cd97581818 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/devices/c1p/machine/32kb/machine.xml b/devices/c1p/machine/32kb/machine.xml index 5163fc1e5b..018d09c0df 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 c48f983531..2725002718 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 9f08ea30c2..e4a784ddcc 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 d35e968191..e2c7c97706 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 b913e5fa01..17eb556c30 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 3084da8cf1..bfe1592eb6 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/chipset/5150-cga-max.xml b/devices/pc/chipset/5150-cga-max.xml index c152e733aa..13cfce1930 100644 --- a/devices/pc/chipset/5150-cga-max.xml +++ b/devices/pc/chipset/5150-cga-max.xml @@ -1,5 +1,5 @@ - + diff --git a/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml b/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml index 912734e5f8..93e73a0254 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 @@ -12,7 +12,7 @@ - + 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 6f7d790cde..231643b9c3 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 56158ec24b..0b4fae64a7 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 @@ -13,5 +13,5 @@ Reset - + diff --git a/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml b/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml index ba0d461a12..6f536d36f6 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 3f2af705ed..965a5a4a04 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 Displays @@ -14,5 +14,5 @@ Reset - + diff --git a/devices/pc/machine/5150/mda/64kb/debugger/machine.xml b/devices/pc/machine/5150/mda/64kb/debugger/machine.xml index 9e83b08d92..8af952f5fa 100644 --- a/devices/pc/machine/5150/mda/64kb/debugger/machine.xml +++ b/devices/pc/machine/5150/mda/64kb/debugger/machine.xml @@ -1,18 +1,18 @@ - + - IBM PC Model 5150 with Monochrome Display - + 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 893522a967..02269f3135 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 @@ -12,7 +12,7 @@ - + diff --git a/devices/pc/machine/5160/cga/256kb/array/machine.xml b/devices/pc/machine/5160/cga/256kb/array/machine.xml index bc45c9a406..bd318c6fbc 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 2924018661..ad7f9b6e8c 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 9dc65473bd..91ef3c611c 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 3f4544a1bd..c5d9472b69 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 8d667bcba6..f28d243948 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 1.01 diff --git a/devices/pc/machine/5160/cga/256kb/win101/machine.xml b/devices/pc/machine/5160/cga/256kb/win101/machine.xml index ed6c59c0a2..b13d425616 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 1.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 d481092d54..d765b00d5c 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, Windows 1.01 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 e6fbee8ecc..4a47df728b 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 de91838fec..3642146d73 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/machine.xml b/devices/pc/machine/5160/cga/640kb/machine.xml index 7e10ba264b..3a38519849 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/cga/640kb/softkbd/machine.xml b/devices/pc/machine/5160/cga/640kb/softkbd/machine.xml index 69fbedb8d5..203baef477 100644 --- a/devices/pc/machine/5160/cga/640kb/softkbd/machine.xml +++ b/devices/pc/machine/5160/cga/640kb/softkbd/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 b19604d785..46a7a4b5a7 100644 --- a/devices/pc/machine/5160/ega/256kb/debugger/machine.xml +++ b/devices/pc/machine/5160/ega/256kb/debugger/machine.xml @@ -1,7 +1,7 @@ - + - IBM PC XT (Model 5160), 64K EGA, 256K RAM, 10Mb Hard Drive + IBM PC XT (Model 5160), 64K EGA, 256K RAM, 10Mb Hard Disk diff --git a/devices/pc/machine/5160/ega/256kb/machine.xml b/devices/pc/machine/5160/ega/256kb/machine.xml index ed311906ed..b923fdfac0 100644 --- a/devices/pc/machine/5160/ega/256kb/machine.xml +++ b/devices/pc/machine/5160/ega/256kb/machine.xml @@ -1,7 +1,7 @@ - + - IBM PC XT (Model 5160), 64K EGA, 256K RAM, 10Mb Hard Drive + IBM PC XT (Model 5160), 64K EGA, 256K RAM, 10Mb Hard Disk diff --git a/devices/pc/machine/5160/ega/640kb/array/machine.xml b/devices/pc/machine/5160/ega/640kb/array/machine.xml index fbf4310a0b..23c3da8379 100644 --- a/devices/pc/machine/5160/ega/640kb/array/machine.xml +++ b/devices/pc/machine/5160/ega/640kb/array/machine.xml @@ -1,7 +1,7 @@ - + - IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Drive + IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Disk diff --git a/devices/pc/machine/5160/ega/640kb/debugger/machine.xml b/devices/pc/machine/5160/ega/640kb/debugger/machine.xml index 7fa2748c91..26206cb924 100644 --- a/devices/pc/machine/5160/ega/640kb/debugger/machine.xml +++ b/devices/pc/machine/5160/ega/640kb/debugger/machine.xml @@ -1,7 +1,7 @@ - + - IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Drive + IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Disk diff --git a/devices/pc/machine/5160/ega/640kb/machine.xml b/devices/pc/machine/5160/ega/640kb/machine.xml index 071b7d9ba2..1b6377c650 100644 --- a/devices/pc/machine/5160/ega/640kb/machine.xml +++ b/devices/pc/machine/5160/ega/640kb/machine.xml @@ -1,7 +1,7 @@ - + - IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Drive + IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Disk diff --git a/devices/pc/machine/5160/mda/256kb/debugger/machine.xml b/devices/pc/machine/5160/mda/256kb/debugger/machine.xml index dd1b958e39..722e6f03f6 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 7f8325c087..e661e89a99 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 7b562ec3d6..83b4195099 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 4fbea8d759..69440e8a4f 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 e81c868b6d..09244e2f37 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/README.md b/devices/pc/machine/5170/README.md index 2483a7bebf..6ece8fe3da 100644 --- a/devices/pc/machine/5170/README.md +++ b/devices/pc/machine/5170/README.md @@ -9,5 +9,7 @@ IBM PC AT Machines (Model 5170) All our Model 5170, aka IBM PC AT, configurations are located here, including: +* [IBM PC AT with MDA Display](/devices/pc/machine/5170/mda/) +* [IBM PC AT with CGA Display](/devices/pc/machine/5170/cga/) * [IBM PC AT with EGA Display](/devices/pc/machine/5170/ega/) * [IBM PC AT with VGA Display](/devices/pc/machine/5170/vga/) diff --git a/devices/pc/machine/5170/cga/640kb/rev3/debugger/machine.md b/devices/pc/machine/5170/cga/640kb/rev3/debugger/machine.md new file mode 100644 index 0000000000..65e7872ed4 --- /dev/null +++ b/devices/pc/machine/5170/cga/640kb/rev3/debugger/machine.md @@ -0,0 +1,11 @@ +--- +layout: page +title: "IBM PC AT (Model 5170, 640Kb) with CGA Display" +permalink: /devices/pc/machine/5170/cga/640kb/rev3/debugger/ +machines: + - type: pc + id: ibm5170 + debugger: true +--- + +{% include machine.html id="ibm5170" %} diff --git a/devices/pc/machine/5170/cga/640kb/rev3/debugger/machine.xml b/devices/pc/machine/5170/cga/640kb/rev3/debugger/machine.xml new file mode 100644 index 0000000000..c59d688b30 --- /dev/null +++ b/devices/pc/machine/5170/cga/640kb/rev3/debugger/machine.xml @@ -0,0 +1,36 @@ + + + + IBM PC AT (8Mhz, 640Kb, Dual Floppy) with Color Display + + + + + diff --git a/devices/pc/machine/5170/cga/640kb/rev3/machine.md b/devices/pc/machine/5170/cga/640kb/rev3/machine.md new file mode 100644 index 0000000000..41b6e9d9aa --- /dev/null +++ b/devices/pc/machine/5170/cga/640kb/rev3/machine.md @@ -0,0 +1,10 @@ +--- +layout: page +title: "IBM PC AT (Model 5170, 640Kb) with CGA Display" +permalink: /devices/pc/machine/5170/cga/640kb/rev3/ +machines: + - type: pc + id: ibm5170 +--- + +{% include machine.html id="ibm5170" %} diff --git a/devices/pc/machine/5170/cga/640kb/rev3/machine.xml b/devices/pc/machine/5170/cga/640kb/rev3/machine.xml new file mode 100644 index 0000000000..a642c3eb3d --- /dev/null +++ b/devices/pc/machine/5170/cga/640kb/rev3/machine.xml @@ -0,0 +1,15 @@ + + + + IBM PC AT (8Mhz, 640Kb, Dual Floppy) with Color Display + + + + + diff --git a/devices/pc/machine/5170/cga/README.md b/devices/pc/machine/5170/cga/README.md new file mode 100644 index 0000000000..cfaa164865 --- /dev/null +++ b/devices/pc/machine/5170/cga/README.md @@ -0,0 +1,12 @@ +--- +layout: page +title: "IBM PC AT (Model 5170) with Color Display" +permalink: /devices/pc/machine/5170/cga/ +--- + +IBM PC AT with Color (CGA) Display +--- + +All our Color Display configurations of the IBM PC AT (Model 5170) are located here, including: + +* [IBM PC AT (8Mhz, 640Kb, Dual Floppy) with CGA Display](/devices/pc/machine/5170/cga/640kb/rev3/) ([Debugger](/devices/pc/machine/5170/cga/640kb/rev3/debugger/)) diff --git a/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml index b4e87464e1..ed5518205c 100644 --- a/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml +++ b/devices/pc/machine/5170/ega/1152kb/rev1/debugger/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/rev1/machine.md b/devices/pc/machine/5170/ega/1152kb/rev1/machine.md new file mode 100644 index 0000000000..315a42eb9e --- /dev/null +++ b/devices/pc/machine/5170/ega/1152kb/rev1/machine.md @@ -0,0 +1,10 @@ +--- +layout: page +title: "IBM PC AT (Model 5170, 1152Kb) with EGA Display and 20Mb Hard Disk" +permalink: /devices/pc/machine/5170/ega/1152kb/rev1/ +machines: + - type: pc + id: ibm5170 +--- + +{% include machine.html id="ibm5170" %} diff --git a/devices/pc/machine/5170/ega/1152kb/rev1/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev1/machine.xml new file mode 100644 index 0000000000..f6b5ac1ac6 --- /dev/null +++ b/devices/pc/machine/5170/ega/1152kb/rev1/machine.xml @@ -0,0 +1,17 @@ + + + + IBM PC AT (6Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk + + + + + + diff --git a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml index cb7a9e7a1a..82bee78577 100644 --- a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml +++ b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/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/debugger/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml index 712121d4c6..5e5b3c5e5a 100644 --- a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml +++ b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/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 26d717cbfe..4fc0e3d179 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 @@ -17,6 +17,5 @@ - diff --git a/devices/pc/machine/5170/ega/2048kb/rev3/debugger/backtrack/machine.xml b/devices/pc/machine/5170/ega/2048kb/rev3/debugger/backtrack/machine.xml index 558d8c8eec..0809e67491 100644 --- a/devices/pc/machine/5170/ega/2048kb/rev3/debugger/backtrack/machine.xml +++ b/devices/pc/machine/5170/ega/2048kb/rev3/debugger/backtrack/machine.xml @@ -1,5 +1,5 @@ - + IBM PC AT (8Mhz), 128Kb EGA, 2Mb RAM, 20Mb Hard Disk diff --git a/devices/pc/machine/5170/ega/2048kb/rev3/debugger/machine.xml b/devices/pc/machine/5170/ega/2048kb/rev3/debugger/machine.xml index f258bb77eb..e9ecf66bf2 100644 --- a/devices/pc/machine/5170/ega/2048kb/rev3/debugger/machine.xml +++ b/devices/pc/machine/5170/ega/2048kb/rev3/debugger/machine.xml @@ -1,5 +1,5 @@ - + IBM PC AT (8Mhz), 128Kb EGA, 2Mb RAM, 20Mb Hard Disk diff --git a/devices/pc/machine/5170/ega/2048kb/rev3/machine.xml b/devices/pc/machine/5170/ega/2048kb/rev3/machine.xml index afe7d557c3..c0e9ddcbe6 100644 --- a/devices/pc/machine/5170/ega/2048kb/rev3/machine.xml +++ b/devices/pc/machine/5170/ega/2048kb/rev3/machine.xml @@ -1,5 +1,5 @@ - + IBM PC AT (8Mhz), 128Kb EGA, 2Mb RAM, 20Mb Hard Disk @@ -13,6 +13,5 @@ - diff --git a/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml b/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml index 524667c024..4a225572a9 100644 --- a/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml +++ b/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml @@ -1,7 +1,7 @@ - + - IBM PC AT, 128K EGA, 640K RAM + IBM PC AT, 128K EGA, 640Kb RAM diff --git a/devices/pc/machine/5170/ega/640kb/rev1/debugger/manifest.xml b/devices/pc/machine/5170/ega/640kb/rev1/debugger/manifest.xml deleted file mode 100644 index 33ac884189..0000000000 --- a/devices/pc/machine/5170/ega/640kb/rev1/debugger/manifest.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - IBM PC AT References - - IBM 5170 Technical Reference (March 1984) - - I/O Address Map - CMOS Addresses - BIOS Map - BIOS Listing - TEST.01: X286 Processor Test - TEST.02: Verify CMOS Shutdown - POST7 VERW/VERR - DISKETTE_IO_1 - - - 80286 and 80287 Programmers Reference Manual (1987) - - Memory Organization and Segmentation - VERR/VERW - - diff --git a/devices/pc/machine/5170/ega/640kb/rev1/machine.xml b/devices/pc/machine/5170/ega/640kb/rev1/machine.xml index dd9e28bf9a..56145a27a4 100644 --- a/devices/pc/machine/5170/ega/640kb/rev1/machine.xml +++ b/devices/pc/machine/5170/ega/640kb/rev1/machine.xml @@ -1,7 +1,7 @@ - + - IBM PC AT, 128K EGA, 640K RAM + IBM PC AT, 128K EGA, 640Kb RAM @@ -11,6 +11,5 @@ - diff --git a/devices/pc/machine/5170/ega/README.md b/devices/pc/machine/5170/ega/README.md index bf33395cb3..c00d94cde8 100644 --- a/devices/pc/machine/5170/ega/README.md +++ b/devices/pc/machine/5170/ega/README.md @@ -9,7 +9,9 @@ IBM PC AT with Enhanced Color Graphics (EGA) Display All our Enhanced Color Graphics (EGA) configurations of the IBM PC AT (Model 5170) are located here, including: -* [IBM PC AT (6Mhz, 640Kb) with EGA Display (Debugger)](/devices/pc/machine/5170/ega/640kb/rev1/debugger/) -* [IBM PC AT (6Mhz, 1Mb, 20Mb Drive) with EGA Display (Debugger)](/devices/pc/machine/5170/ega/1152kb/rev1/debugger/) -* [IBM PC AT (8Mhz, 1Mb, 20Mb Drive) with EGA Display](/devices/pc/machine/5170/ega/1152kb/rev3/) ([Debugger](/devices/pc/machine/5170/ega/1152kb/rev3/debugger/),[Backtrack](/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/)) -* [IBM PC AT (8Mhz, 2Mb, 20Mb Drive) with EGA Display](/devices/pc/machine/5170/ega/2048kb/rev3/) ([Debugger](/devices/pc/machine/5170/ega/2048kb/rev3/debugger/),[Backtrack](/devices/pc/machine/5170/ega/2048kb/rev3/debugger/backtrack/)) +* [IBM PC AT (8Mhz, 640Kb, Dual Floppy) with MDA Display](/devices/pc/machine/5170/mda/640kb/rev3/) ([Debugger](/devices/pc/machine/5170/mda/640kb/rev3/debugger/)) +* [IBM PC AT (8Mhz, 640Kb, Dual Floppy) with CGA Display](/devices/pc/machine/5170/cga/640kb/rev3/) ([Debugger](/devices/pc/machine/5170/cga/640kb/rev3/debugger/)) +* [IBM PC AT (6Mhz, 640Kb, Dual Floppy) with EGA Display](/devices/pc/machine/5170/ega/640kb/rev1/) ([Debugger](/devices/pc/machine/5170/ega/640kb/rev1/debugger/)) +* [IBM PC AT (6Mhz, 1Mb, 20Mb Hard Disk) with EGA Display](/devices/pc/machine/5170/ega/1152kb/rev1/) ([Debugger](/devices/pc/machine/5170/ega/1152kb/rev1/debugger/)) +* [IBM PC AT (8Mhz, 1Mb, 20Mb Hard Disk) with EGA Display](/devices/pc/machine/5170/ega/1152kb/rev3/) ([Debugger](/devices/pc/machine/5170/ega/1152kb/rev3/debugger/),[Backtrack](/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/)) +* [IBM PC AT (8Mhz, 2Mb, 20Mb Hard Disk) with EGA Display](/devices/pc/machine/5170/ega/2048kb/rev3/) ([Debugger](/devices/pc/machine/5170/ega/2048kb/rev3/debugger/),[Backtrack](/devices/pc/machine/5170/ega/2048kb/rev3/debugger/backtrack/)) diff --git a/devices/pc/machine/5170/mda/640kb/rev3/debugger/machine.md b/devices/pc/machine/5170/mda/640kb/rev3/debugger/machine.md new file mode 100644 index 0000000000..e28542640c --- /dev/null +++ b/devices/pc/machine/5170/mda/640kb/rev3/debugger/machine.md @@ -0,0 +1,11 @@ +--- +layout: page +title: "IBM PC AT (Model 5170, 640Kb) with MDA Display" +permalink: /devices/pc/machine/5170/mda/640kb/rev3/debugger/ +machines: + - type: pc + id: ibm5170 + debugger: true +--- + +{% include machine.html id="ibm5170" %} diff --git a/devices/pc/machine/5170/mda/640kb/rev3/debugger/machine.xml b/devices/pc/machine/5170/mda/640kb/rev3/debugger/machine.xml new file mode 100644 index 0000000000..f11de6b497 --- /dev/null +++ b/devices/pc/machine/5170/mda/640kb/rev3/debugger/machine.xml @@ -0,0 +1,36 @@ + + + + IBM PC AT (8Mhz, 640Kb, Dual Floppy) with Monochrome Display + + + + + diff --git a/devices/pc/machine/5170/mda/640kb/rev3/machine.md b/devices/pc/machine/5170/mda/640kb/rev3/machine.md new file mode 100644 index 0000000000..7fae8003d5 --- /dev/null +++ b/devices/pc/machine/5170/mda/640kb/rev3/machine.md @@ -0,0 +1,10 @@ +--- +layout: page +title: "IBM PC AT (Model 5170, 640Kb) with MDA Display" +permalink: /devices/pc/machine/5170/mda/640kb/rev3/ +machines: + - type: pc + id: ibm5170 +--- + +{% include machine.html id="ibm5170" %} diff --git a/devices/pc/machine/5170/mda/640kb/rev3/machine.xml b/devices/pc/machine/5170/mda/640kb/rev3/machine.xml new file mode 100644 index 0000000000..b533ee1289 --- /dev/null +++ b/devices/pc/machine/5170/mda/640kb/rev3/machine.xml @@ -0,0 +1,15 @@ + + + + IBM PC AT (8Mhz, 640Kb, Dual Floppy) with Monochrome Display + + + + + diff --git a/devices/pc/machine/5170/mda/README.md b/devices/pc/machine/5170/mda/README.md new file mode 100644 index 0000000000..f621636d9e --- /dev/null +++ b/devices/pc/machine/5170/mda/README.md @@ -0,0 +1,12 @@ +--- +layout: page +title: "IBM PC AT (Model 5170) with Monochrome Display" +permalink: /devices/pc/machine/5170/mda/ +--- + +IBM PC AT with Monochrome (MDA) Display +--- + +All our Monochrome Display configurations of the IBM PC AT (Model 5170) are located here, including: + +* [IBM PC AT (8Mhz, 640Kb, Dual Floppy) with MDA Display](/devices/pc/machine/5170/mda/640kb/rev3/) ([Debugger](/devices/pc/machine/5170/mda/640kb/rev3/debugger/)) diff --git a/devices/pc/machine/5170/vga/2048kb/debugger/machine.xml b/devices/pc/machine/5170/vga/2048kb/debugger/machine.xml index 94125fd4d3..9bac46eaff 100644 --- a/devices/pc/machine/5170/vga/2048kb/debugger/machine.xml +++ b/devices/pc/machine/5170/vga/2048kb/debugger/machine.xml @@ -1,7 +1,7 @@ - + - IBM PC AT (8Mhz), VGA, 2Mb RAM, 20Mb Hard Disk + IBM PC AT (8Mhz, 2Mb, 20Mb Hard Disk) with VGA Display diff --git a/devices/pc/machine/5170/vga/2048kb/machine.xml b/devices/pc/machine/5170/vga/2048kb/machine.xml index 32197a5f77..3cba23db47 100644 --- a/devices/pc/machine/5170/vga/2048kb/machine.xml +++ b/devices/pc/machine/5170/vga/2048kb/machine.xml @@ -1,7 +1,7 @@ - + - IBM PC AT (8Mhz), VGA, 2Mb RAM, 20Mb Hard Disk + IBM PC AT (8Mhz, 2Mb, 20Mb Hard Disk) with VGA Display @@ -17,6 +17,5 @@ - diff --git a/devices/pc/machine/5170/vga/4096kb/debugger/machine.xml b/devices/pc/machine/5170/vga/4096kb/debugger/machine.xml index 908aa15e67..14a4e0823f 100644 --- a/devices/pc/machine/5170/vga/4096kb/debugger/machine.xml +++ b/devices/pc/machine/5170/vga/4096kb/debugger/machine.xml @@ -1,7 +1,7 @@ - + - IBM PC AT (8Mhz), VGA, 4Mb RAM, 20Mb Hard Disk + IBM PC AT (8Mhz, 4Mb, 20Mb Hard Disk) with VGA Display diff --git a/devices/pc/machine/5170/vga/4096kb/machine.xml b/devices/pc/machine/5170/vga/4096kb/machine.xml index 4b434eab25..fdf6c39245 100644 --- a/devices/pc/machine/5170/vga/4096kb/machine.xml +++ b/devices/pc/machine/5170/vga/4096kb/machine.xml @@ -1,5 +1,5 @@ - + IBM PC AT (8Mhz), VGA, 4Mb RAM, 20Mb Hard Disk @@ -17,6 +17,5 @@ - diff --git a/devices/pc/machine/5170/vga/README.md b/devices/pc/machine/5170/vga/README.md index 31348e58f5..0a3bffe71b 100644 --- a/devices/pc/machine/5170/vga/README.md +++ b/devices/pc/machine/5170/vga/README.md @@ -4,9 +4,10 @@ title: "IBM PC AT (Model 5170) with VGA Display" permalink: /devices/pc/machine/5170/vga/ --- -IBM PC AT with VGA Display +IBM PC AT with Video Graphics Array (VGA) Display --- -All our VGA configurations of the IBM PC AT (Model 5170) are located here, including: +All our Video Graphics Array (VGA) configurations of the IBM PC AT (Model 5170) are located here, including: -* [IBM PC AT (8Mhz, 2Mb, 20Mb Drive) with VGA Display](/devices/pc/machine/5170/vga/2048kb/) ([Debugger](/devices/pc/machine/5170/vga/2048kb/debugger/)) +* [IBM PC AT (8Mhz, 2Mb, 20Mb Hard Disk) with VGA Display](/devices/pc/machine/5170/vga/2048kb/) ([Debugger](/devices/pc/machine/5170/vga/2048kb/debugger/)) +* [IBM PC AT (8Mhz, 4Mb, 20Mb Hard Disk) with VGA Display](/devices/pc/machine/5170/vga/4096kb/) ([Debugger](/devices/pc/machine/5170/vga/4096kb/debugger/)) diff --git a/devices/pc/machine/README.md b/devices/pc/machine/README.md index 21cc57d1bd..3023d849fe 100644 --- a/devices/pc/machine/README.md +++ b/devices/pc/machine/README.md @@ -96,9 +96,11 @@ other software. [Model 5170 Machines](/devices/pc/machine/5170/) include: -* [IBM PC AT (6Mhz, 640Kb) with EGA Display (Debugger)](/devices/pc/machine/5170/ega/640kb/rev1/debugger/) -* [IBM PC AT (6Mhz, 1Mb, 20Mb Drive) with EGA Display (Debugger)](/devices/pc/machine/5170/ega/1152kb/rev1/debugger/) -* [IBM PC AT (8Mhz, 1Mb, 20Mb Drive) with EGA Display](/devices/pc/machine/5170/ega/1152kb/rev3/) ([Debugger](/devices/pc/machine/5170/ega/1152kb/rev3/debugger/),[Backtrack](/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/)) -* [IBM PC AT (8Mhz, 2Mb, 20Mb Drive) with EGA Display](/devices/pc/machine/5170/ega/2048kb/rev3/) ([Debugger](/devices/pc/machine/5170/ega/2048kb/rev3/debugger/),[Backtrack](/devices/pc/machine/5170/ega/2048kb/rev3/debugger/backtrack/)) -* [IBM PC AT (8Mhz, 2Mb, 20Mb Drive) with VGA Display](/devices/pc/machine/5170/vga/2048kb/) ([Debugger](/devices/pc/machine/5170/vga/2048kb/debugger/)) -* [IBM PC AT (8Mhz, 4Mb, 20Mb Drive) with VGA Display](/devices/pc/machine/5170/vga/4096kb/) ([Debugger](/devices/pc/machine/5170/vga/4096kb/debugger/)) +* [IBM PC AT (8Mhz, 640Kb, Dual Floppy) with MDA Display](/devices/pc/machine/5170/mda/640kb/rev3/) ([Debugger](/devices/pc/machine/5170/mda/640kb/rev3/debugger/)) +* [IBM PC AT (8Mhz, 640Kb, Dual Floppy) with CGA Display](/devices/pc/machine/5170/cga/640kb/rev3/) ([Debugger](/devices/pc/machine/5170/cga/640kb/rev3/debugger/)) +* [IBM PC AT (6Mhz, 640Kb, Dual Floppy) with EGA Display](/devices/pc/machine/5170/ega/640kb/rev1/) ([Debugger](/devices/pc/machine/5170/ega/640kb/rev1/debugger/)) +* [IBM PC AT (6Mhz, 1Mb, 20Mb Hard Disk) with EGA Display](/devices/pc/machine/5170/ega/1152kb/rev1/) ([Debugger)](/devices/pc/machine/5170/ega/1152kb/rev1/debugger/)) +* [IBM PC AT (8Mhz, 1Mb, 20Mb Hard Disk) with EGA Display](/devices/pc/machine/5170/ega/1152kb/rev3/) ([Debugger](/devices/pc/machine/5170/ega/1152kb/rev3/debugger/),[Backtrack](/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/)) +* [IBM PC AT (8Mhz, 2Mb, 20Mb Hard Disk) with EGA Display](/devices/pc/machine/5170/ega/2048kb/rev3/) ([Debugger](/devices/pc/machine/5170/ega/2048kb/rev3/debugger/),[Backtrack](/devices/pc/machine/5170/ega/2048kb/rev3/debugger/backtrack/)) +* [IBM PC AT (8Mhz, 2Mb, 20Mb Hard Disk) with VGA Display](/devices/pc/machine/5170/vga/2048kb/) ([Debugger](/devices/pc/machine/5170/vga/2048kb/debugger/)) +* [IBM PC AT (8Mhz, 4Mb, 20Mb Hard Disk) with VGA Display](/devices/pc/machine/5170/vga/4096kb/) ([Debugger](/devices/pc/machine/5170/vga/4096kb/debugger/)) diff --git a/devices/pc/machine/att/6300/cga/640kb/debugger/machine.xml b/devices/pc/machine/att/6300/cga/640kb/debugger/machine.xml index 0c11e3ce9d..63a90c6684 100644 --- a/devices/pc/machine/att/6300/cga/640kb/debugger/machine.xml +++ b/devices/pc/machine/att/6300/cga/640kb/debugger/machine.xml @@ -1,5 +1,5 @@ - + AT&T Personal Computer 6300 with Color Display diff --git a/devices/pc/machine/att/6300/cga/640kb/machine.xml b/devices/pc/machine/att/6300/cga/640kb/machine.xml index 6c811699c4..75d8692c44 100644 --- a/devices/pc/machine/att/6300/cga/640kb/machine.xml +++ b/devices/pc/machine/att/6300/cga/640kb/machine.xml @@ -1,5 +1,5 @@ - + AT&T Personal Computer 6300 with Color Display diff --git a/devices/pc/machine/cdp/mpc1600/cga/640kb/debugger/machine.xml b/devices/pc/machine/cdp/mpc1600/cga/640kb/debugger/machine.xml index ebdccdb082..d04803820c 100644 --- a/devices/pc/machine/cdp/mpc1600/cga/640kb/debugger/machine.xml +++ b/devices/pc/machine/cdp/mpc1600/cga/640kb/debugger/machine.xml @@ -1,5 +1,5 @@ - + Columbia Data Products MPC 1600 with Color Display diff --git a/devices/pc/machine/cdp/mpc1600/cga/640kb/machine.xml b/devices/pc/machine/cdp/mpc1600/cga/640kb/machine.xml index 8ed5da9f2f..5530176843 100644 --- a/devices/pc/machine/cdp/mpc1600/cga/640kb/machine.xml +++ b/devices/pc/machine/cdp/mpc1600/cga/640kb/machine.xml @@ -1,5 +1,5 @@ - + Columbia Data Products MPC 1600 with Color Display diff --git a/devices/pc/machine/compaq/deskpro386/ega/2048kb/debugger/machine.xml b/devices/pc/machine/compaq/deskpro386/ega/2048kb/debugger/machine.xml index 6c6e7177b6..b524424436 100644 --- a/devices/pc/machine/compaq/deskpro386/ega/2048kb/debugger/machine.xml +++ b/devices/pc/machine/compaq/deskpro386/ega/2048kb/debugger/machine.xml @@ -1,5 +1,5 @@ - + COMPAQ DeskPro 386, 2Mb RAM, 128Kb EGA diff --git a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml index c0eb044bb5..f5f904365b 100644 --- a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml +++ b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml @@ -1,5 +1,5 @@ - + COMPAQ DeskPro 386, 2Mb RAM, 128Kb EGA diff --git a/devices/pc/machine/compaq/deskpro386/ega/4096kb/debugger/machine.xml b/devices/pc/machine/compaq/deskpro386/ega/4096kb/debugger/machine.xml index 928aa11943..3e940d73f2 100644 --- a/devices/pc/machine/compaq/deskpro386/ega/4096kb/debugger/machine.xml +++ b/devices/pc/machine/compaq/deskpro386/ega/4096kb/debugger/machine.xml @@ -1,5 +1,5 @@ - + COMPAQ DeskPro 386, 4Mb RAM, 128Kb EGA diff --git a/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml b/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml index 8c449237ee..c25fe205a9 100644 --- a/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml +++ b/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml @@ -1,5 +1,5 @@ - + COMPAQ DeskPro 386, 4Mb RAM, 128Kb EGA diff --git a/devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.xml b/devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.xml index bc23c38bd1..866e221fa6 100644 --- a/devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.xml +++ b/devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.xml @@ -1,5 +1,5 @@ - + COMPAQ DeskPro 386, 2Mb RAM, COMPAQ VGA, 20Mb Hard Disk @@ -8,7 +8,7 @@ -