Retro/pcjs
Watch
1
0
Fork
You've already forked pcjs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More tweaks to the OS/2 prototype disk pages

Browse source
This commit is contained in:
Jeff Parsons 2016-01-20 12:04:58 -08:00
commit 814d1ddb6a
8 changed files with 42 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
devices/pc/machine/README.md
View file

@ -41,7 +41,7 @@ And here are some machines from our [IBM PC Disk Archive](/disks/pc/):
* [PC-DOS 1.10](/disks/pc/dos/ibm/1.10/) * [PC-DOS 1.10](/disks/pc/dos/ibm/1.10/)
* [Multitasking MS-DOS](/disks/pc/dos/microsoft/4.0M/) * [Multitasking MS-DOS](/disks/pc/dos/microsoft/4.0M/)
* [IBM Diagnostics v2.20](/disks/pc/diags/ibm/2.20/) * [IBM Diagnostics v2.20](/disks/pc/diags/ibm/2.20/)
* [OS/2 Prototypes](/disks/pc/os2/misc/) * [OS/2 Prototype Disks](/disks/pc/os2/misc/)
* [CP/M-86 v1.1B](/disks/pc/cpm/1.1b/) * [CP/M-86 v1.1B](/disks/pc/cpm/1.1b/)
* [Infocom Zork I](/disks/pc/games/infocom/zork1/) * [Infocom Zork I](/disks/pc/games/infocom/zork1/)

2
disks/pc/README.md
View file

@ -63,7 +63,7 @@ that automatically run the software.
### Other OS/2 Disks ### Other OS/2 Disks
* [OS/2 Boot Disks](/disks/pc/os2/misc/) * [OS/2 Prototype Disks](/disks/pc/os2/misc/)
### Microsoft Windows ### Microsoft Windows

4
disks/pc/os2/misc/1.0/88286/README.md
View file

@ -17,8 +17,8 @@ redirect_from:
OS/2 1.0 Debugger Boot Disk OS/2 1.0 Debugger Boot Disk
--- ---
This disk contains a version of OS/2 1.0 built on October 12, 1988, which includes the built-in kernel debugger This disk contains a version of OS/2 1.0 built on October 12, 1988, which included the built-in kernel debugger
used by Microsoft and IBM for internal development. used by Microsoft and IBM for internal development, along with a rudimentary program selector.
Note that [IBM OS/2 1.0](/disks/pc/os2/ibm/1.0/) was finalized in October 1987, nearly a year before the timestamps Note that [IBM OS/2 1.0](/disks/pc/os2/ibm/1.0/) was finalized in October 1987, nearly a year before the timestamps
of these files, indicating that this was a private build of IBM OS/2 1.0. When this disk boots, the following message of these files, indicating that this was a private build of IBM OS/2 1.0. When this disk boots, the following message

4
disks/pc/os2/misc/README.md
View file

@ -10,8 +10,8 @@ Other OS/2 Disks
### OS/2 1.0 Debugger Boot Disk ### OS/2 1.0 Debugger Boot Disk
The [OS/2 1.0 Debugger Boot Disk](/disks/pc/os2/misc/1.0/88286/) contains a version of OS/2 1.0 built on The [OS/2 1.0 Debugger Boot Disk](/disks/pc/os2/misc/1.0/88286/) contains a version of OS/2 1.0 built on
October 12, 1988, which includes the built-in kernel debugger used by Microsoft and IBM for internal development. October 12, 1988, which included the built-in kernel debugger used by Microsoft and IBM for internal development,
For more details, see the [OS/2 1.0](/blog/2014/12/04/) blog post. along with a rudimentary program selector. For more details, see the [OS/2 1.0](/blog/2014/12/04/) blog post.
### OS/2 FOOTBALL Boot Disk (v7.68.17) ### OS/2 FOOTBALL Boot Disk (v7.68.17)

21
disks/pc/os2/misc/football/87058/README.md
View file

