From ae6dc489aa8ffa09dbbb6737c5d34d94dbd3b0c9 Mon Sep 17 00:00:00 2001
From: Lars Brinkhoff <lars@nocrew.org>
Date: Sun, 27 Jun 2021 16:21:15 +0200
Subject: [PATCH] Refactor MARK scripting.

---
 build/ka10/include.tcl | 45 +++++++++++++-----------------------------
 build/kl10/include.tcl | 36 ++++++++++++---------------------
 build/ks10/include.tcl | 12 +++++++----
 3 files changed, 35 insertions(+), 58 deletions(-)

diff --git a/build/ka10/include.tcl b/build/ka10/include.tcl
index 41124137..d7787577 100644
--- a/build/ka10/include.tcl
+++ b/build/ka10/include.tcl
@@ -11,38 +11,21 @@ proc start_dskdmp_its {} {
     patch_its_and_go
 }
 
+proc mark_pack {unit pack id} {
+    respond "\n" "mark\033g"
+    respond "UNIT #" "$unit"
+    respond "#$unit?" "y"
+    respond "NO =" "$pack\r"
+    expect -timeout 300 "VERIFICATION"
+    respond "ALLOC =" "3000\r"
+    respond "PACK ID =" "$id\r"
+}
+
 proc mark_packs {} {
-    respond "\n" "mark\033g"
-    respond "UNIT #" "0"
-    respond "#0?" "y"
-    respond "NO =" "2\r"
-    expect -timeout 300 "VERIFICATION"
-    respond "ALLOC =" "3000\r"
-    respond "PACK ID =" "2\r"
-
-    respond "\n" "mark\033g"
-    respond "UNIT #" "1"
-    respond "#1?" "y"
-    respond "NO =" "3\r"
-    expect -timeout 300 "VERIFICATION"
-    respond "ALLOC =" "3000\r"
-    respond "PACK ID =" "3\r"
-
-    respond "\n" "mark\033g"
-    respond "UNIT #" "2"
-    respond "#2?" "y"
-    respond "NO =" "0\r"
-    expect -timeout 300 "VERIFICATION"
-    respond "ALLOC =" "3000\r"
-    respond "PACK ID =" "0\r"
-
-    respond "DDT" "mark\033g"
-    respond "UNIT #" "3"
-    respond "#3?" "y"
-    respond "NO =" "1\r"
-    expect -timeout 300 "VERIFICATION"
-    respond "ALLOC =" "3000\r"
-    respond "PACK ID =" "1\r"
+    mark_pack "0" "2" "2"
+    mark_pack "1" "3" "3"
+    mark_pack "2" "0" "0"
+    mark_pack "3" "1" "1"
 }
 
 proc prepare_frontend {} {
diff --git a/build/kl10/include.tcl b/build/kl10/include.tcl
index f5ae176d..3ebf37c4 100644
--- a/build/kl10/include.tcl
+++ b/build/kl10/include.tcl
@@ -20,30 +20,20 @@ proc start_dskdmp_its {} {
     patch_its_and_go
 }
 
+proc mark_pack {unit pack id} {
+    respond "\n" "mark\033g"
+    respond "UNIT #" "$unit"
+    respond "#$unit?" "y"
+    respond "NO =" "$pack\r"
+    expect -timeout 300 "VERIFICATION BEGINS"
+    respond "ALLOC =" "3000\r"
+    respond "PACK ID =" "$id\r"
+}
+
 proc mark_packs {} {
-    respond "\n" "mark\033g"
-    respond "UNIT #" "0"
-    respond "#0?" "y"
-    respond "NO =" "0\r"
-    expect -timeout 300 "VERIFICATION BEGINS"
-    respond "ALLOC =" "3000\r"
-    respond "PACK ID =" "0\r"
-
-    respond "\n" "mark\033g"
-    respond "UNIT #" "1"
-    respond "#1?" "y"
-    respond "NO =" "1\r"
-    expect -timeout 300 "VERIFICATION BEGINS"
-    respond "ALLOC =" "3000\r"
-    respond "PACK ID =" "1\r"
-
-    respond "\n" "mark\033g"
-    respond "UNIT #" "2"
-    respond "#2?" "y"
-    respond "NO =" "2\r"
-    expect -timeout 300 "VERIFICATION BEGINS"
-    respond "ALLOC =" "3000\r"
-    respond "PACK ID =" "2\r"
+    mark_pack "0" "0" "0"
+    mark_pack "1" "1" "1"
+    mark_pack "2" "2" "2"
 }
 
 proc prepare_frontend {} {
diff --git a/build/ks10/include.tcl b/build/ks10/include.tcl
index 4819d77c..8b9f0a18 100644
--- a/build/ks10/include.tcl
+++ b/build/ks10/include.tcl
@@ -17,14 +17,18 @@ proc start_dskdmp_its {} {
     patch_its_and_go
 }
 
-proc mark_packs {} {
+proc mark_pack {unit pack id} {
     respond "\n" "mark\033g"
-    respond "Format pack on unit #" "0"
+    respond "Format pack on unit #" "$unit"
     respond "Are you sure you want to format pack on drive" "y"
-    respond "Pack no ?" "0\r"
+    respond "Pack no ?" "$pack\r"
     respond "Verify pack?" "n"
     respond "Alloc?" "3000\r"
-    respond "ID?" "foobar\r"
+    respond "ID?" "$id\r"
+}
+
+proc mark_packs {} {
+    mark_pack "0" "0" "foobar"
 }
 
 proc prepare_frontend {} {