From 3af19c73d81e3900c7bdd0109e8f8c56552fc206 Mon Sep 17 00:00:00 2001 From: Lars Brinkhoff Date: Sun, 9 Feb 2025 07:46:43 +0100 Subject: [PATCH] Add :VK where needed, remove where not needed. Replace a few instances of sleep with :VK to get a * prompt. Running :VK after making a link is no longer needed. --- build/basics.tcl | 9 ++------- build/dm.tcl | 5 ----- build/ka10/include.tcl | 3 ++- build/ka10/processor.tcl | 3 --- build/ks10/include.tcl | 1 - build/ks10/processor.tcl | 2 +- build/mark.tcl | 4 ++-- build/misc.tcl | 12 ------------ 8 files changed, 7 insertions(+), 32 deletions(-) diff --git a/build/basics.tcl b/build/basics.tcl index 7fac2ce0..7839cd22 100644 --- a/build/basics.tcl +++ b/build/basics.tcl @@ -4,15 +4,14 @@ patch_its_and_go pdset respond "*" ":login db\r" -sleep 1 +type ":vk\r" # Normally we'd save the old ITS as OITS, but since it was used for # bootstrapping with another configuration, it's no longer any use. -type ":delete .;@ its\r" +respond "*" ":delete .;@ its\r" # The new ITS is now canonical. respond "*" ":rename .;@ nits, .;@ its\r" -sleep 1 respond "*" ":midas sysbin;_syseng;dump\r" dump_switches @@ -117,13 +116,9 @@ expect ":KILL" respond "*" ":midas sysbin;_sysen2;find\r" expect ":KILL" respond "*" ":link sys;ts find,sysbin;find bin\r" -type ":vk\r" respond "*" ":link sys;ts fi,sys;ts find\r" -type ":vk\r" respond "*" ":link sys;ts comb,sys;ts find\r" -type ":vk\r" respond "*" ":link sys2;ts lf,sys;ts find\r" -type ":vk\r" respond "*" ":midas sys;ts dskuse_syseng;dskuse\r" expect ":KILL" diff --git a/build/dm.tcl b/build/dm.tcl index fdef5f90..8c6f3296 100644 --- a/build/dm.tcl +++ b/build/dm.tcl @@ -13,11 +13,9 @@ expect ":KILL" # Gun down dead demons. respond "*" ":link taa; pwfile 999999, sysen1; pwfile >\r" -type ":vk\r" respond "*" ":midas sysbin;_sysen2; gunner\r" expect ":KILL" respond "*" ":link sys; atsign gunner, sysbin; gunner bin\r" -type ":vk\r" # Line printer unspooler demon. respond "*" ":midas sys; atsign unspoo_sysen1; unspoo\r" @@ -41,11 +39,9 @@ expect ":KILL" respond "*" ":midas survey; atsign surgiv_surgiv\r" expect ":KILL" respond "*" ":link sys; atsign surgiv, survey;\r" -type ":vk\r" # Survey sender demon. respond "*" ":link sys; atsign sursnd, survey;\r" -type ":vk\r" # Login program. respond "*" ":midas sysbin;_syseng; booter\r" @@ -72,4 +68,3 @@ respond "*" ":kill\r" respond "*" ":kill\r" mkdir "(init)" respond "*" ":link (init); as hactrn, sys2; ts shell\r" -type ":vk\r" diff --git a/build/ka10/include.tcl b/build/ka10/include.tcl index 0086ca83..a6cd5bae 100644 --- a/build/ka10/include.tcl +++ b/build/ka10/include.tcl @@ -117,7 +117,8 @@ proc make_dskdmp {} { # Paper tape DSKDMP. This is used for booting ITS. respond "*" $emulator_escape punch_tape "$out/dskdmp.rim" - type ":midas ptp:_system;dskdmp\r" + type ":vk\r" + respond "*" ":midas ptp:_system;dskdmp\r" dskdmp_switches "Y" expect ":KILL" } diff --git a/build/ka10/processor.tcl b/build/ka10/processor.tcl index 6787ff82..ea6f8af8 100644 --- a/build/ka10/processor.tcl +++ b/build/ka10/processor.tcl @@ -25,17 +25,14 @@ expect ":KILL" # Name Dragon respond "*" ":link syseng;tvkbd rooms, sysen2;\r" -type ":vk\r" respond "*" ":midas sysbin;_sysen2;namdrg\r" expect ":KILL" respond "*" ":link channa;rakash namdrg, sysbin; namdrg bin\r" -type ":vk\r" # STUFF respond "*" ":midas sys1;ts stuff_sysen2;stuff\r" expect ":KILL" respond "*" ":link channa;rakash tvfix, sys1; ts stuff\r" -type ":vk\r" # IOELEV, PDP-11 doing I/O for the PDP-10 host. # The "AI" IOELEV, also known as CHAOS-11. diff --git a/build/ks10/include.tcl b/build/ks10/include.tcl index de52590f..0377ff2b 100644 --- a/build/ks10/include.tcl +++ b/build/ks10/include.tcl @@ -81,7 +81,6 @@ proc prepare_frontend {} { pdset respond "*" ":login db\r" - sleep 1 type ":vk\r" respond "*" ":midas sysbin;_kshack;ksfedr\r" diff --git a/build/ks10/processor.tcl b/build/ks10/processor.tcl index 07a293e1..fc5337a6 100644 --- a/build/ks10/processor.tcl +++ b/build/ks10/processor.tcl @@ -21,7 +21,7 @@ expect ":KILL" respond "*" ":copy kshack; mcr ram, .; ram ram\r" # Update microcode on frontend filesystem. -type ":ksfedr\r" +respond "*" ":ksfedr\r" respond "!" "write\r" respond "Are you sure" "yes\r" respond "Which file" "ram\r" diff --git a/build/mark.tcl b/build/mark.tcl index b29b1138..0806d8b4 100644 --- a/build/mark.tcl +++ b/build/mark.tcl @@ -15,9 +15,9 @@ start_dskdmp_its pdset respond "*" ":login db\r" -sleep 1 +type ":vk\r" -type $emulator_escape +respond "*" $emulator_escape mount_tape "$out/minsrc.tape" type ":dump\r" diff --git a/build/misc.tcl b/build/misc.tcl index eb39d141..ccd7c080 100644 --- a/build/misc.tcl +++ b/build/misc.tcl @@ -52,12 +52,10 @@ respond "*" ":pdump .teco.; ts 335\r" respond "*" ":kill\r" respond "*" ":link teach;teach emacs,emacs;teach emacs\r" -type ":vk\r" respond "*" "teach\033\023" respond "*" ":emacs\r" expect ":KILL" respond "*" ":link sys2;ts teachemacs,emacs;tstch >\r" -type ":vk\r" # nsalv, timesharing version respond "*" ":midas sys1;ts nsalv_kshack;nsalv\r" @@ -86,19 +84,12 @@ expect ":KILL" respond "*" ":midas sysbin;_sysen3;whoj\r" expect ":KILL" respond "*" ":link sys1;ts talk,sysbin;whoj bin\r" -type ":vk\r" respond "*" ":link sys1;ts who,sysbin;whoj bin\r" -type ":vk\r" respond "*" ":link sys1;ts whoj,sysbin;whoj bin\r" -type ":vk\r" respond "*" ":link sys1;ts whom,sysbin;whoj bin\r" -type ":vk\r" respond "*" ":link sys2;ts users,sysbin;whoj bin\r" -type ":vk\r" respond "*" ":link sys1;ts w,sys1;ts who\r" -type ":vk\r" respond "*" ":link sys2;ts u,sys2;ts users\r" -type ":vk\r" #Inter-Entity Communication respond "*" ":midas sysbin;_sysen2; iec\r" @@ -1240,7 +1231,6 @@ respond "@" "imlac; ssv22 iml_sysbin; ssv22 bin\r" respond "@" "\021" expect ":KILL" respond "*" ":link imlac; .prgm. normal, imlac; ssv22 iml\r" -type ":vk\r" # Assemble SSV4. respond "*" ":midas imlac; ts assv4_assv4\r" @@ -1622,9 +1612,7 @@ expect ":KILL" respond "*" ":midas rug;_loder\r" expect ":KILL" respond "*" ":link sys; ts nloder, rug; loder bin\r" -type ":vk\r" respond "*" ":link sys1; ts mloder, rug; loder bin\r" -type ":vk\r" # SITS. cwd "sits"