diff --git a/README.md b/README.md index 2fac409e..9f735f9a 100644 --- a/README.md +++ b/README.md @@ -53,12 +53,12 @@ #### Matt Burke has implemented new VAX model simulators: - VAX/11 730 - VAX/11 750 - VAX 8200 + VAX-11/730 + VAX-11/750 + VAX 8200/8250 VAX 8600/8650 - MicroVAX I & VAXStation I - MicroVAX II & VAXStation II & VAXStation II GPX + MicroVAX I & VAXstation I + MicroVAX II & VAXstation II & VAXstation II/GPX rtVAX 1000 (or Industrial VAX 620) MicroVAX 2000 & VAXstation 2000 MicroVAX 3100 M10/M20 @@ -142,7 +142,7 @@ A remote console session will close when an EOF character is entered (i.e. ^D or when packets arrive too fast. MicroVAX 3900 has QVSS (VCB01) board available. MicroVAX 3900 and MicroVAX II have SET CPU AUTOBOOT option - MicroVAX 3900 has a SET CPU MODEL=(MicroVAX|VAXServer|VAXStation) command to change between system types + MicroVAX 3900 has a SET CPU MODEL=(MicroVAX|VAXserver|VAXstation) command to change between system types MicroVAX I has a SET CPU MODEL=(MicroVAX|VAXSTATION) command to change between system types MicroVAX II has a SET CPU MODEL=(MicroVAX|VAXSTATION) command to change between system types diff --git a/VAX/vax410_sysdev.c b/VAX/vax410_sysdev.c index f224c045..b1b3f8f5 100644 --- a/VAX/vax410_sysdev.c +++ b/VAX/vax410_sysdev.c @@ -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"); diff --git a/VAX/vax420_sysdev.c b/VAX/vax420_sysdev.c index d7651fc4..b4d031e0 100644 --- a/VAX/vax420_sysdev.c +++ b/VAX/vax420_sysdev.c @@ -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 diff --git a/VAX/vax420_syslist.c b/VAX/vax420_syslist.c index 0c7014fc..c6c79007 100644 --- a/VAX/vax420_syslist.c +++ b/VAX/vax420_syslist.c @@ -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) diff --git a/VAX/vax4xx_dz.c b/VAX/vax4xx_dz.c index 540054de..9866cdbb 100644 --- a/VAX/vax4xx_dz.c +++ b/VAX/vax4xx_dz.c @@ -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; diff --git a/VAX/vax610_defs.h b/VAX/vax610_defs.h index 7893794d..b92e8d47 100644 --- a/VAX/vax610_defs.h +++ b/VAX/vax610_defs.h @@ -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 */ diff --git a/VAX/vax610_sysdev.c b/VAX/vax610_sysdev.c index c4099ddc..16e34d30 100644 --- a/VAX/vax610_sysdev.c +++ b/VAX/vax610_sysdev.c @@ -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"); diff --git a/VAX/vax630_defs.h b/VAX/vax630_defs.h index 1391e170..0303b968 100644 --- a/VAX/vax630_defs.h +++ b/VAX/vax630_defs.h @@ -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" }, \ diff --git a/VAX/vax630_sysdev.c b/VAX/vax630_sysdev.c index ee75a245..ea111ea6 100644 --- a/VAX/vax630_sysdev.c +++ b/VAX/vax630_sysdev.c @@ -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"); diff --git a/VAX/vax_sysdev.c b/VAX/vax_sysdev.c index 46d24fa3..1d8bbfe1 100644 --- a/VAX/vax_sysdev.c +++ b/VAX/vax_sysdev.c @@ -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; } diff --git a/VAX/vaxmod_defs.h b/VAX/vaxmod_defs.h index 6488c8d2..cdbd14e3 100644 --- a/VAX/vaxmod_defs.h +++ b/VAX/vaxmod_defs.h @@ -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)" }, \ diff --git a/Visual Studio Projects/InfoServer150VTX.vcproj b/Visual Studio Projects/InfoServer150VXT.vcproj similarity index 95% rename from Visual Studio Projects/InfoServer150VTX.vcproj rename to Visual Studio Projects/InfoServer150VXT.vcproj index de4715b6..e8f55bf5 100644 --- a/Visual Studio Projects/InfoServer150VTX.vcproj +++ b/Visual Studio Projects/InfoServer150VXT.vcproj @@ -2,9 +2,9 @@ diff --git a/Visual Studio Projects/Simh.sln b/Visual Studio Projects/Simh.sln index f713a1b4..d9376345 100644 --- a/Visual Studio Projects/Simh.sln +++ b/Visual Studio Projects/Simh.sln @@ -330,17 +330,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InfoServer100", "InfoServer {D40F3AF1-EEE7-4432-9807-2AD287B490F8} = {D40F3AF1-EEE7-4432-9807-2AD287B490F8} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InfoServer150VTX", "InfoServer150VTX.vcproj", "{4A8AA409-A793-444E-A03B-9D91E0EE4891}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InfoServer150VXT", "InfoServer150VXT.vcproj", "{4A8AA409-A793-444E-A03B-9D91E0EE4891}" ProjectSection(ProjectDependencies) = postProject {D40F3AF1-EEE7-4432-9807-2AD287B490F8} = {D40F3AF1-EEE7-4432-9807-2AD287B490F8} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MicroVAX3100M76", "MicroVAX3100M76.vcproj", "{7F8038CE-A04D-47B3-A284-BC0D3B1A7CD7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VAXstation3100M76", "VAXstation3100M76.vcproj", "{7F8038CE-A04D-47B3-A284-BC0D3B1A7CD7}" ProjectSection(ProjectDependencies) = postProject {D40F3AF1-EEE7-4432-9807-2AD287B490F8} = {D40F3AF1-EEE7-4432-9807-2AD287B490F8} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VAXStation4000M60", "VAXStation4000M60.vcproj", "{E158012B-70C1-4186-B787-C56B4476CD49}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VAXstation4000M60", "VAXstation4000M60.vcproj", "{E158012B-70C1-4186-B787-C56B4476CD49}" ProjectSection(ProjectDependencies) = postProject {D40F3AF1-EEE7-4432-9807-2AD287B490F8} = {D40F3AF1-EEE7-4432-9807-2AD287B490F8} EndProjectSection @@ -350,14 +350,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MicroVAX3100M80", "MicroVAX {D40F3AF1-EEE7-4432-9807-2AD287B490F8} = {D40F3AF1-EEE7-4432-9807-2AD287B490F8} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VAXStation4000VLC", "VAXStation4000VLC.vcproj", "{1AB7B087-9D64-48EA-A235-193DF85EB763}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VAXstation4000VLC", "VAXstation4000VLC.vcproj", "{1AB7B087-9D64-48EA-A235-193DF85EB763}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VAXStation3100M30", "VAXStation3100M30.vcproj", "{8198BF0B-235F-41A5-A16A-22CC616878E8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VAXstation3100M30", "VAXstation3100M30.vcproj", "{8198BF0B-235F-41A5-A16A-22CC616878E8}" ProjectSection(ProjectDependencies) = postProject {D40F3AF1-EEE7-4432-9807-2AD287B490F8} = {D40F3AF1-EEE7-4432-9807-2AD287B490F8} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VAXStation3100M38", "VAXStation3100M38.vcproj", "{7E69582F-4C1E-45F7-8E15-5CD166A78BD3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VAXstation3100M38", "VAXstation3100M38.vcproj", "{7E69582F-4C1E-45F7-8E15-5CD166A78BD3}" ProjectSection(ProjectDependencies) = postProject {D40F3AF1-EEE7-4432-9807-2AD287B490F8} = {D40F3AF1-EEE7-4432-9807-2AD287B490F8} EndProjectSection diff --git a/Visual Studio Projects/VAXStation3100M30.vcproj b/Visual Studio Projects/VAXstation3100M30.vcproj similarity index 95% rename from Visual Studio Projects/VAXStation3100M30.vcproj rename to Visual Studio Projects/VAXstation3100M30.vcproj index 5eec33bf..ed38b7e9 100644 --- a/Visual Studio Projects/VAXStation3100M30.vcproj +++ b/Visual Studio Projects/VAXstation3100M30.vcproj @@ -2,9 +2,9 @@ diff --git a/Visual Studio Projects/VAXStation3100M38.vcproj b/Visual Studio Projects/VAXstation3100M38.vcproj similarity index 95% rename from Visual Studio Projects/VAXStation3100M38.vcproj rename to Visual Studio Projects/VAXstation3100M38.vcproj index eeea0fa8..3532aaf0 100644 --- a/Visual Studio Projects/VAXStation3100M38.vcproj +++ b/Visual Studio Projects/VAXstation3100M38.vcproj @@ -2,9 +2,9 @@ diff --git a/Visual Studio Projects/MicroVAX3100M76.vcproj b/Visual Studio Projects/VAXstation3100M76.vcproj similarity index 95% rename from Visual Studio Projects/MicroVAX3100M76.vcproj rename to Visual Studio Projects/VAXstation3100M76.vcproj index 7d518a38..bd941115 100644 --- a/Visual Studio Projects/MicroVAX3100M76.vcproj +++ b/Visual Studio Projects/VAXstation3100M76.vcproj @@ -2,9 +2,9 @@ diff --git a/Visual Studio Projects/VAXStation4000M60.vcproj b/Visual Studio Projects/VAXstation4000M60.vcproj similarity index 95% rename from Visual Studio Projects/VAXStation4000M60.vcproj rename to Visual Studio Projects/VAXstation4000M60.vcproj index edb1c7ca..8a15cee9 100644 --- a/Visual Studio Projects/VAXStation4000M60.vcproj +++ b/Visual Studio Projects/VAXstation4000M60.vcproj @@ -2,9 +2,9 @@ diff --git a/Visual Studio Projects/VAXStation4000VLC.vcproj b/Visual Studio Projects/VAXstation4000VLC.vcproj similarity index 95% rename from Visual Studio Projects/VAXStation4000VLC.vcproj rename to Visual Studio Projects/VAXstation4000VLC.vcproj index ea6dbd84..8da25161 100644 --- a/Visual Studio Projects/VAXStation4000VLC.vcproj +++ b/Visual Studio Projects/VAXstation4000VLC.vcproj @@ -2,9 +2,9 @@ diff --git a/descrip.mms b/descrip.mms index 0dd5ed8b..2e5d9525 100644 --- a/descrip.mms +++ b/descrip.mms @@ -56,7 +56,7 @@ # MicroVAX2 Just Build The DEC MicroVAX2 (MicroVAX II). # MICROVAX2000 Just Build The DEC MicroVAX 2000. # INFOSERVER100 Just Build The DEC InfoServer 100. -# INFOSERVER150VTX Just Build The DEC InfoServer 150 VXT. +# INFOSERVER150VXT Just Build The DEC InfoServer 150 VXT. # MICROVAX3100 Just Build The DEC MicroVAX 3100 M10/M20. # MICROVAX3100E Just Build The DEC MicroVAX 3100 M10e/M20e. # VAXSTATION3100M30 Just Build The DEC VAXstation 3100 M30. @@ -1336,7 +1336,7 @@ I7094_OPTIONS = /INCL=($(SIMH_DIR),$(I7094_DIR))/DEF=($(CC_DEFS)) ALL : ALTAIR ALTAIRZ80 CDC1700 ECLIPSE GRI LGP H316 HP2100 HP3000 I1401 I1620 \ IBM1130 ID16 ID32 NOVA PDP1 PDP4 PDP7 PDP8 PDP9 PDP10 PDP11 PDP15 S3 \ VAX MICROVAX3900 MICROVAX1 RTVAX1000 MICROVAX2 VAX730 VAX750 VAX780 \ - MICROVAX2000 INFOSERVER100 INFOSERVER150VTX \ + MICROVAX2000 INFOSERVER100 INFOSERVER150VXT \ MICROVAX3100 MICROVAX3100E VAXSTATION3100M30 \ VAXSTATION3100M38 VAXSTATION3100M76 VAXSTATION4000M60 \ VAXSTATION3100M80 VAXSTATION4000VLC INFOSERVER1000 \ @@ -1349,7 +1349,7 @@ ALL : ALTAIR ALTAIRZ80 CDC1700 ECLIPSE GRI LGP H316 HP2100 HP3000 I1401 I1620 \ ALL : ALTAIR GRI H316 HP2100 I1401 I1620 IBM1130 ID16 ID32 \ NOVA PDP1 PDP4 PDP7 PDP8 PDP9 PDP11 PDP15 S3 \ VAX MICROVAX3900 MICROVAX1 RTVAX1000 MICROVAX2 VAX730 VAX750 VAX780 VAX8600 \ - MICROVAX2000 INFOSERVER100 INFOSERVER150VTX \ + MICROVAX2000 INFOSERVER100 INFOSERVER150VXT \ MICROVAX3100 MICROVAX3100E VAXSTATION3100M30 \ VAXSTATION3100M38 VAXSTATION3100M76 VAXSTATION4000M60 \ VAXSTATION3100M80 VAXSTATION4000VLC INFOSERVER1000 @@ -2905,16 +2905,16 @@ $(BIN_DIR)INFOSERVER100-$(ARCH).EXE : $(SIMH_MAIN) $(VAX411_SIMH_LIB) $(PCAP_LIB $(VAX411_SIMH_LIB)/LIBRARY$(PCAP_LIBR) $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;* -INFOSERVER150VTX : $(BIN_DIR)INFOSERVER150VTX-$(ARCH).EXE - $! INFOSERVER150VTX done +INFOSERVER150VXT : $(BIN_DIR)INFOSERVER150VXT-$(ARCH).EXE + $! INFOSERVER150VXT done -$(BIN_DIR)INFOSERVER150VTX-$(ARCH).EXE : $(SIMH_MAIN) $(VAX412_SIMH_LIB) $(PCAP_LIBD) $(VAX412_LIB1) $(VAX412_LIB2) $(PCAP_EXECLET) +$(BIN_DIR)INFOSERVER150VXT-$(ARCH).EXE : $(SIMH_MAIN) $(VAX412_SIMH_LIB) $(PCAP_LIBD) $(VAX412_LIB1) $(VAX412_LIB2) $(PCAP_EXECLET) $! - $! Building The $(BIN_DIR)INFOSERVER150VTX-$(ARCH).EXE Simulator. + $! Building The $(BIN_DIR)INFOSERVER150VXT-$(ARCH).EXE Simulator. $! $ $(CC)$(VAX412_OPTIONS)/OBJ=$(BLD_DIR) SCP.C $ LINK $(LINK_DEBUG)$(LINK_SECTION_BINDING)- - /EXE=$(BIN_DIR)INFOSERVER150VTX-$(ARCH).EXE - + /EXE=$(BIN_DIR)INFOSERVER150VXT-$(ARCH).EXE - $(BLD_DIR)SCP.OBJ,- $(VAX412_LIB1)/LIBRARY,$(VAX412_LIB2)/LIBRARY,- $(VAX412_SIMH_LIB)/LIBRARY$(PCAP_LIBR) diff --git a/makefile b/makefile index 889e16fc..36f66712 100644 --- a/makefile +++ b/makefile @@ -99,7 +99,7 @@ endif BUILD_SINGLE := $(MAKECMDGOALS) $(BLANK_SUFFIX) BUILD_MULTIPLE_VERB = is # building the pdp1, pdp11, tx-0, or any microvax simulator could use video support -ifneq (,$(or $(findstring XXpdp1XX,$(addsuffix XX,$(addprefix XX,$(MAKECMDGOALS)))),$(findstring pdp11,$(MAKECMDGOALS)),$(findstring tx-0,$(MAKECMDGOALS)),$(findstring microvax1,$(MAKECMDGOALS)),$(findstring microvax2,$(MAKECMDGOALS)),$(findstring microvax3900,$(MAKECMDGOALS)),$(findstring vax41,$(MAKECMDGOALS)),$(findstring vax42,$(MAKECMDGOALS)),$(findstring microvax3100m76,$(MAKECMDGOALS)),$(findstring XXvaxXX,$(addsuffix XX,$(addprefix XX,$(MAKECMDGOALS)))))) +ifneq (,$(or $(findstring XXpdp1XX,$(addsuffix XX,$(addprefix XX,$(MAKECMDGOALS)))),$(findstring pdp11,$(MAKECMDGOALS)),$(findstring tx-0,$(MAKECMDGOALS)),$(findstring microvax1,$(MAKECMDGOALS)),$(findstring microvax2,$(MAKECMDGOALS)),$(findstring microvax3900,$(MAKECMDGOALS)),$(findstring microvax2000,$(MAKECMDGOALS)),$(findstring vaxstation3100,$(MAKECMDGOALS)),$(findstring XXvaxXX,$(addsuffix XX,$(addprefix XX,$(MAKECMDGOALS)))))) VIDEO_USEFUL = true endif # building the besm6 needs both video support and fontfile support @@ -1928,8 +1928,8 @@ ATT3B2_OPT = -DUSE_INT64 -DUSE_ADDR64 -I ${ATT3B2D} ${NETWORK_OPT} ALL = pdp1 pdp4 pdp7 pdp8 pdp9 pdp15 pdp11 pdp10 \ vax microvax3900 microvax1 rtvax1000 microvax2 vax730 vax750 vax780 \ vax8200 vax8600 \ - microvax2000 infoserver100 infoserver150vtx microvax3100 microvax3100e \ - vaxstation3100m30 vaxstation3100m38 microvax3100m76 vaxstation4000m60 \ + microvax2000 infoserver100 infoserver150vxt microvax3100 microvax3100e \ + vaxstation3100m30 vaxstation3100m38 vaxstation3100m76 vaxstation4000m60 \ microvax3100m80 vaxstation4000vlc infoserver1000 \ nova eclipse hp2100 hp3000 i1401 i1620 s3 altair altairz80 gri \ i7094 ibm1130 id16 id32 sds lgp h316 cdc1700 \ @@ -2081,9 +2081,9 @@ ${BIN}infoserver100${EXE} : ${VAX420} ${SCSI} ${SIM} ${BUILD_ROMS} ${MKDIRBIN} ${CC} ${VAX420} ${SCSI} ${SIM} ${VAX411_OPT} -o $@ ${LDFLAGS} -infoserver150vtx : ${BIN}BuildROMs${EXE} ${BIN}infoserver150vtx${EXE} +infoserver150vxt : ${BIN}BuildROMs${EXE} ${BIN}infoserver150vxt${EXE} -${BIN}infoserver150vtx${EXE} : ${VAX420} ${SCSI} ${SIM} ${BUILD_ROMS} +${BIN}infoserver150vxt${EXE} : ${VAX420} ${SCSI} ${SIM} ${BUILD_ROMS} ${MKDIRBIN} ${CC} ${VAX420} ${SCSI} ${SIM} ${VAX412_OPT} -o $@ ${LDFLAGS} @@ -2111,9 +2111,9 @@ ${BIN}vaxstation3100m38${EXE} : ${VAX420} ${SCSI} ${SIM} ${BUILD_ROMS} ${MKDIRBIN} ${CC} ${VAX420} ${SCSI} ${SIM} ${VAX42B_OPT} -o $@ ${LDFLAGS} -microvax3100m76 : ${BIN}BuildROMs${EXE} ${BIN}microvax3100m76${EXE} +vaxstation3100m76 : ${BIN}BuildROMs${EXE} ${BIN}vaxstation3100m76${EXE} -${BIN}microvax3100m76${EXE} : ${VAX43} ${SCSI} ${SIM} ${BUILD_ROMS} +${BIN}vaxstation3100m76${EXE} : ${VAX43} ${SCSI} ${SIM} ${BUILD_ROMS} ${MKDIRBIN} ${CC} ${VAX43} ${SCSI} ${SIM} ${VAX43_OPT} -o $@ ${LDFLAGS}