diff --git a/.gitmodules b/.gitmodules index d6c82002c..f1485df68 100644 --- a/.gitmodules +++ b/.gitmodules @@ -46,3 +46,6 @@ [submodule "tools/chaosnet-tools"] path = tools/chaosnet-tools url = https://github.com/Chaosnet/chaosnet-tools +[submodule "tools/ncp"] + path = tools/ncp + url = https://github.com/larsbrinkhoff/linux-ncp diff --git a/Makefile b/Makefile index f867650ec..344865d77 100644 --- a/Makefile +++ b/Makefile @@ -80,7 +80,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 + tapeutils tv11 pdp6 vt05 tek4010 chaosnet-tools ncp # These files are used to create bootable tape images. RAM = bin/ks10/boot/ram.262 @@ -106,6 +106,7 @@ VT52=tools/vt05/vt52 TEK=tools/tek4010/tek4010 SIMH_IMLAC=tools/simh/BIN/imlac $(OUT)/ssv22.iml IMP=tools/simh/BIN/h316 +NCPD=tools/ncp/src/ncpd H3TEXT=$(shell cd build; ls h3text.*) NAMES=$(shell cd build; ls names.*) @@ -157,7 +158,7 @@ out/pdp10-ka/stamp/its: $(OUT)/rp03.2 $(OUT)/rp03.3 $(MKDIR) $(OUT)/stamp $(TOUCH) $@ -out/pdp10-ka/stamp/emulators: $(GT40) $(TV11) $(XGP11) $(PDP6) $(DATAPOINT) $(VT52) $(TEK) $(SIMH_IMLAC) $(IMP) +out/pdp10-ka/stamp/emulators: $(GT40) $(TV11) $(XGP11) $(PDP6) $(DATAPOINT) $(VT52) $(TEK) $(SIMH_IMLAC) $(IMP) $(NCPD) $(MKDIR) $(OUT)/stamp $(TOUCH) $@ @@ -165,7 +166,7 @@ out/pdp10-kl/stamp/its: $(OUT)/rp04.1 $(MKDIR) $(OUT)/stamp $(TOUCH) $@ -out/pdp10-kl/stamp/emulators: $(VT52) $(TEK) $(IMP) +out/pdp10-kl/stamp/emulators: $(VT52) $(TEK) $(IMP) $(NCPD) $(MKDIR) $(OUT)/stamp $(TOUCH) $@ @@ -444,6 +445,10 @@ $(TEK): tek-hack $(IMP): $(MAKE) -C tools/simh h316 +$(NCPD): + $(MAKE) -C tools/ncp/src + $(MAKE) -C tools/ncp/apps + tools/supdup/supdup: $(MAKE) -C tools/supdup diff --git a/build/arpanet/imp62.simh b/build/arpanet/imp62.simh index 16b0cd452..671d80719 100644 --- a/build/arpanet/imp62.simh +++ b/build/arpanet/imp62.simh @@ -9,6 +9,7 @@ set hi1 enabled set hi2 enabled attach -u mi1 4421::4431 +attach -u hi1 33003:localhost:33004 attach -u hi2 33001:localhost:33002 set hi2 convert diff --git a/build/pdp10-ka/start b/build/pdp10-ka/start index cc3e93392..f4ac0351c 100755 --- a/build/pdp10-ka/start +++ b/build/pdp10-ka/start @@ -96,6 +96,11 @@ arpanet() { (sleep 2; cd build/arpanet; ../../tools/simh/BIN/h316 imp62.simh >imp62.log 2>&1) & started "Arpanet IMP" "$!" + + export NCP="$PWD/ncp076" + rm -f "$NCP" + (sleep 5; ./tools/ncp/src/ncpd localhost 33003 33004 2>ncp076.log) & + started "Local NCP daemon" "$!" } help() { diff --git a/build/pdp10-kl/start b/build/pdp10-kl/start index 37a3a8ff1..c6b95c2d6 100755 --- a/build/pdp10-kl/start +++ b/build/pdp10-kl/start @@ -49,6 +49,11 @@ arpanet() { (sleep 2; cd build/arpanet; ../../tools/simh/BIN/h316 imp62.simh >imp62.log 2>&1) & started "Arpanet IMP" "$!" + + export NCP="$PWD/ncp076" + rm -f "$NCP" + (sleep 5; ../linux-ncp/src/ncpd localhost 33003 33004 2>ncp076.log) & + started "Local NCP daemon" "$!" } help() { diff --git a/tools/ncp b/tools/ncp new file mode 160000 index 000000000..6b31aa221 --- /dev/null +++ b/tools/ncp @@ -0,0 +1 @@ +Subproject commit 6b31aa22185e1e461e87b5f2f22d475598bb4b31