From 0cc6f85937b0a1491f5f30728e5265aded64f16f Mon Sep 17 00:00:00 2001
From: Matt Burke <matt@9track.net>
Date: Tue, 30 Apr 2019 01:26:01 +0100
Subject: [PATCH] VAX410, VAX420, VAX43: Further naming corrections to
 simulators

---
 VAX/vax410_sysdev.c |  2 +-
 VAX/vax420_sysdev.c | 14 +++++++-------
 VAX/vax43_sysdev.c  |  5 +++--
 VAX/vax43_syslist.c |  4 ++--
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/VAX/vax410_sysdev.c b/VAX/vax410_sysdev.c
index b1b3f8f5..b152660d 100644
--- a/VAX/vax410_sysdev.c
+++ b/VAX/vax410_sysdev.c
@@ -955,7 +955,7 @@ else if (MATCH_CMD(gbuf, "VAXSTATIONGPX") == 0) {
     va_dev.flags = va_dev.flags & ~DEV_DIS;              /* enable GPX */
     lk_dev.flags = lk_dev.flags & ~DEV_DIS;              /* enable keyboard */
     vs_dev.flags = vs_dev.flags & ~DEV_DIS;              /* enable mouse */
-    strcpy (sim_name, "VAXstation 2000 GPX (KA410)");
+    strcpy (sim_name, "VAXstation 2000/GPX (KA410)");
     reset_all (0);                                       /* reset everything */
 #else
     return sim_messagef (SCPE_ARG, "Simulator built without Graphic Device Support\n");
diff --git a/VAX/vax420_sysdev.c b/VAX/vax420_sysdev.c
index b4d031e0..6c55e6da 100644
--- a/VAX/vax420_sysdev.c
+++ b/VAX/vax420_sysdev.c
@@ -1134,7 +1134,7 @@ else
 #endif
 #if defined (VAX_42A) || defined (VAX_42B)
 if ((MATCH_CMD(gbuf, "VAXSERVER") == 0) ||
-    (MATCH_CMD(gbuf, "MICROVAX") == 0)) {
+    (MATCH_CMD(gbuf, "MICROVAX") == 0)) {                /* needed by VA,VC,VE */
     sys_model = 0;
 #if defined (USE_SIM_VIDEO) && defined (HAVE_LIBSDL)
     va_dev.flags = vc_dev.flags | DEV_DIS;               /* disable GPX */
@@ -1144,9 +1144,9 @@ if ((MATCH_CMD(gbuf, "VAXSERVER") == 0) ||
     vs_dev.flags = vs_dev.flags | DEV_DIS;               /* disable mouse */
 #endif
 #if defined (VAX_42A)
-    strcpy (sim_name, "MicroVAX 3100 M30 (KA42-A)");
+    strcpy (sim_name, "VAXserver 3100 M30 (KA42-A)");
 #else   /* VAX_42B */
-    strcpy (sim_name, "MicroVAX 3100 M38 (KA42-B)");
+    strcpy (sim_name, "VAXserver 3100 M38 (KA42-B)");
 #endif
     reset_all (0);                                       /* reset everything */
     }
@@ -1177,9 +1177,9 @@ else if (MATCH_CMD(gbuf, "VAXSTATIONGPX") == 0) {
     lk_dev.flags = lk_dev.flags & ~DEV_DIS;              /* enable keyboard */
     vs_dev.flags = vs_dev.flags & ~DEV_DIS;              /* enable mouse */
 #if defined (VAX_42A)
-    strcpy (sim_name, "VAXstation GPX 3100 M30 (KA42-A)");
+    strcpy (sim_name, "VAXstation 3100 M30/GPX (KA42-A)");
 #else   /* VAX_42B */
-    strcpy (sim_name, "VAXstation GPX 3100 M38 (KA42-B)");
+    strcpy (sim_name, "VAXstation 3100 M38/GPX (KA42-B)");
 #endif
     reset_all (0);                                       /* reset everything */
 #else
@@ -1195,9 +1195,9 @@ else if (MATCH_CMD(gbuf, "VAXSTATIONSPX") == 0) {
     lk_dev.flags = lk_dev.flags & ~DEV_DIS;              /* enable keyboard */
     vs_dev.flags = vs_dev.flags & ~DEV_DIS;              /* enable mouse */
 #if defined (VAX_42A)
-    strcpy (sim_name, "VAXstation SPX 3100 M30 (KA42-A)");
+    strcpy (sim_name, "VAXstation 3100 M30/SPX (KA42-A)");
 #else   /* VAX_42B */
-    strcpy (sim_name, "VAXstation SPX 3100 M38 (KA42-B)");
+    strcpy (sim_name, "VAXstation 3100 M38/SPX (KA42-B)");
 #endif
     reset_all (0);                                       /* reset everything */
 #else
diff --git a/VAX/vax43_sysdev.c b/VAX/vax43_sysdev.c
index b43f43b0..956db4d6 100644
--- a/VAX/vax43_sysdev.c
+++ b/VAX/vax43_sysdev.c
@@ -1058,7 +1058,8 @@ char gbuf[CBUFSIZE];
 if ((cptr == NULL) || (!*cptr))
     return SCPE_ARG;
 cptr = get_glyph (cptr, gbuf, 0);
-if (MATCH_CMD(gbuf, "MICROVAX") == 0) {
+if ((MATCH_CMD(gbuf, "VAXSERVER") == 0) ||
+    (MATCH_CMD(gbuf, "MICROVAX") == 0)) {                /* needed by VC,VE */
     sys_model = 0;
 #if defined(USE_SIM_VIDEO) && defined(HAVE_LIBSDL)
     vc_dev.flags = vc_dev.flags | DEV_DIS;               /* disable MVO */
@@ -1066,7 +1067,7 @@ if (MATCH_CMD(gbuf, "MICROVAX") == 0) {
     lk_dev.flags = lk_dev.flags | DEV_DIS;               /* disable keyboard */
     vs_dev.flags = vs_dev.flags | DEV_DIS;               /* disable mouse */
 #endif
-    strcpy (sim_name, "MicroVAX 3100 M76 (KA43-A)");
+    strcpy (sim_name, "VAXserver 3100 M76 (KA43-A)");
     reset_all (0);                                       /* reset everything */
     }
 else if (MATCH_CMD(gbuf, "VAXSTATION") == 0) {
diff --git a/VAX/vax43_syslist.c b/VAX/vax43_syslist.c
index a6b4f7d8..3a23ac39 100644
--- a/VAX/vax43_syslist.c
+++ b/VAX/vax43_syslist.c
@@ -27,11 +27,11 @@
 
 #include "vax_defs.h"
 
-char sim_name[64] = "MicroVAX 3100 M76 (KA43-A)";
+char sim_name[64] = "VAXstation 3100 M76 (KA43-A)";
 
 void vax_init(void)
 {
-sim_savename = "MicroVAX 3100 M76 (KA43-A)";
+sim_savename = "VAXstation 3100 M76 (KA43-A)";
 }
 
 WEAK void (*sim_vm_init) (void) = &vax_init;