@ -16,7 +16,7 @@ OS/2 FOOTBALL Boot Disk (v7.68.17)
--- ---
This disk contains a prototype version of OS/2 from early 1987, code-named **FOOTBALL** (aka **PIGSKIN**). This disk contains a prototype version of OS/2 from early 1987, code-named **FOOTBALL** (aka **PIGSKIN**).
It predates the release of OS/2 1.0 by some 8 months. It predates the completion of OS/2 1.0 by some eight months.
On boot, the following message is displayed on-screen: On boot, the following message is displayed on-screen:
@ -33,18 +33,19 @@ However, another underlying goal was to demonstrate to IBM that Microsoft was ah
considerations for OS/2. Up to this point, all OS/2 design and development work had been 16-bit, since the considerations for OS/2. Up to this point, all OS/2 design and development work had been 16-bit, since the
state-of-the-art Intel CPU at the time was the 80286. state-of-the-art Intel CPU at the time was the 80286.
The FOOTBALL prototype was forked from pre-1.0 OS/2 sources, and the only hardware it supported was the Compaq DeskPro The FOOTBALL prototype was based on pre-1.0 OS/2 sources, and the only hardware it supported was the Compaq DeskPro
386-16. The source code was later sent to IBM, and as of April 1987, they were adapting it to run on the Model 80 PS/2. 386-16. The source code was later sent to IBM, who in early April 1987 was adapting it to run on the Model 80 PS/2.
It is unlikely that any FOOTBALL prototype was ever released outside of Microsoft and IBM.
Although FOOTBALL contained features not found in OS/2 until version 2.0, there is no direct connection between this After OS/2 1.0 was finished in October 1987, FOOTBALL changes were merged into a fresh set of 1.0 sources, which
internal Microsoft effort and OS/2 2.0. Some of the 32-bit support and paging work undoubtedly migrated to version 2.0 initially was version 1.3 (also known as **PIGSKIN** and later **CRUISER**) but ultimately became version 2.0.
eventually, but that would have happened much later, since work on OS/2 2.0 did not begin in earnest until October 1987,
after 1.0 was finished. A directory listing of this disk is provided [below](#directory-of-os2-football-boot-disk-v76817).
Booting FOOTBALL Booting FOOTBALL
--- ---
{% include machine.html id="deskpro386" %}
When booting on a [Compaq DeskPro 386-16 with 2Mb of RAM](/devices/pc/machine/compaq/deskpro386/ega/2048kb/), When booting on a [Compaq DeskPro 386-16 with 2Mb of RAM](/devices/pc/machine/compaq/deskpro386/ega/2048kb/),
the following information is output to COM2 by the kernel's built-in debugger: the following information is output to COM2 by the kernel's built-in debugger:
@ -94,10 +95,6 @@ After typing "g" into the kernel debugger, the on-screen boot message is display
Under PCjs, the kernel crashes shortly thereafter. This issue is still under investigation. Under PCjs, the kernel crashes shortly thereafter. This issue is still under investigation.
A directory listing of this disk is provided [below](#directory-of-os2-football-boot-disk-v76817).
{% include machine.html id="deskpro386" %}
### Directory of OS/2 FOOTBALL Boot Disk (v7.68.17) ### Directory of OS/2 FOOTBALL Boot Disk (v7.68.17)
Volume in drive A has no label Volume in drive A has no label

9
disks/pc/os2/misc/football/87357/README.md
View file

@ -15,7 +15,8 @@ machines:
OS/2 FOOTBALL Boot Disk (v4.41.00) OS/2 FOOTBALL Boot Disk (v4.41.00)
--- ---
This disk contains an updated version of the [OS/2 FOOTBALL Boot Disk (v7.68.17)](/disks/pc/os2/misc/football/87058/). This disk contains an updated version of [OS/2 FOOTBALL Boot Disk (v7.68.17)](/disks/pc/os2/misc/football/87058/).
The binaries were built in December 1987, using the final OS/2 1.0 sources merged with assorted FOOTBALL changes.
It crashes on an 80286, jumping to invalid code immediately after performing a processor check. On an 80386, It crashes on an 80286, jumping to invalid code immediately after performing a processor check. On an 80386,
the following boot message is displayed on-screen: the following boot message is displayed on-screen:
@ -27,9 +28,9 @@ the following boot message is displayed on-screen:
Internal revision 4.41.00, 12/02/87 Internal revision 4.41.00, 12/02/87
The numbering of revisions must have been, um, revised, because despite the lower revision (4.41.00 vs. 7.68.17), The numbering of revisions must have been, um, revised, because despite the lower revision (4.41.00 vs. 7.68.17),
it *is* newer than the 7.68.17 prototype. This is confirmed by the build date (12/02/87), the file dates (12-23-87) it *is* newer than the 7.68.17 prototype. This is confirmed by the boot message (12/02/87), the file dates (12-23-87)
and the higher version number. Version 1.30 was probably anticipated to be the first 80386 release, an honor and the higher version number (1.3). Version 1.3 was expected to be the first 80386 release, but that honor ultimately
that ultimately went to version 2.00. went to version 2.0.
A directory listing of this disk is provided [below](#directory-of-os2-football-boot-disk-v44100). A directory listing of this disk is provided [below](#directory-of-os2-football-boot-disk-v44100).

10
modules/markout/lib/markout.js
View file

@ -273,13 +273,16 @@ MarkOut.prototype.getMachines = function()
* the result. Furthermore, if the generated ID is not unique (among the set of ALL generated IDs), * the result. Furthermore, if the generated ID is not unique (among the set of ALL generated IDs),
* then no ID is produced. * then no ID is produced.
* *
* UPDATE: Revised the algorithm to be more Jekyll-like (ie, REMOVING anything not a letter or digit or
* space, then removing any leading or trailing spaces, and then replacing any remaining spaces with a hyphen).
*
* @this {MarkOut} * @this {MarkOut}
* @param {string} sText * @param {string} sText
* @returns {string|null} converts the given text to a unique ID (or null if resulting ID was not unique) * @returns {string|null} converts the given text to a unique ID (or null if resulting ID was not unique)
*/ */
MarkOut.prototype.generateID = function(sText) MarkOut.prototype.generateID = function(sText)
{ {
var sID = sText.replace(/[^A-Z0-9]+/gi, '-').replace(/^-+|-+$/g, "").toLowerCase(); var sID = sText.replace(/[^A-Z0-9 ]+/gi, '').replace(/^ +| +$/g, '').replace(/ +/g, '-').toLowerCase();
if (this.aIDs.indexOf(sID) < 0) { if (this.aIDs.indexOf(sID) < 0) {
this.aIDs.push(sID); this.aIDs.push(sID);
return sID; return sID;
@ -850,7 +853,10 @@ MarkOut.prototype.convertMDLinks = function(sBlock)
} }
} }
sURL = sURL.replace(/\*/g, pkg.version); sURL = sURL.replace(/\*/g, pkg.version);
if (sURL.charAt(0) == '#') { /*
* My own goofy way of defining a named anchor (by using an exclamation point) in Markdown....
*/
if (sURL.charAt(0) == '!') {
sTag = "span"; // using <a> to name an anchor is deprecated sTag = "span"; // using <a> to name an anchor is deprecated
sType = "id"; // using the "name" attribute is deprecated as well sType = "id"; // using the "name" attribute is deprecated as well
sURL = sURL.substr(1); sURL = sURL.substr(1);

14
notes.md
View file

@ -200,6 +200,20 @@ to:
Jekyll "Cheat Sheet" Jekyll "Cheat Sheet"
=== ===
Installing Jekyll
---
sudo gem install bundler
(create Gemfile:
source 'https://rubygems.org'
gem 'github-pages'
)
bundle install
jekyll serve (or: bundle exec jekyll serve)
Embedding Screenshots
---
I created screenshot.html in the **_includes** folder, so that I could do this: I created screenshot.html in the **_includes** folder, so that I could do this:
{% include screenshot.html src="/devices/pc/machine/5150/cga/64kb/donkey/thumbnail.jpg" width="200" height="100" link="/devices/pc/machine/5150/cga/64kb/donkey/" title="IBM PC running DONKEY.BAS" %} {% include screenshot.html src="/devices/pc/machine/5150/cga/64kb/donkey/thumbnail.jpg" width="200" height="100" link="/devices/pc/machine/5150/cga/64kb/donkey/" title="IBM PC running DONKEY.BAS" %}