github.com/simh.simh
1
0
Fork 0
mirror of https://github.com/simh/simh.git synced 2026-01-26 04:01:38 +00:00
Code Releases Activity

makefile: Add missing SDL support for VAXstation simulators.

Browse Source 
- Minor naming corrections to VAX simulators
This commit is contained in:
Matt Burke
2019-04-23 18:21:16 -07:00
committed by Mark Pizzolato
parent 39ce971e2e
commit 7eee73770d
20 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
VAX/vax410_sysdev.c
View File

@@ -942,7 +942,7 @@ else if (MATCH_CMD(gbuf, "VAXSTATION") == 0) {
vc_dev.flags = vc_dev.flags & ~DEV_DIS; /* enable MVO */
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 (KA410)");
strcpy (sim_name, "VAXstation 2000 (KA410)");
reset_all (0); /* reset everything */
#else
return sim_messagef (SCPE_ARG, "Simulator built without Graphic Device Support\n");
@@ -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");

16
VAX/vax420_sysdev.c
View File

@@ -1123,9 +1123,9 @@ if (MATCH_CMD(gbuf, "MICROVAX") == 0) {
else if (MATCH_CMD(gbuf, "VAXSERVER") == 0) {
sys_model = 1;
#if defined (VAX_41A)
strcpy (sim_name, "VAXServer 3100 M10/M20 (KA41-A)");
strcpy (sim_name, "VAXserver 3100 M10/M20 (KA41-A)");
#else /* VAX_41D */
strcpy (sim_name, "VAXServer 3100 M10e/M20e (KA41-D)");
strcpy (sim_name, "VAXserver 3100 M10e/M20e (KA41-D)");
#endif
reset_all (0); /* reset everything */
}
@@ -1159,9 +1159,9 @@ else if (MATCH_CMD(gbuf, "VAXSTATION") == 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 3100 M30 (KA42-A)");
strcpy (sim_name, "VAXstation 3100 M30 (KA42-A)");
#else /* VAX_42B */
strcpy (sim_name, "VAXStation 3100 M38 (KA42-B)");
strcpy (sim_name, "VAXstation 3100 M38 (KA42-B)");
#endif
reset_all (0); /* reset everything */
#else
@@ -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 GPX 3100 M30 (KA42-A)");
#else /* VAX_42B */
strcpy (sim_name, "VAXStation GPX 3100 M38 (KA42-B)");
strcpy (sim_name, "VAXstation GPX 3100 M38 (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 SPX 3100 M30 (KA42-A)");
#else /* VAX_42B */
strcpy (sim_name, "VAXStation SPX 3100 M38 (KA42-B)");
strcpy (sim_name, "VAXstation SPX 3100 M38 (KA42-B)");
#endif
reset_all (0); /* reset everything */
#else

8
VAX/vax420_syslist.c
View File

@@ -28,9 +28,9 @@
#include "vax_defs.h"
#if defined (VAX_411)
char sim_name[64] = "Infoserver 100 (KA41-1)";
char sim_name[64] = "InfoServer 100 (KA41-1)";
#elif defined (VAX_412)
char sim_name[64] = "Infoserver 150 VXT (KA41-2)";
char sim_name[64] = "InfoServer 150 VXT (KA41-2)";
#elif defined (VAX_41A)
char sim_name[64] = "MicroVAX 3100 M10/M20 (KA41-A)";
#elif defined (VAX_41D)
@@ -44,9 +44,9 @@ char sim_name[64] = "VAXstation 3100 M38 (KA42-B)";
void vax_init(void)
{
#if defined (VAX_411)
sim_savename = "Infoserver 100 (KA41-1)";
sim_savename = "InfoServer 100 (KA41-1)";
#elif defined (VAX_412)
sim_savename = "Infoserver 150 VXT (KA41-2)";
sim_savename = "InfoServer 150 VXT (KA41-2)";
#elif defined (VAX_41A)
sim_savename = "MicroVAX 3100 M10/M20 (KA41-A)";
#elif defined (VAX_41D)

2
VAX/vax4xx_dz.c
View File

@@ -710,7 +710,7 @@ else if (DZ_L3C) { /* no, MicroVAX */
dz_lnorder[2] = 2;
dz_lnorder[3] = 0; /* only 3 connections */
}
else { /* Infoserver */
else { /* InfoServer */
dz_func[0] = DZ_CONSOLE;
dz_func[1] = DZ_TMXR;
dz_func[2] = DZ_TMXR;

2
VAX/vax610_defs.h
View File

@@ -87,7 +87,7 @@
#define CPU_MODEL_MODIFIERS { MTAB_XTD|MTAB_VDV, 0, "LEDS", NULL, \
NULL, &cpu_show_leds, NULL, "Display the CPU LED values" }, \
{ MTAB_XTD|MTAB_VDV, 0, "MODEL", "MODEL={MicroVAX|VAXStation}", \
{ MTAB_XTD|MTAB_VDV, 0, "MODEL", "MODEL={MicroVAX|VAXstation}", \
&cpu_set_model, &cpu_show_model, NULL, "Set/Show the simulator CPU Model" }
/* QVSS memory space */

2
VAX/vax610_sysdev.c
View File

@@ -550,7 +550,7 @@ else if (MATCH_CMD(gbuf, "VAXSTATION") == 0) {
vc_dev.flags = vc_dev.flags & ~DEV_DIS; /* enable QVSS */
lk_dev.flags = lk_dev.flags & ~DEV_DIS; /* enable keyboard */
vs_dev.flags = vs_dev.flags & ~DEV_DIS; /* enable mouse */
strcpy (sim_name, "VAXStation I (KA610)");
strcpy (sim_name, "VAXstation I (KA610)");
reset_all (0); /* reset everything */
#else
return sim_messagef(SCPE_ARG, "Simulator built without Graphic Device Support\n");

2
VAX/vax630_defs.h
View File

@@ -91,7 +91,7 @@
/* CPU */
#define CPU_MODEL_MODIFIERS { MTAB_XTD|MTAB_VDV, 0, "MODEL", "MODEL={MicroVAX|VAXStation|VAXStationGPX}", \
#define CPU_MODEL_MODIFIERS { MTAB_XTD|MTAB_VDV, 0, "MODEL", "MODEL={MicroVAX|VAXstation|VAXstationGPX}", \
&cpu_set_model, &cpu_show_model, NULL, "Set/Show the simulator CPU Model" }, \
{ MTAB_XTD|MTAB_VDV, 0, "DIAG", "DIAG={FULL|MIN}", \
&sysd_set_diag, &sysd_show_diag, NULL, "Set/Show boot rom diagnostic mode" }, \

4
VAX/vax630_sysdev.c
View File

@@ -1086,7 +1086,7 @@ else if (MATCH_CMD(gbuf, "VAXSTATION") == 0) {
va_dev.flags = va_dev.flags | DEV_DIS; /* disable QDSS */
lk_dev.flags = lk_dev.flags & ~DEV_DIS; /* enable keyboard */
vs_dev.flags = vs_dev.flags & ~DEV_DIS; /* enable mouse */
strcpy (sim_name, "VAXStation II (KA630)");
strcpy (sim_name, "VAXstation II (KA630)");
reset_all (0); /* reset everything */
#else
return sim_messagef(SCPE_ARG, "Simulator built without Graphic Device Support\n");
@@ -1099,7 +1099,7 @@ else if (MATCH_CMD(gbuf, "VAXSTATIONGPX") == 0) {
va_dev.flags = va_dev.flags & ~DEV_DIS; /* enable QDSS */
lk_dev.flags = lk_dev.flags & ~DEV_DIS; /* enable keyboard */
vs_dev.flags = vs_dev.flags & ~DEV_DIS; /* enable mouse */
strcpy (sim_name, "VAXStation II/GPX (KA630)");
strcpy (sim_name, "VAXstation II/GPX (KA630)");
reset_all (0); /* reset everything */
#else
return sim_messagef(SCPE_ARG, "Simulator built without Graphic Device Support\n");

6
VAX/vax_sysdev.c
View File

@@ -1829,7 +1829,7 @@ if ((cptr == NULL) || (!*cptr))
cptr = get_glyph (cptr, gbuf, 0);
if (MATCH_CMD(gbuf, "VAXSERVER") == 0) {
sys_model = 0;
strcpy (sim_name, "VAXServer 3900 (KA655)");
strcpy (sim_name, "VAXserver 3900 (KA655)");
}
else if (MATCH_CMD(gbuf, "MICROVAX") == 0) {
sys_model = 1;
@@ -1843,7 +1843,7 @@ else if (MATCH_CMD(gbuf, "MICROVAX") == 0) {
}
else if (MATCH_CMD(gbuf, "VAXSTATION") == 0) {
#if defined(USE_SIM_VIDEO) && defined(HAVE_LIBSDL)
strcpy (sim_name, "VAXStation 3900 (KA655)");
strcpy (sim_name, "VAXstation 3900 (KA655)");
sys_model = 1;
vc_dev.flags = vc_dev.flags & ~DEV_DIS; /* enable QVSS */
lk_dev.flags = lk_dev.flags & ~DEV_DIS; /* enable keyboard */
@@ -1860,7 +1860,7 @@ return SCPE_OK;
t_stat cpu_print_model (FILE *st)
{
fprintf (st, "%s 3900 (KA655)", (sys_model ? "MicroVAX" : "VAXServer"));
fprintf (st, "%s 3900 (KA655)", (sys_model ? "MicroVAX" : "VAXserver"));
return SCPE_OK;
}

2
VAX/vaxmod_defs.h
View File

@@ -129,7 +129,7 @@
{ UNIT_MSIZE, (1u << 29), NULL, "512M", &cpu_set_size, NULL, NULL, "Set Memory to 512M bytes" }, \
{ MTAB_XTD|MTAB_VDV|MTAB_NMO, 0, "MEMORY", NULL, NULL, &cpu_show_memory, NULL, "Display memory configuration" }
extern t_stat cpu_show_memory (FILE* st, UNIT* uptr, int32 val, CONST void* desc);
#define CPU_MODEL_MODIFIERS { MTAB_XTD|MTAB_VDV, 0, "MODEL", "MODEL={VAXServer|MicroVAX|VAXStation}", \
#define CPU_MODEL_MODIFIERS { MTAB_XTD|MTAB_VDV, 0, "MODEL", "MODEL={VAXserver|MicroVAX|VAXstation}", \
&cpu_set_model, &cpu_show_model, NULL, "Set/Display processor model" }, \
{ MTAB_XTD|MTAB_VDV, 0, "AUTOBOOT", "AUTOBOOT", \
&sysd_set_halt, &sysd_show_halt, NULL, "Enable autoboot (Disable Halt)" }, \