From 342746f2bc75482f5090a79e38ab95f67e919eea Mon Sep 17 00:00:00 2001
From: Jeff Parsons <jeff@pcjs.org>
Date: Fri, 14 Oct 2016 11:06:33 -0700
Subject: [PATCH] Added a PDP-11 "server array" test page

---
 devices/pdp11/machine/1170/README.md       |  1 +
 devices/pdp11/machine/1170/array/README.md | 30 ++++++++++++++++++++++
 devices/pdp11/panel/1170/debugger/leds.xml |  6 ++---
 devices/pdp11/panel/1170/debugger/test.xml |  6 ++---
 devices/pdp11/panel/1170/leds.xml          |  6 ++---
 devices/pdp11/panel/1170/test.xml          |  6 ++---
 modules/pdp11/lib/serialport.js            |  4 +--
 7 files changed, 45 insertions(+), 14 deletions(-)
 create mode 100644 devices/pdp11/machine/1170/array/README.md

diff --git a/devices/pdp11/machine/1170/README.md b/devices/pdp11/machine/1170/README.md
index a76320cc6..655c60458 100644
--- a/devices/pdp11/machine/1170/README.md
+++ b/devices/pdp11/machine/1170/README.md
@@ -11,4 +11,5 @@ PCjs is adding support the following PDP-11/70 configurations:
 
 * [PDP-11/70 Test Machine](/devices/pdp11/machine/1170/test/) ([Debugger](/devices/pdp11/machine/1170/test/debugger/))
 * [PDP-11/70 with Front Panel](/devices/pdp11/machine/1170/panel) ([Debugger](/devices/pdp11/machine/1170/panel/debugger/))
+* [PDP-11/70 "Server Array"](/devices/pdp11/machine/1170/array/)
 * [PDP-11/70 with VT100 Terminal](/devices/pdp11/machine/1170/vt100/) ([Debugger](/devices/pdp11/machine/1170/vt100/debugger/))
diff --git a/devices/pdp11/machine/1170/array/README.md b/devices/pdp11/machine/1170/array/README.md
new file mode 100644
index 000000000..690eb2e67
--- /dev/null
+++ b/devices/pdp11/machine/1170/array/README.md
@@ -0,0 +1,30 @@
+---
+layout: page
+title: PDP-11/70 "Server Array"
+permalink: /devices/pdp11/machine/1170/array/
+machines:
+  - type: pdp11
+    id: test1170a
+    autoStart: true
+    config: /devices/pdp11/machine/1170/panel/machine.xml
+  - type: pdp11
+    id: test1170b
+    autoStart: true
+    config: /devices/pdp11/machine/1170/panel/machine.xml
+  - type: pdp11
+    id: test1170c
+    autoStart: true
+    config: /devices/pdp11/machine/1170/panel/machine.xml
+  - type: pdp11
+    id: test1170d
+    autoStart: true
+    config: /devices/pdp11/machine/1170/panel/machine.xml
+---
+
+{% include machine.html id="test1170a" %}
+
+{% include machine.html id="test1170b" %}
+
+{% include machine.html id="test1170c" %}
+
+{% include machine.html id="test1170d" %}
diff --git a/devices/pdp11/panel/1170/debugger/leds.xml b/devices/pdp11/panel/1170/debugger/leds.xml
index ba5f57598..ca8da4248 100644
--- a/devices/pdp11/panel/1170/debugger/leds.xml
+++ b/devices/pdp11/panel/1170/debugger/leds.xml
@@ -85,8 +85,8 @@
 			<control type="container" class="pcjs-ledpad" width="33%" pos="right"><control type="rled" binding="D15" width="100%" container="center"/></control>
 		</control>
 	</control>
-	<control type="container" class="pcjs-textarea" width="60%" padtop="8px" padbottom="8px" padright="8px">
-		<control type="textarea" binding="print" width="100%" height="252px" pos="relative" style="resize:vertical;"/>
+	<control type="container" class="pcjs-textarea" width="60%" padtop="8px" padbottom="8px">
+		<control type="textarea" binding="print" width="100%" height="252px" padright="8px" pos="relative" style="resize:vertical;"/>
 		<control type="container" width="100%">
 			<control type="text" binding="debugInput" width="auto"/>
 			<control type="button" binding="debugEnter">Enter</control>
@@ -110,7 +110,7 @@
 			<control type="flag" label="C" binding="CF" width="8px" padright="4px" padbottom="8px">0</control>
 		</control>
 	</control>
-	<control type="container" padbottom="8px" padleft="8px">
+	<control type="container" padtop="8px" padbottom="8px">
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="step">Step</control>
 		<control type="button" binding="reset">Reset</control>
