Move machine-specific KA10 configuration to separate directory.

build/build.tcl

@@ -7,10 +7,6 @@ proc log_progress {x} {
 
 log_progress "ENTERING MAIN BUILD SCRIPT"
 
-if [info exists env(MCHN)] {
-    set mchn "$env(MCHN)"
-}
-
 puts ""
 puts "BUILDING $mchn ITS"
 puts ""

build/ka10/include.tcl

@@ -1,5 +1,9 @@
-#Default ITS name for KA10.
-set mchn "KA"
+if [info exists env(MCHN)] {
+    set mchn "$env(MCHN)"
+} else {
+    #Default ITS name for KA10.
+    set mchn "KA"
+}
 
 set cpu "ka10"
 set salv "salv"
@@ -21,7 +25,7 @@ proc mark_pack {unit pack id} {
     respond "PACK ID =" "$id\r"
 }
 
-proc mark_packs {} {
+proc mark_bootstrap_packs {} {
     # Bootstrap ITS uses just packs 2 and 3.
     mark_pack "0" "2" "2"
     mark_pack "1" "3" "3"
@@ -36,6 +40,7 @@ proc frontend_bootstrap {} {
 proc finish_mark {} {
     global emulator_escape
     global build
+    global mchn
     global out
 
     # Here's a dance to get around the fact that the bootstrapping ITS
@@ -55,12 +60,9 @@ proc finish_mark {} {
 
     respond "*" $emulator_escape
     quit_emulator
-    start_salv build/pdp10-ka/init2
+    start_salv build/mchn/$mchn/init
 
-    mark_pack "0" "2" "2"
-    mark_pack "1" "3" "3"
-    mark_pack "2" "0" "0"
-    mark_pack "3" "1" "1"
+    mark_packs
 
     respond "DDT" "tran\033g"
     respond "#" "0"
@@ -97,22 +99,6 @@ proc make_salv {} {
     expect ":KILL"
 }
 
-proc dskdmp_switches {hriflg} {
-    expect "Configuration"
-    respond "?" "ASK\r"
-    respond "HRIFLG=" "$hriflg\r"
-    respond "BOOTSW=" "N\r"
-    respond "R11R6P=" "N\r"
-    respond "R11R7P=" "N\r"
-    respond "RM03P=" "N\r"
-    respond "RM80P=" "N\r"
-    respond "RH10P=" "N\r"
-    respond "DC10P=" "N\r"
-    respond "NUDSL=" "500.\r"
-    respond "KS10P=" "N\r"
-    respond "KL10P=" "N\r"
-}
-
 proc make_dskdmp {} {
     global emulator_escape
     global out
@@ -136,10 +122,6 @@ proc dump_switches {} {
     respond "WHICH MACHINE?" "$mchn\r"
 }
 
-proc peek_switches {} {
-    respond "with ^C" "340P==1\r\003"
-}
-
 proc dump_nits {} {
     global salv
 

build/kl10/include.tcl

@@ -30,7 +30,7 @@ proc mark_pack {unit pack id} {
     respond "PACK ID =" "$id\r"
 }
 
-proc mark_packs {} {
+proc mark_bootstrap_packs {} {
     mark_pack "0" "0" "0"
     mark_pack "1" "1" "1"
     mark_pack "2" "2" "2"

build/ks10/include.tcl

@@ -27,7 +27,7 @@ proc mark_pack {unit pack id} {
     respond "ID?" "$id\r"
 }
 
-proc mark_packs {} {
+proc mark_bootstrap_packs {} {
     mark_pack "0" "0" "foobar"
 }
 

build/mark.tcl

@@ -2,7 +2,7 @@ log_progress "ENTERING BUILD SCRIPT: MARK"
 
 start_salv
 
-mark_packs
+mark_bootstrap_packs
 
 respond "DDT" "tran\033g"
 respond "#" "0"

build/mchn/KA/mchn.tcl

@@ -0,0 +1,26 @@
+proc dskdmp_switches {hriflg} {
+    expect "Configuration"
+    respond "?" "ASK\r"
+    respond "HRIFLG=" "$hriflg\r"
+    respond "BOOTSW=" "N\r"
+    respond "R11R6P=" "N\r"
+    respond "R11R7P=" "N\r"
+    respond "RM03P=" "N\r"
+    respond "RM80P=" "N\r"
+    respond "RH10P=" "N\r"
+    respond "DC10P=" "N\r"
+    respond "NUDSL=" "500.\r"
+    respond "KS10P=" "N\r"
+    respond "KL10P=" "N\r"
+}
+
+proc peek_switches {} {
+    respond "with ^C" "340P==1\r\003"
+}
+
+proc mark_packs {} {
+    mark_pack "0" "2" "2"
+    mark_pack "1" "3" "3"
+    mark_pack "2" "0" "0"
+    mark_pack "3" "1" "1"
+}

build/pdp10-ka/build.tcl

@@ -17,12 +17,14 @@ proc start_salv args {
 }
 
 proc start_dskdmp args {
+    global mchn
+
     quit_emulator
     set ini ""
     if {[llength $args] == 1} {
         set ini [lindex $args 0]
     } {
-        set ini "build/pdp10-ka/boot2"
+        set ini "build/mchn/$mchn/boot"
     }
     set foo "spawn ./tools/sims/BIN/pdp10-ka $ini"
     uplevel #0 $foo
@@ -69,4 +71,5 @@ proc initialize_comsat {} {
 }
 
 source build/ka10/include.tcl
+source build/mchn/$mchn/mchn.tcl
 source build/build.tcl

build/pdp10-ka/init

@@ -15,7 +15,5 @@ at mta0 out/pdp10-ka/magdmp.tap
 at mta5 out/pdp10-ka/ka-minsys.tape
 at dpa0 out/pdp10-ka/rp03.2
 at dpa1 out/pdp10-ka/rp03.3
-at dpa2 out/pdp10-ka/rp03.0
-at dpa3 out/pdp10-ka/rp03.1
 set dpa headers
 b mta0

build/pdp10-ka/start

@@ -96,7 +96,7 @@ EOF
 
 sed -e 's/set dpy enabled/set dpy disabled/' \
     -e 's/set wcnsls enabled joystick cscope/set wcnsls enabled joystick/' \
-    < build/pdp10-ka/run > out/pdp10-ka/run
+    < build/mchn/KA/run > out/pdp10-ka/run
 
 test -f out/pdp10-ka/nohelp || help