diff --git a/.vscode/launch.json b/.vscode/launch.json index 126cd7872..dd5336a0b 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -380,13 +380,20 @@ "webRoot": "${workspaceFolder}" }, { - "name": "PC Tech Journal Diskettes", - "type": "chrome", - "request": "launch", - "url": "http://localhost:4000/software/pcx86/sw/magazines/pctj/", - "webRoot": "${workspaceFolder}" - }, - { + "name": "PC Disk Magazine Diskettes", + "type": "chrome", + "request": "launch", + "url": "http://localhost:4000/software/pcx86/sw/magazines/pcdm/", + "webRoot": "${workspaceFolder}" + }, + { + "name": "PC Tech Journal Diskettes", + "type": "chrome", + "request": "launch", + "url": "http://localhost:4000/software/pcx86/sw/magazines/pctj/", + "webRoot": "${workspaceFolder}" + }, + { "name": "Software Carousel 2.0.3", "type": "chrome", "request": "launch", diff --git a/.vscode/settings.json b/.vscode/settings.json index ca08b9fdb..2c8431b61 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -22,6 +22,12 @@ "files.insertFinalNewline": true, "files.trimFinalNewlines": true }, + "[json]": { + "editor.detectIndentation": false, + "editor.insertSpaces": true, + "editor.tabSize": 2, + "files.trimTrailingWhitespace": true + }, "[markdown]": { "editor.insertSpaces": true, "editor.tabSize": 4, @@ -179,6 +185,7 @@ "CHARCODE", "chargen", "checkdisk", + "CHECKFAULT", "CHECKINTS", "CHECKLCD", "checkpage", @@ -901,6 +908,7 @@ "TRACKSECS", "Trammell", "transpiling", + "TRAPFAULT", "trapv", "Tshirt", "TSTAT", diff --git a/documents/magazines/pcdm/covers/PC-DISK-MAG-VOL1-NO10.jpg b/documents/magazines/pcdm/covers/PC-DISK-MAG-VOL1-NO10.jpg new file mode 100644 index 000000000..89190affc Binary files /dev/null and b/documents/magazines/pcdm/covers/PC-DISK-MAG-VOL1-NO10.jpg differ diff --git a/documents/magazines/pcdm/covers/PC-DISK-MAG-VOL1-NO8-DEMO.jpg b/documents/magazines/pcdm/covers/PC-DISK-MAG-VOL1-NO8-DEMO.jpg new file mode 100644 index 000000000..15000fda2 Binary files /dev/null and b/documents/magazines/pcdm/covers/PC-DISK-MAG-VOL1-NO8-DEMO.jpg differ diff --git a/documents/magazines/pcdm/covers/PC-DISK-MAG-VOL1-NO8.jpg b/documents/magazines/pcdm/covers/PC-DISK-MAG-VOL1-NO8.jpg new file mode 100644 index 000000000..25f0a8189 Binary files /dev/null and b/documents/magazines/pcdm/covers/PC-DISK-MAG-VOL1-NO8.jpg differ diff --git a/documents/magazines/pcdm/covers/PC-DISK-MAG-VOL1-NO9.jpg b/documents/magazines/pcdm/covers/PC-DISK-MAG-VOL1-NO9.jpg new file mode 100644 index 000000000..3464c1d12 Binary files /dev/null and b/documents/magazines/pcdm/covers/PC-DISK-MAG-VOL1-NO9.jpg differ diff --git a/machines/documents.json b/machines/documents.json index 566e7cfdb..a4573687c 100644 --- a/machines/documents.json +++ b/machines/documents.json @@ -630,6 +630,34 @@ "@link": "https://1drv.ms/b/s!ArcO_mFRe1Z9gqYWgm_0GTM-B7Y7kw?e=p3cCfZ", "@cover": ".jpg", "@source": "PCjs" + }, + { + "@title": "PC Disk Magazine Vol. 1 No. 8", + "@file": "PC-DISK-MAG-VOL1-NO8.pdf", + "@link": "https://1drv.ms/b/s!ArcO_mFRe1Z9ivlMqOcXXZhxMljyrA?e=qSV0Uc", + "@cover": ".jpg", + "@source": "PCjs" + }, + { + "@title": "PC Disk Magazine Vol. 1 No. 8 Demo", + "@file": "PC-DISK-MAG-VOL1-NO8-DEMO.pdf", + "@link": "https://1drv.ms/b/s!ArcO_mFRe1Z9ivlZB9tS13_IIVAA4A?e=jde81M", + "@cover": ".jpg", + "@source": "PCjs" + }, + { + "@title": "PC Disk Magazine Vol. 1 No. 9", + "@file": "PC-DISK-MAG-VOL1-NO9.pdf", + "@link": "https://1drv.ms/b/s!ArcO_mFRe1Z9ivlYo0hC-tRbLC0bqA?e=Eb3DBo", + "@cover": ".jpg", + "@source": "PCjs" + }, + { + "@title": "PC Disk Magazine Vol. 1 No. 10", + "@file": "PC-DISK-MAG-VOL1-NO10.pdf", + "@link": "https://1drv.ms/b/s!ArcO_mFRe1Z9ivla_sQN4TK7ticzhQ?e=HlLDCB", + "@cover": ".jpg", + "@source": "PCjs" } ] }, diff --git a/machines/pcx86/diskettes.json b/machines/pcx86/diskettes.json index c02cd68c0..058e09231 100644 --- a/machines/pcx86/diskettes.json +++ b/machines/pcx86/diskettes.json @@ -4083,46 +4083,70 @@ "@title": "PC Disk Magazine", "@media": [ { - "@title": "PC Disk Magazine (Disk 1)", + "@title": "PC Disk Magazine (Disk 01)", "@diskette": "PCDISKMAG-DISK1.json", "@photo": ".jpg", "@format": "PC160K" }, { - "@title": "PC Disk Magazine (Disk 2)", + "@title": "PC Disk Magazine (Disk 02)", "@diskette": "PCDISKMAG-DISK2.json", "@photo": ".jpg", "@format": "PC160K" }, { - "@title": "PC Disk Magazine (Disk 3)", + "@title": "PC Disk Magazine (Disk 03)", "@diskette": "PCDISKMAG-DISK3.json", "@photo": ".jpg", "@format": "PC160K" }, { - "@title": "PC Disk Magazine (Disk 4)", + "@title": "PC Disk Magazine (Disk 04)", "@diskette": "PCDISKMAG-DISK4.json", "@photo": ".jpg", "@format": "PC160K" }, { - "@title": "PC Disk Magazine (Disk 5)", + "@title": "PC Disk Magazine (Disk 05)", "@diskette": "PCDISKMAG-DISK5.json", "@photo": ".jpg", "@format": "PC160K" }, { - "@title": "PC Disk Magazine (Disk 6)", + "@title": "PC Disk Magazine (Disk 06)", "@diskette": "PCDISKMAG-DISK6.json", "@photo": ".jpg", "@format": "PC160K" }, { - "@title": "PC Disk Magazine (Disk 7)", + "@title": "PC Disk Magazine (Disk 07)", "@diskette": "PCDISKMAG-DISK7.json", "@photo": ".jpg", "@format": "PC160K" + }, + { + "@title": "PC Disk Magazine (Disk 08)", + "@diskette": "PCDISKMAG-DISK8.json", + "@photo": ".jpg", + "@format": "PC160K" + }, + { + "@title": "PC Disk Magazine (Disk 08 Demo)", + "@diskette": "PCDISKMAG-DISK8-DEMO.json", + "@photo": ".jpg", + "@format": "PC320K" + }, + { + "@title": "PC Disk Magazine (Disk 09)", + "@diskette": "PCDISKMAG-DISK9.json", + "@photo": ".jpg", + "@format": "PC160K" + }, + { + "@title": "PC Disk Magazine (Disk 10)", + "@diskette": "PCDISKMAG-DISK10.json", + "@photo": ".jpg", + "@format": "PC320K" } ] }, diff --git a/software/pcx86/sw/magazines/pcdm/index.md b/software/pcx86/sw/magazines/pcdm/index.md index 90a0b2faa..2aae9a05e 100644 --- a/software/pcx86/sw/magazines/pcdm/index.md +++ b/software/pcx86/sw/magazines/pcdm/index.md @@ -13,7 +13,7 @@ machines: A: name: None B: - name: "PC Disk Magazine (Disk 1)" + name: "PC Disk Magazine (Disk 01)" autoType: B:\rDIR\r --- @@ -21,11 +21,11 @@ machines: PC Disk Magazine diskettes are provided below. Copies of the magazines are available as well, both [here](#documents) and in our [Documents](/documents/magazines/pcdm/) section. -You can examine the disks, starting with "PC Disk Magazine (Disk 1)", in the machine below. +You can examine the disks, starting with "PC Disk Magazine (Disk 01)", in the machine below. {% include machine.html id="pcdm" %} -### Directory of PC Disk Magazine (Disk 1) +### Directory of PC Disk Magazine (Disk 01) Volume in drive A has no label Directory of A:\ @@ -48,9 +48,9 @@ You can examine the disks, starting with "PC Disk Magazine (Disk 1)", in the mac 15 file(s) 155460 bytes 1024 bytes free -![PC Disk Magazine (Disk 1)]({{ site.software.diskettes.server }}/pcx86/sw/magazines/pcdm/PCDISKMAG-DISK1.jpg) +![PC Disk Magazine (Disk 01)]({{ site.software.diskettes.server }}/pcx86/sw/magazines/pcdm/PCDISKMAG-DISK1.jpg) -### Directory of PC Disk Magazine (Disk 2) +### Directory of PC Disk Magazine (Disk 02) Volume in drive A has no label Directory of A:\ @@ -69,9 +69,9 @@ You can examine the disks, starting with "PC Disk Magazine (Disk 1)", in the mac 11 file(s) 127909 bytes 30720 bytes free -![PC Disk Magazine (Disk 2)]({{ site.software.diskettes.server }}/pcx86/sw/magazines/pcdm/PCDISKMAG-DISK2.jpg) +![PC Disk Magazine (Disk 02)]({{ site.software.diskettes.server }}/pcx86/sw/magazines/pcdm/PCDISKMAG-DISK2.jpg) -### Directory of PC Disk Magazine (Disk 3) +### Directory of PC Disk Magazine (Disk 03) Volume in drive A has no label Directory of A:\ @@ -94,9 +94,9 @@ You can examine the disks, starting with "PC Disk Magazine (Disk 1)", in the mac 15 file(s) 156784 bytes 512 bytes free -![PC Disk Magazine (Disk 3)]({{ site.software.diskettes.server }}/pcx86/sw/magazines/pcdm/PCDISKMAG-DISK3.jpg) +![PC Disk Magazine (Disk 03)]({{ site.software.diskettes.server }}/pcx86/sw/magazines/pcdm/PCDISKMAG-DISK3.jpg) -### Directory of PC Disk Magazine (Disk 4) +### Directory of PC Disk Magazine (Disk 04) Volume in drive A has no label Directory of A:\ @@ -118,9 +118,9 @@ You can examine the disks, starting with "PC Disk Magazine (Disk 1)", in the mac 14 file(s) 156713 bytes 512 bytes free -![PC Disk Magazine (Disk 4)]({{ site.software.diskettes.server }}/pcx86/sw/magazines/pcdm/PCDISKMAG-DISK4.jpg) +![PC Disk Magazine (Disk 04)]({{ site.software.diskettes.server }}/pcx86/sw/magazines/pcdm/PCDISKMAG-DISK4.jpg) -### Directory of PC Disk Magazine (Disk 5) +### Directory of PC Disk Magazine (Disk 05) Volume in drive A has no label Directory of A:\ @@ -152,9 +152,9 @@ You can examine the disks, starting with "PC Disk Magazine (Disk 1)", in the mac 24 file(s) 155859 bytes 0 bytes free -![PC Disk Magazine (Disk 5)]({{ site.software.diskettes.server }}/pcx86/sw/magazines/pcdm/PCDISKMAG-DISK5.jpg) +![PC Disk Magazine (Disk 05)]({{ site.software.diskettes.server }}/pcx86/sw/magazines/pcdm/PCDISKMAG-DISK5.jpg) -### Directory of PC Disk Magazine (Disk 6) +### Directory of PC Disk Magazine (Disk 06) Volume in drive A has no label Directory of A:\ @@ -182,9 +182,9 @@ You can examine the disks, starting with "PC Disk Magazine (Disk 1)", in the mac 20 file(s) 155211 bytes 1024 bytes free -![PC Disk Magazine (Disk 6)]({{ site.software.diskettes.server }}/pcx86/sw/magazines/pcdm/PCDISKMAG-DISK6.jpg) +![PC Disk Magazine (Disk 06)]({{ site.software.diskettes.server }}/pcx86/sw/magazines/pcdm/PCDISKMAG-DISK6.jpg) -### Directory of PC Disk Magazine (Disk 7) +### Directory of PC Disk Magazine (Disk 07) Volume in drive A has no label Directory of A:\ @@ -212,6 +212,96 @@ You can examine the disks, starting with "PC Disk Magazine (Disk 1)", in the mac 20 file(s) 148501 bytes 6144 bytes free -![PC Disk Magazine (Disk 7)]({{ site.software.diskettes.server }}/pcx86/sw/magazines/pcdm/PCDISKMAG-DISK7.jpg) +![PC Disk Magazine (Disk 07)]({{ site.software.diskettes.server }}/pcx86/sw/magazines/pcdm/PCDISKMAG-DISK7.jpg) + +### Directory of PC Disk Magazine (Disk 08) + + Volume in drive A has no label + Directory of A:\ + + SPREAD BAS 7707 8-01-84 12:02p + DIR BAS 167 3-01-84 3:50p + STEDIT BAS 20795 8-01-84 12:04p + STATLIB1 BAS 18405 8-01-84 12:04p + ST TXT 2432 8-01-84 12:09p + STATES BAS 9482 8-01-84 12:03p + BOOT1 BAS 15267 8-01-84 12:03p + HOME BAS 17990 8-01-84 12:03p + MAKESCRN BAS 16442 8-01-84 12:00p + MAKESCRN TXT 7680 8-01-84 12:01p + SCREEN USE 7843 8-01-84 12:00p + SECRET EXE 30080 6-26-84 3:33p + 12 file(s) 154290 bytes + 3072 bytes free + +![PC Disk Magazine (Disk 08)]({{ site.software.diskettes.server }}/pcx86/sw/magazines/pcdm/PCDISKMAG-DISK8.jpg) + +### Directory of PC Disk Magazine (Disk 08 Demo) + + Volume in drive A has no label + Directory of A:\ + + SPECIAL 2025 6-27-84 1:50p + CSHOPADS 2654 1-01-80 12:02a + CHART COM 24713 7-11-84 11:43a + MC COD 10822 7-10-84 2:40p + MC PGM 113268 7-10-84 2:50p + MC80 DAT 20004 7-11-84 12:00p + MC40 DAT 20456 7-10-84 3:07p + MC HLP 69901 7-09-84 4:25p + FONTLIST 215 4-27-84 10:47a + MFCORP 3089 1-01-80 12:03a + PETROCH 4745 6-27-84 1:28p + ORDERS84 6381 1-01-80 12:02a + F13025 RFT 6945 9-26-83 9:46a + PART2 1721 10-06-59 11:03p + DEMO 1737 6-27-84 1:52p + CHEMICAL 3258 6-27-84 1:39p + 16 file(s) 291934 bytes + 22528 bytes free + +![PC Disk Magazine (Disk 08 Demo)]({{ site.software.diskettes.server }}/pcx86/sw/magazines/pcdm/PCDISKMAG-DISK8-DEMO.jpg) + +### Directory of PC Disk Magazine (Disk 09) + + Volume in drive A has no label + Directory of A:\ + + PLANNER EXE 66816 10-01-84 12:09p + NOTEIND BAS 17009 1-01-80 4:09a + STUTOR BAS 12041 10-01-84 12:06p + SHRINKER BAS 4580 10-01-84 12:06p + SHRINKR1 BAS 2698 10-01-84 12:06p + SHRINKR2 BAS 6235 10-01-84 12:07p + POL BAS 26412 10-01-84 12:04p + FLASHCRD BAS 15562 10-01-84 12:01p + SAMPLE FLS 3447 10-01-84 12:09p + 9 file(s) 154800 bytes + 3072 bytes free + +![PC Disk Magazine (Disk 09)]({{ site.software.diskettes.server }}/pcx86/sw/magazines/pcdm/PCDISKMAG-DISK9.jpg) + +### Directory of PC Disk Magazine (Disk 10) + + Volume in drive A has no label + Directory of A:\ + + NOTES BAS 15988 11-10-84 7:18p + STATLIB2 BAS 35718 11-10-84 7:23p + STEDIT BAS 34038 11-10-84 7:23p + TUTOR3 BAS 20673 11-10-84 7:23p + PAINTER BAS 14913 11-10-84 7:23p + VALLEY BAS 16512 2-07-84 6:26a + TTG BAS 18486 11-10-84 7:23p + STOCK DAT 16260 11-10-84 2:34p + BOND DAT 2560 11-12-84 7:33p + SBDAT BAS 15568 11-12-84 7:40p + STOKBOND TXT 2858 11-12-84 8:36p + STOKBOND BAS 48790 11-12-84 9:05p + STOKBOND OVR 1664 1-01-80 12:04a + 13 file(s) 244028 bytes + 71680 bytes free + +![PC Disk Magazine (Disk 10)]({{ site.software.diskettes.server }}/pcx86/sw/magazines/pcdm/PCDISKMAG-DISK10.jpg) {% include gallery/documents.html path="/documents/magazines/pcdm/" %} diff --git a/software/pcx86/sys/unix/minix/1.1/pc-at/index.md b/software/pcx86/sys/unix/minix/1.1/pc-at/index.md index ca5acf9be..c316017e7 100644 --- a/software/pcx86/sys/unix/minix/1.1/pc-at/index.md +++ b/software/pcx86/sys/unix/minix/1.1/pc-at/index.md @@ -16,7 +16,13 @@ machines: [MINIX 1.1 for the IBM PC](../) was also released for IBM PC ATs on five 1.2M diskettes. The MINIX 1.1 software was identical in both releases, which meant that the PC version could boot and run equally well on PC ATs, so the only real -advantage of this five-diskette version was fewer, larger diskettes. They were labeled as follows: +advantage of this five-diskette release was fewer, larger diskettes. + +In fact, there was actually a *disadvantage* to using these diskettes: the MINIX floppy disk driver attempts to +use 3 different sets of low-density drive parameters before finally settling on the correct high-density settings, and it +performs multiple retries with each set, resulting in a noticeably longer start-up time. + +The five diskettes were labeled as follows: 1. BOOT DISKETTE 2. ROOT FILE SYSTEM @@ -42,8 +48,11 @@ After loading the "Usr" diskette, you can login as **root** with password **Gehe ### Notes -On December 12, 2022, I re-dumped all my 1.2M MINIX 1.1 diskettes and discovered that the boot disk I had originally -posted contained a few patches. Here are the differences: +It's important that the machine use a CGA video adapter rather than a VGA (or EGA), because MINIX 1.1 scrolls text by +adjusting the CRT controller start address *and* relying on frame buffer wrap-around at the 16K boundary. VGA frame buffers do +not wrap at 16K, so MINIX scrolling will periodically fail on VGA-based systems. + +Also, on December 12, 2022, I re-read all my 1.2M MINIX 1.1 diskettes and discovered that the boot disk image I had originally posted contained a few patches. Here are the differences: 1c1 < 00000000 b8 c0 07 8e d8 33 f6 b8 e0 2f 8e c0 33 ff b9 00 |.....3.../..3...| @@ -107,10 +116,10 @@ to a location inside the disk's boot sector that contains a few additional instr &0000:7D65 E99BFE JMP 7C03 ;cycles=2 My best guess is that these patches were made to resolve some issue with MINIX 1.1 on a non-IBM AT clone, but that's -pure speculation, as I have no recollection of making the patches, let alone why. +pure speculation, as I have no recollection of making these patches. -In any case, I have since restored the MINIX 1.1 1.2M boot disk to its (presumably) original unpatched state. +In any case, I have since restored the MINIX 1.2M boot disk to its (presumably) original unpatched state. This also makes the MINIX boot sector a bit more unusual, insofar as it does *not* start with the usual "JMP" instruction -that the first sector of all DOS diskettes generally start with. +that the first sector of all PC DOS and MS-DOS diskettes generally start with. ![MINIX 1.1 (1.2M Disk 1: Boot)]({{ site.software.diskettes.server }}/pcx86/sys/unix/minix/1.1/MINIX11-1200K-DISK1-BOOT.jpg)