diff --git a/devices/pdp11/panel/1170/debugger/test.xml b/devices/pdp11/panel/1170/debugger/test.xml
index 5fda5d305..93b469513 100644
--- a/devices/pdp11/panel/1170/debugger/test.xml
+++ b/devices/pdp11/panel/1170/debugger/test.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <panel id="panel" width="100%" padding="8px">
 	<name>Control Panel</name>
-	<control type="container" class="pcjs-textarea" width="60%" padbottom="8px" padright="8px">
-		<control type="textarea" binding="print" width="100%" height="252px" pos="relative" style="resize:vertical;"/>
+	<control type="container" class="pcjs-textarea" width="60%" padbottom="8px">
+		<control type="textarea" binding="print" width="100%" height="252px" padright="8px" pos="relative" style="resize:vertical;"/>
 		<control type="container" width="100%">
 			<control type="text" binding="debugInput" width="auto"/>
 			<control type="button" binding="debugEnter">Enter</control>
@@ -26,7 +26,7 @@
 			<control type="flag" label="C" binding="CF" width="8px" padright="4px" padbottom="8px">0</control>
 		</control>
 	</control>
-	<control type="container" padbottom="8px" padleft="8px">
+	<control type="container" padbottom="8px">
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="step">Step</control>
 		<control type="button" binding="reset">Reset</control>
diff --git a/devices/pdp11/panel/1170/leds.xml b/devices/pdp11/panel/1170/leds.xml
index e205bb4ef..1b1fd7b63 100644
--- a/devices/pdp11/panel/1170/leds.xml
+++ b/devices/pdp11/panel/1170/leds.xml
@@ -85,10 +85,10 @@
 			<control type="container" class="pcjs-ledpad" width="33%" pos="right"><control type="rled" binding="D15" width="100%" container="center"/></control>
 		</control>
 	</control>
-	<control type="container" class="pcjs-textarea" width="60%" padtop="8px" padbottom="8px" padright="8px">
-		<control type="textarea" binding="print" width="100%" height="252px" pos="relative" style="resize:vertical;"/>
+	<control type="container" class="pcjs-textarea" width="60%" padtop="8px" padbottom="8px">
+		<control type="textarea" binding="print" width="100%" height="252px" padright="8px" pos="relative" style="resize:vertical;"/>
 	</control>
-	<control type="container" padbottom="8px" padleft="8px">
+	<control type="container" padtop="8px" padbottom="8px">
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
 		<control type="button" binding="setSpeed">Fast</control>
diff --git a/devices/pdp11/panel/1170/test.xml b/devices/pdp11/panel/1170/test.xml
index 5960af701..66aa2fc31 100644
--- a/devices/pdp11/panel/1170/test.xml
+++ b/devices/pdp11/panel/1170/test.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <panel id="panel" width="100%" padding="8px">
 	<name>Control Panel</name>
-	<control type="container" class="pcjs-textarea" width="60%" padbottom="8px" padright="8px">
-		<control type="textarea" binding="print" width="100%" height="252px" pos="relative" style="resize:vertical;"/>
+	<control type="container" class="pcjs-textarea" width="60%" padbottom="8px">
+		<control type="textarea" binding="print" width="100%" height="252px" padright="8px" pos="relative" style="resize:vertical;"/>
 	</control>
-	<control type="container" padbottom="8px" padleft="8px">
+	<control type="container" padbottom="8px">
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
 		<control type="button" binding="setSpeed">Fast</control>
diff --git a/modules/pdp11/lib/serialport.js b/modules/pdp11/lib/serialport.js
index d4f602795..d92c7e882 100644
--- a/modules/pdp11/lib/serialport.js
+++ b/modules/pdp11/lib/serialport.js
@@ -262,7 +262,7 @@ SerialPortPDP11.prototype.initBus = function(cmp, bus, cpu, dbg)
 
     this.triggerReceiveInterrupt = this.cpu.addTrigger(PDP11.DL11.RVEC, PDP11.DL11.PRI);
 
-    this.timerReceiveInterrupt = this.cpu.addTimer(function() {
+    this.timerReceiveInterrupt = this.cpu.addTimer(function readyReceiver() {
         if (!(serial.rcsr & PDP11.DL11.RCSR.RD)) {
             if (serial.abReceive.length) {
                 serial.rbuf = serial.abReceive.shift();
@@ -276,7 +276,7 @@ SerialPortPDP11.prototype.initBus = function(cmp, bus, cpu, dbg)
 
     this.triggerTransmitInterrupt = this.cpu.addTrigger(PDP11.DL11.XVEC, PDP11.DL11.PRI);
 
-    this.timerTransmitInterrupt = this.cpu.addTimer(function readyransmitter() {
+    this.timerTransmitInterrupt = this.cpu.addTimer(function readyTransmitter() {
         serial.xcsr |= PDP11.DL11.XCSR.READY;
         if (serial.xcsr & PDP11.DL11.XCSR.TIE) {
             serial.cpu.setTrigger(serial.triggerTransmitInterrupt);