VAX410, VAX420, VAX43: Further naming corrections to simulators

This commit is contained in:
Matt Burke 2019-04-30 01:26:01 +01:00
parent 8832511204
commit 0cc6f85937
4 changed files with 13 additions and 12 deletions

View file

@ -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");

View file

@ -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

View file

@ -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) {

View file

@ -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;