From c470d1e5e207521f6e7ad89581aa8a555d7425da Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Wed, 7 Jun 2017 18:56:06 -0700
Subject: [PATCH] SCP: Allow the presence of DEVICE DEBTAB array to imply the
 DEV_DEBUG flag

---
 scp.c         | 6 +++---
 sim_console.c | 4 ++--
 sim_tape.c    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scp.c b/scp.c
index d066c395..f62dcd0f 100644
--- a/scp.c
+++ b/scp.c
@@ -2459,7 +2459,7 @@ if (dptr->flags & DEV_DISABLE) {
     sprintf (buf, "set %s DISABLE", sim_dname (dptr));
     fprintf (st,  "%-30s\tDisables device %s\n", buf, sim_dname (dptr));
     }
-if (dptr->flags & DEV_DEBUG) {
+if ((dptr->flags & DEV_DEBUG) || (dptr->debflags)) {
     fprint_header (st, &found, header);
     sprintf (buf, "set %s DEBUG", sim_dname (dptr));
     fprintf (st,  "%-30s\tEnables debugging for device %s\n", buf, sim_dname (dptr));
@@ -2537,7 +2537,7 @@ if (dptr->modifiers) {
         fprintf (st, "%-30s\t%s\n", buf, mptr->help ? mptr->help : "");
         }
     }
-if (dptr->flags & DEV_DEBUG) {
+if ((dptr->flags & DEV_DEBUG) || (dptr->debflags)) {
     fprint_header (st, &found, header);
     sprintf (buf, "show %s DEBUG", sim_dname (dptr));
     fprintf (st, "%-30s\tDisplays debugging status for device %s\n", buf, sim_dname (dptr));
@@ -4904,7 +4904,7 @@ t_stat show_dev_debug (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, CONST cha
 int32 any = 0;
 DEBTAB *dep;
 
-if (dptr->flags & DEV_DEBUG) {
+if ((dptr->flags & DEV_DEBUG) || (dptr->debflags)) {
     if (dptr->dctrl == 0)
         fputs ("Debugging disabled", st);
     else if (dptr->debflags == NULL)
diff --git a/sim_console.c b/sim_console.c
index e45a463c..3d4eb656 100644
--- a/sim_console.c
+++ b/sim_console.c
@@ -2206,7 +2206,7 @@ if (sim_deb) {
         fprintf (st, "   Debug messages display time of day as seconds.msec%s\n", sim_deb_switches & SWMASK ('R') ? " relative to the start of debugging" : "");
     for (i = 0; (dptr = sim_devices[i]) != NULL; i++) {
         if (!(dptr->flags & DEV_DIS) &&
-            (dptr->flags & DEV_DEBUG) &&
+            ((dptr->flags & DEV_DEBUG) || (dptr->debflags)) &&
             (dptr->dctrl)) {
             fprintf (st, "Device: %-6s ", dptr->name);
             show_dev_debug (st, dptr, NULL, 0, NULL);
@@ -2214,7 +2214,7 @@ if (sim_deb) {
         }
     for (i = 0; sim_internal_device_count && (dptr = sim_internal_devices[i]); ++i) {
         if (!(dptr->flags & DEV_DIS) &&
-            (dptr->flags & DEV_DEBUG) &&
+            ((dptr->flags & DEV_DEBUG) || (dptr->debflags)) &&
             (dptr->dctrl)) {
             fprintf (st, "Device: %-6s ", dptr->name);
             show_dev_debug (st, dptr, NULL, 0, NULL);
diff --git a/sim_tape.c b/sim_tape.c
index 28d20619..02dcb264 100644
--- a/sim_tape.c
+++ b/sim_tape.c
@@ -457,7 +457,7 @@ DEVICE *dptr;
 
 if ((dptr = find_dev_from_unit (uptr)) == NULL)
     return SCPE_NOATT;
-return sim_tape_attach_ex (uptr, cptr, (dptr->flags & DEV_DEBUG) ? 0xFFFFFFFF : 0, 0);
+return sim_tape_attach_ex (uptr, cptr, ((dptr->flags & DEV_DEBUG) || (dptr->debflags)) ? 0xFFFFFFFF : 0, 0);
 }
 
 t_stat sim_tape_attach_ex (UNIT *uptr, const char *cptr, uint32 dbit, int completion_delay)