From 46a55324044e42b2d7d632aaafbb201e24dcd139 Mon Sep 17 00:00:00 2001
From: Richard Cornwell <rich@sky-visions.com>
Date: Tue, 21 Jun 2022 09:50:05 -0400
Subject: [PATCH] KA10: Added default disable for devices that could be on
 KL10.

---
 PDP10/kx10_cp.c | 10 +++++++++-
 PDP10/kx10_cr.c | 10 +++++++++-
 PDP10/kx10_dc.c | 10 +++++++++-
 PDP10/kx10_lp.c | 14 +++++++++++---
 PDP10/kx10_pt.c | 16 ++++++++++++----
 5 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/PDP10/kx10_cp.c b/PDP10/kx10_cp.c
index 86c95e74..34e9014c 100644
--- a/PDP10/kx10_cp.c
+++ b/PDP10/kx10_cp.c
@@ -38,6 +38,14 @@
 
 #define CP_DEVNUM        0110
 
+#if KL
+#define CP_DIS DEV_DIS
+#endif
+
+#ifndef CP_DIS
+#define CP_DIS  0
+#endif
+
 
 /* std devices. data structures
 
@@ -115,7 +123,7 @@ DEVICE              cp_dev = {
     "CP", &cp_unit, cp_reg, cp_mod,
     NUM_DEVS_CP, 8, 15, 1, 8, 8,
     NULL, NULL, NULL, NULL, &cp_attach, &cp_detach,
-    &cp_dib, DEV_DISABLE | DEV_DEBUG | DEV_CARD, 0, crd_debug,
+    &cp_dib, DEV_DISABLE | DEV_DEBUG | DEV_CARD | CP_DIS, 0, crd_debug,
     NULL, NULL, &cp_help, NULL, NULL, &cp_description
 };
 
diff --git a/PDP10/kx10_cr.c b/PDP10/kx10_cr.c
index a9c2fd39..8bf5c306 100644
--- a/PDP10/kx10_cr.c
+++ b/PDP10/kx10_cr.c
@@ -38,6 +38,14 @@
 
 #define CR_DEVNUM        0150
 
+#if KL
+#define CR_DIS DEV_DIS
+#endif
+
+#ifndef CR_DIS
+#define CR_DIS 0
+#endif
+
 
 /* std devices. data structures
 
@@ -119,7 +127,7 @@ DEVICE              cr_dev = {
     "CR", &cr_unit, cr_reg, cr_mod,
     NUM_DEVS_CR, 8, 15, 1, 8, 8,
     NULL, NULL, NULL, NULL, &cr_attach, &cr_detach,
-    &cr_dib, DEV_DISABLE | DEV_DEBUG | DEV_CARD, 0, crd_debug,
+    &cr_dib, DEV_DISABLE | DEV_DEBUG | DEV_CARD | CR_DIS, 0, crd_debug,
     NULL, NULL, &cr_help, NULL, NULL, &cr_description
 };
 
diff --git a/PDP10/kx10_dc.c b/PDP10/kx10_dc.c
index 8e652455..15124c3d 100644
--- a/PDP10/kx10_dc.c
+++ b/PDP10/kx10_dc.c
@@ -35,6 +35,14 @@
 
 #if (NUM_DEVS_DC > 0)
 
+#if KL
+#define DC_DIS DEV_DIS
+#endif
+
+#ifndef DC_DIS
+#define DC_DIS 0
+#endif
+
 #define DC_DEVNUM 0240
 
 #define DC10_LINES    8
@@ -147,7 +155,7 @@ DEVICE dc_dev = {
     1, 10, 31, 1, 8, 8,
     &tmxr_ex, &tmxr_dep, &dc_reset,
     NULL, &dc_attach, &dc_detach,
-    &dc_dib, DEV_MUX | DEV_DISABLE | DEV_DEBUG, 0, dev_debug,
+    &dc_dib, DEV_MUX | DEV_DISABLE | DEV_DEBUG | DC_DIS, 0, dev_debug,
     NULL, NULL, &dc_help, NULL, NULL, &dc_description
     };
 
diff --git a/PDP10/kx10_lp.c b/PDP10/kx10_lp.c
index 377b1f14..3e44c1ad 100644
--- a/PDP10/kx10_lp.c
+++ b/PDP10/kx10_lp.c
@@ -34,6 +34,14 @@
 
 #if (NUM_DEVS_LP > 0)
 
+#if KL
+#define LP_DIS DEV_DIS
+#endif
+
+#ifndef LP_DIS
+#define LP_DIS 0
+#endif
+
 #define LP_DEVNUM 0124
 #define STATUS   u3
 #define COL      u4
@@ -90,8 +98,8 @@ UNIT lpt_unit = {
     };
 
 REG lpt_reg[] = {
-    { DRDATA (STATUS, lpt_unit.STATUS, 18), PV_LEFT | REG_UNIT },
-    { DRDATA (TIME, lpt_unit.wait, 24), PV_LEFT | REG_UNIT },
+    { URDATA (STATUS, lpt_unit.STATUS, 8, 18, 0, 1, PV_LEFT) },
+    { URDATA (TIME, lpt_unit.wait, 10, 24, 0, 1, PV_LEFT) },
     { BRDATA(BUFF, lpt_buffer, 16, 8, sizeof(lpt_buffer)), REG_HRO},
     { BRDATA(CBUFF, lpt_chbuf, 16, 8, sizeof(lpt_chbuf)), REG_HRO},
     { NULL }
@@ -114,7 +122,7 @@ DEVICE lpt_dev = {
     1, 10, 31, 1, 8, 8,
     NULL, NULL, &lpt_reset,
     NULL, &lpt_attach, &lpt_detach,
-    &lpt_dib, DEV_DISABLE | DEV_DEBUG, 0, dev_debug,
+    &lpt_dib, DEV_DISABLE | DEV_DEBUG | LP_DIS, 0, dev_debug,
     NULL, NULL, &lpt_help, NULL, NULL, &lpt_description
 };
 
diff --git a/PDP10/kx10_pt.c b/PDP10/kx10_pt.c
index 35b7eca8..89ea2a0e 100644
--- a/PDP10/kx10_pt.c
+++ b/PDP10/kx10_pt.c
@@ -32,6 +32,14 @@
 
 #if (NUM_DEVS_PT > 0)
 
+#if KL
+#define PT_DIS  DEV_DIS
+#endif
+
+#ifndef PT_DIS
+#define PT_DIS 0
+#endif
+
 #define PP_DEVNUM 0100
 #define PR_DEVNUM 0104
 #define STATUS   u3
@@ -77,8 +85,8 @@ UNIT ptp_unit = {
     };
 
 REG ptp_reg[] = {
-    { DRDATA (STATUS, ptp_unit.STATUS, 18), PV_LEFT | REG_UNIT},
-    { DRDATA (TIME, ptp_unit.wait, 24), PV_LEFT | REG_UNIT},
+    { URDATA (STATUS, ptp_unit.STATUS, 8, 18, 0, 1, PV_LEFT) },
+    { URDATA (TIME, ptp_unit.wait, 10, 24, 0, 1, PV_LEFT) },
     { NULL }
     };
 
@@ -90,7 +98,7 @@ DEVICE ptp_dev = {
     "PTP", &ptp_unit, ptp_reg, ptp_mod,
     1, 10, 31, 1, 8, 8,
     NULL, NULL, &ptp_reset, NULL, &ptp_attach, &ptp_detach,
-    &ptp_dib, DEV_DISABLE | DEV_DEBUG, 0, dev_debug,
+    &ptp_dib, DEV_DISABLE | DEV_DEBUG | PT_DIS, 0, dev_debug,
     NULL, NULL, &ptp_help, NULL, NULL, &ptp_description
     };
 
@@ -114,7 +122,7 @@ DEVICE ptr_dev = {
     "PTR", &ptr_unit, ptr_reg, ptr_mod,
     1, 10, 31, 1, 8, 8,
     NULL, NULL, &ptr_reset, &ptr_boot, &ptr_attach, &ptr_detach,
-    &ptr_dib, DEV_DISABLE | DEV_DEBUG, 0, dev_debug,
+    &ptr_dib, DEV_DISABLE | DEV_DEBUG | PT_DIS, 0, dev_debug,
     NULL, NULL, &ptr_help, NULL, NULL, &ptr_description
     };