From 78f4d07c3d767dede8249d333df3dddefceaa3d3 Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Tue, 1 Dec 2015 07:46:28 -0800
Subject: [PATCH] VAX QVSS: Add device descriptions to the Keyboard (LK) and
 Mouse (VS) devices.

---
 VAX/vax610_syslist.c |  2 +-
 VAX/vax630_syslist.c |  2 +-
 VAX/vax_lk.c         | 13 ++++++++++---
 VAX/vax_syslist.c    |  2 +-
 VAX/vax_vc.c         | 36 ++++++++++++++++++------------------
 VAX/vax_vs.c         | 13 ++++++++++---
 6 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/VAX/vax610_syslist.c b/VAX/vax610_syslist.c
index 2d5a2f86..adf7fc2a 100644
--- a/VAX/vax610_syslist.c
+++ b/VAX/vax610_syslist.c
@@ -77,9 +77,9 @@ DEVICE *sim_devices[] = {
     &cr_dev,
     &lpt_dev,
 #if defined(USE_SIM_VIDEO) && defined(HAVE_LIBSDL)
+    &vc_dev,
     &lk_dev,
     &vs_dev,
-    &vc_dev,
 #endif
     &rl_dev,
     &rq_dev,
diff --git a/VAX/vax630_syslist.c b/VAX/vax630_syslist.c
index 258c249f..808d72d4 100644
--- a/VAX/vax630_syslist.c
+++ b/VAX/vax630_syslist.c
@@ -91,9 +91,9 @@ DEVICE *sim_devices[] = {
     &cr_dev,
     &lpt_dev,
 #if defined(USE_SIM_VIDEO) && defined(HAVE_LIBSDL)
+    &vc_dev,
     &lk_dev,
     &vs_dev,
-    &vc_dev,
 #endif
     &rl_dev,
     &rq_dev,
diff --git a/VAX/vax_lk.c b/VAX/vax_lk.c
index 5378de32..0e9c522b 100644
--- a/VAX/vax_lk.c
+++ b/VAX/vax_lk.c
@@ -176,6 +176,7 @@ t_stat lk_reset (DEVICE *dptr);
 void lk_reset_mode (void);
 void lk_cmd (void);
 void lk_poll (void);
+const char *lk_description (DEVICE *dptr);
 
 /* LK data structures
 
@@ -187,8 +188,8 @@ void lk_poll (void);
 */
 
 DEBTAB lk_debug[] = {
-    {"SERIAL", DBG_SERIAL},
-    {"CMD",    DBG_CMD},
+    {"SERIAL", DBG_SERIAL,  "Serial port data"},
+    {"CMD",    DBG_CMD,     "Commands"},
     {0}
     };
 
@@ -208,7 +209,8 @@ DEVICE lk_dev = {
     NULL, NULL, &lk_reset,
     NULL, NULL, NULL,
     NULL, DEV_DIS | DEV_DEBUG, 0,
-    lk_debug
+    lk_debug, NULL, NULL, NULL, NULL, NULL, 
+    &lk_description
     };
 
 /* Incoming data on serial line */
@@ -828,6 +830,11 @@ switch (mode) {
     }            
 }
 
+const char *lk_description (DEVICE *dptr)
+{
+return "  VCB01 - LK Keyboard interface";
+}
+
 #else /* defined(VAX_620) */
 static const char *dummy_declaration = "Something to compile";
 #endif /* !defined(VAX_620) */
diff --git a/VAX/vax_syslist.c b/VAX/vax_syslist.c
index 787f64db..eb684d22 100644
--- a/VAX/vax_syslist.c
+++ b/VAX/vax_syslist.c
@@ -84,9 +84,9 @@ DEVICE *sim_devices[] = {
     &cr_dev,
     &lpt_dev,
 #if defined(USE_SIM_VIDEO) && defined(HAVE_LIBSDL)
+    &vc_dev,
     &lk_dev,
     &vs_dev,
-    &vc_dev,
 #endif
     &rl_dev,
     &rq_dev,
diff --git a/VAX/vax_vc.c b/VAX/vax_vc.c
index caf1b3bf..8ae21275 100644
--- a/VAX/vax_vc.c
+++ b/VAX/vax_vc.c
@@ -278,24 +278,24 @@ DIB vc_dib = {
 #define DBG_INT         0x00FF                          /* interrupt 0-7 */
 
 DEBTAB vc_debug[] = {
-    {"REG",     DBG_REG},
-    {"CRTC",    DBG_CRTC},
-    {"CURSOR",  DBG_CURSOR},
-    {"TCURSOR", DBG_TCURSOR},
-    {"SCANL",   DBG_SCANL},
-    {"DUART",   DBG_INT0},
-    {"VSYNC",   DBG_INT1},
-    {"MOUSE",   DBG_INT2},
-    {"CSTRT",   DBG_INT3},
-    {"MBA",     DBG_INT4},
-    {"MBB",     DBG_INT5},
-    {"MBC",     DBG_INT6},
-    {"SPARE",   DBG_INT7},
-    {"INT",     DBG_INT0|DBG_INT1|DBG_INT2|DBG_INT3|DBG_INT4|DBG_INT5|DBG_INT6|DBG_INT7},
-    {"VMOUSE",  SIM_VID_DBG_MOUSE},
-    {"VCURSOR", SIM_VID_DBG_CURSOR},
-    {"VKEY",    SIM_VID_DBG_KEY},
-    {"VVIDEO",  SIM_VID_DBG_VIDEO},
+    {"REG",     DBG_REG,                "Register activity"},
+    {"CRTC",    DBG_CRTC,               "CRTC register activity"},
+    {"CURSOR",  DBG_CURSOR,             "Cursor content, function and visibility activity"},
+    {"TCURSOR", DBG_TCURSOR,            "Cursor content, function and visibility activity"},
+    {"SCANL",   DBG_SCANL,              "Scanline map activity"},
+    {"DUART",   DBG_INT0,               "interrupt 0"},
+    {"VSYNC",   DBG_INT1,               "interrupt 1"},
+    {"MOUSE",   DBG_INT2,               "interrupt 2"},
+    {"CSTRT",   DBG_INT3,               "interrupt 3"},
+    {"MBA",     DBG_INT4,               "interrupt 4"},
+    {"MBB",     DBG_INT5,               "interrupt 5"},
+    {"MBC",     DBG_INT6,               "interrupt 6"},
+    {"SPARE",   DBG_INT7,               "interrupt 7"},
+    {"INT",     DBG_INT0|DBG_INT1|DBG_INT2|DBG_INT3|DBG_INT4|DBG_INT5|DBG_INT6|DBG_INT7, "interrupt 0-7"},
+    {"VMOUSE",  SIM_VID_DBG_MOUSE,      "Video Mouse"},
+    {"VCURSOR", SIM_VID_DBG_CURSOR,     "Video Cursor"},
+    {"VKEY",    SIM_VID_DBG_KEY,        "Video Key"},
+    {"VVIDEO",  SIM_VID_DBG_VIDEO,      "Video Video"},
     {0}
     };
 
diff --git a/VAX/vax_vs.c b/VAX/vax_vs.c
index 120e573f..287751a7 100644
--- a/VAX/vax_vs.c
+++ b/VAX/vax_vs.c
@@ -78,6 +78,7 @@ t_stat vs_reset (DEVICE *dptr);
 void vs_cmd (int32 c);
 void vs_sendupd (void);
 void vs_poll (void);
+const char *vs_description (DEVICE *dptr);
 
 
 /* VS data structures
@@ -90,8 +91,8 @@ void vs_poll (void);
 */
 
 DEBTAB vs_debug[] = {
-    {"SERIAL", DBG_SERIAL},
-    {"CMD",    DBG_CMD},
+    {"SERIAL", DBG_SERIAL,  "Serial port data"},
+    {"CMD",    DBG_CMD,     "Commands"},
     {0}
     };
 
@@ -111,7 +112,8 @@ DEVICE vs_dev = {
     NULL, NULL, &vs_reset,
     NULL, NULL, NULL,
     NULL, DEV_DIS | DEV_DEBUG, 0,
-    vs_debug
+    vs_debug, NULL, NULL, NULL, NULL, NULL, 
+    &vs_description
     };
 
 
@@ -239,6 +241,11 @@ if (vs_state == VSXXX_IDLE) {
     }
 }
 
+const char *vs_description (DEVICE *dptr)
+{
+return "  VCB01 - VS Mouse interface";
+}
+
 #else /* defined(VAX_620) */
 static const char *dummy_declaration = "Something to compile";
 #endif /* !defined(VAX_620) */