From 2fa044eac36261c42c1780c7654cb9193328d0d4 Mon Sep 17 00:00:00 2001
From: Lars Brinkhoff <lars@nocrew.org>
Date: Fri, 1 May 2026 07:10:40 +0200
Subject: [PATCH] Update to new PDP-6 emulator.

---
 .gitmodules          |  6 +++---
 Makefile             |  9 ++++++---
 build/pdp10-ka/start | 13 +++++++++++++
 tools/blincolnlights |  1 +
 tools/pdp6           |  1 -
 5 files changed, 23 insertions(+), 7 deletions(-)
 create mode 160000 tools/blincolnlights
 delete mode 160000 tools/pdp6

diff --git a/.gitmodules b/.gitmodules
index f1485df6..753249bf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,9 +25,6 @@
 [submodule "tools/tv11"]
 	path = tools/tv11
 	url = https://github.com/aap/pdp11
-[submodule "tools/pdp6"]
-	path = tools/pdp6
-	url = https://github.com/aap/pdp6
 [submodule "tools/vt05"]
 	path = tools/vt05
 	url = https://github.com/aap/vt05
@@ -49,3 +46,6 @@
 [submodule "tools/ncp"]
 	path = tools/ncp
 	url = https://github.com/larsbrinkhoff/linux-ncp
+[submodule "tools/blincolnlights"]
+	path = tools/blincolnlights
+	url = https://github.com/aap/blincolnlights
diff --git a/Makefile b/Makefile
index ac99f395..e4f94e2b 100644
--- a/Makefile
+++ b/Makefile
@@ -81,7 +81,7 @@ BINIGNORE=-e '^(ka10|kl10|ks10|minsys)$$'
 SRCIGNORE=-e '^(system|midas)$$'
 
 SUBMODULES = dasm itstar klh10 mldev simh sims supdup cbridge \
-	tapeutils tv11 pdp6 vt05 tek4010 chaosnet-tools ncp
+	tapeutils tv11 blincolnlights vt05 tek4010 chaosnet-tools ncp
 
 # These files are used to create bootable tape images.
 RAM = bin/ks10/boot/ram.262
@@ -100,7 +100,7 @@ MAGFRM=tools/dasm/magfrm
 GT40=tools/simh/BIN/pdp11 $(OUT)/bootvt.img
 TV11=tools/tv11/tv11
 XGP11=tools/tv11/xgp11
-PDP6=tools/pdp6/emu/pdp6
+PDP6=tools/blincolnlights/pdp6/pdp6
 KLFEDR=tools/dasm/klfedr
 DATAPOINT=tools/vt05/dp3300
 VT52=tools/vt05/vt52
@@ -429,7 +429,10 @@ $(XGP11):
 	$(MAKE) -C tools/tv11 xgp11 CFLAGS=-O3
 
 $(PDP6):
-	$(MAKE) -C tools/pdp6/emu
+	$(MAKE) -C tools/blincolnlights/pdp6
+	$(MAKE) -C tools/blincolnlights/vpanel_pdp6
+	$(MAKE) -C tools/blincolnlights/pdp_periph
+	$(MAKE) -C tools/blincolnlights/netmem_cache
 
 $(DATAPOINT):
 	$(MAKE) -C tools/vt05 dp3300
diff --git a/build/pdp10-ka/start b/build/pdp10-ka/start
index f4ac0351..2c4ab4d5 100755
--- a/build/pdp10-ka/start
+++ b/build/pdp10-ka/start
@@ -103,6 +103,18 @@ arpanet() {
     started "Local NCP daemon" "$!"
 }
 
+pdp6() {
+    DIR=$PWD
+    (sleep 3; cd tools/blincolnlights/vpanel_pdp6; exec ./panel_pdp6) &
+    started "PDP-6 panel" "$!"
+    (sleep 5; cd tools/blincolnlights/netmem_cache; exec ./netmem_cache > $DIR/netmem.log) &
+    started "PDP-6 shared memory cache" "$!"
+    (sleep 7; cd tools/blincolnlights/pdp6; exec ./pdp6 > $DIR/pdp6.log 2>&1) &
+    started "PDP-6" "$!"
+    (sleep 9; cd tools/blincolnlights/pdp_periph; exec ./pdp_periph > $DIR/periph.log) &
+    started "PDP-6 peripherals" "$!"
+}
+
 help() {
     cat <<EOF
 This start script takes several command line arguments:
@@ -121,6 +133,7 @@ tek - Start a Tektronix 4010 emulator.
 cscope - Enable the color scope.
 chaosnet - Start a local Chaosnet.
 arpanet - Start ARPANET.
+pdp6 - Start PDP-6.
 
 EOF
 
diff --git a/tools/blincolnlights b/tools/blincolnlights
new file mode 160000
index 00000000..660f3780
--- /dev/null
+++ b/tools/blincolnlights
@@ -0,0 +1 @@
+Subproject commit 660f37803bd3c7ff8c3e24154c7d9cc7f29c2d34
diff --git a/tools/pdp6 b/tools/pdp6
deleted file mode 160000
index 5f4d5112..00000000
--- a/tools/pdp6
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5f4d51126eda9b87158d4d6b861aeeef58e473ab