Merge branch 'master' into gh-pages

# Conflicts:
#	apps/pdp11/tapes/README.md
#	devices/pdp11/pc11/README.md
This commit is contained in:
Jeff Parsons 2016-10-22 10:35:02 -07:00 committed by Jeff Parsons
commit aaa5753c61
4 changed files with 7 additions and 8 deletions

View file

@ -12,8 +12,8 @@ We have archived the following DEC PDP-11 Tapes:
- [Absolute Loader](absloader/)
- [BASIC (Single User)](basic/)
along with a copy of the [DEC PDP-11 Bootstrap Loader](bootstrap/), which is required if you actually want to
load any of the above tapes into memory using the [PC11 High-Speed Paper Tape Reader/Punch](/devices/pdp11/pc11/).
along with a copy of the [DEC PDP-11 Bootstrap Loader](/apps/pdp11/boot/bootstrap/), which is required if you actually want
to load any of the above tapes into memory using the [PC11 High-Speed Paper Tape Reader/Punch](/devices/pdp11/pc11/).
To make it easy for PDPjs machines to load these tapes, we created the following High-Speed
Paper Tape Reader (PC11) configurations:

View file

@ -8,9 +8,8 @@ DEC PDP-11 Absolute Loader
--------------------------
The Absolute Loader is a special tape image that must be loaded in order to load *other* tapes
which use the Absolute Loader format.
To see the Absolute Loader in action, start with the [Bootstrap Loader Demo](/devices/pdp11/machine/1120/bootstrap/debugger/).
which use the Absolute Loader format. To see the Absolute Loader in action, start with the
[Bootstrap Loader Demo](/devices/pdp11/machine/1120/bootstrap/debugger/).
PCjs has archived the following DEC resources:

View file

@ -16,7 +16,7 @@ This machine pre-loads the **[Bootstrap Loader](/apps/pdp11/boot/bootstrap/)** c
and then pre-attaches the **[Absolute Loader](/apps/pdp11/tapes/absloader/)** tape image to the PC11 Paper Tape Reader:
<device id="pc11" type="pc11" baudReceive="9600" autoMount='{path:"/apps/pdp11/tapes/DEC-11-L2PC-PO.json"}' ...>...</device>
<device id="pc11" type="pc11" baudReceive="9600" autoMount='{path:"/apps/pdp11/tapes/absloader/DEC-11-L2PC-PO.json"}' ...>...</device>
Click "Run" to load the **[Absolute Loader](/apps/pdp11/tapes/absloader/)**.
When the **[Bootstrap Loader](/apps/pdp11/boot/bootstrap/)** is finished, it will HALT,

View file

@ -11,13 +11,13 @@ PDPjs implements the PC11 component in [pc11.js](/modules/pdp11/lib/pc11.js).
A selection of [Paper Tape Images](/apps/pdp11/tapes/) have been archived for use by PDPjs machines:
- [Bootstrap Loader Demo](/devices/pdp11/machine/1120/bootstrap/) (with [Debugger](/devices/pdp11/machine/1120/bootstrap/debugger/))
- [Bootstrap Loader Demo](/devices/pdp11/machine/1120/bootstrap/)
- [PDP-11/20 BASIC Demo](/devices/pdp11/machine/1120/basic/) (with [Debugger](/devices/pdp11/machine/1120/basic/debugger/))
The tape images are typically listed in a common configuration file that all machines can use, such as [demo.xml](demo.xml):
<?xml version="1.0" encoding="UTF-8"?>
<device id="pc11" type="pc11" baudReceive="9600" autoMount='{path:"/apps/pdp11/tapes/DEC-11-L2PC-PO.json"}' pos="left" width="35%" padLeft="8px" padBottom="8px">
<device id="pc11" type="pc11" baudReceive="9600" autoMount='{path:"/apps/pdp11/tapes/absloader/DEC-11-L2PC-PO.json"}' pos="left" width="35%" padLeft="8px" padBottom="8px">
<name>Paper Tape Controls</name>
<control type="container">
<control type="list" binding="listTapes">