From 76383d372221fb743b93b50fe0d47ae5bbfd6e4b Mon Sep 17 00:00:00 2001 From: OBattler Date: Sat, 18 Jan 2020 08:42:55 +0100 Subject: [PATCH] Moved the ValuePoint to the Dev branch until its floppy mess is some day sorted out. --- src/machine/m_at_socket4_5.c | 7 +++++++ src/machine/machine.h | 2 ++ src/machine/machine_table.c | 2 ++ src/machine/machine_table_new.c | 2 ++ src/win/Makefile.mingw | 12 +++++++++++- src/win/Makefile_ndr.mingw | 10 ++++++++++ 6 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/machine/m_at_socket4_5.c b/src/machine/m_at_socket4_5.c index a4dee9a77..7053eef6b 100644 --- a/src/machine/m_at_socket4_5.c +++ b/src/machine/m_at_socket4_5.c @@ -104,6 +104,7 @@ machine_at_batman_init(const machine_t *model) return ret; } + int machine_at_ambradp60_init(const machine_t *model) { @@ -122,6 +123,8 @@ machine_at_ambradp60_init(const machine_t *model) return ret; } + +#if defined(DEV_BRANCH) && defined(USE_VPP60) int machine_at_valuepointp60_init(const machine_t *model) { @@ -139,6 +142,8 @@ machine_at_valuepointp60_init(const machine_t *model) return ret; } +#endif + int machine_at_586mc1_init(const machine_t *model) @@ -177,6 +182,7 @@ machine_at_plato_init(const machine_t *model) return ret; } + int machine_at_ambradp90_init(const machine_t *model) { @@ -195,6 +201,7 @@ machine_at_ambradp90_init(const machine_t *model) return ret; } + int machine_at_430nx_init(const machine_t *model) { diff --git a/src/machine/machine.h b/src/machine/machine.h index bd0561a98..474d97738 100644 --- a/src/machine/machine.h +++ b/src/machine/machine.h @@ -240,7 +240,9 @@ extern int machine_at_portableiii386_init(const machine_t *); /* m_at_socket4_5.c */ extern int machine_at_batman_init(const machine_t *); extern int machine_at_ambradp60_init(const machine_t *); +#if defined(DEV_BRANCH) && defined(USE_VPP60) extern int machine_at_valuepointp60_init(const machine_t *); +#endif extern int machine_at_586mc1_init(const machine_t *); extern int machine_at_plato_init(const machine_t *); diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index 1ad05263d..8c6afafed 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -174,7 +174,9 @@ const machine_t machines[] = { { "[Socket 4 LX] Intel Premiere/PCI", "revenge", {{"Intel", cpus_Pentium5V}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 2, 128, 2, 127, machine_at_batman_init, NULL }, { "[Socket 4 LX] IBM Ambra DP60 PCI", "ambradp60", {{"Intel", cpus_Pentium5V}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 2, 128, 2, 127, machine_at_ambradp60_init, NULL }, +#if defined(DEV_BRANCH) && defined(USE_VPP60) { "[Socket 4 LX] IBM PS/ValuePoint P60", "valuepointp60", {{"Intel", cpus_Pentium5V}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 2, 128, 2, 127, machine_at_valuepointp60_init, NULL }, +#endif { "[Socket 4 LX] Micro Star 586MC1", "586mc1", {{"Intel", cpus_Pentium5V}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 2, 128, 2, 127, machine_at_586mc1_init, NULL }, { "[Socket 5 NX] Intel Premiere/PCI II", "plato", MACHINE_CPUS_PENTIUM_S5, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 2, 128, 2, 127, machine_at_plato_init, NULL }, diff --git a/src/machine/machine_table_new.c b/src/machine/machine_table_new.c index fd8f3ba01..9abb9880b 100644 --- a/src/machine/machine_table_new.c +++ b/src/machine/machine_table_new.c @@ -159,7 +159,9 @@ const machine_t machines[] = { { "[Socket 4 LX] Intel Premiere/PCI", "revenge", {{"Intel", cpus_Pentium5V}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 2, 128, 2, 127, machine_at_batman_init, NULL }, { "[Socket 4 LX] IBM Ambra DP60 PCI", "ambradp60", {{"Intel", cpus_Pentium5V}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 2, 128, 2, 127, machine_at_ambradp60_init, NULL }, +#if defined(DEV_BRANCH) && defined(USE_VPP60) { "[Socket 4 LX] IBM PS/ValuePoint P60", "valuepointp60", {{"Intel", cpus_Pentium5V}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 2, 128, 2, 127, machine_at_valuepointp60_init, NULL }, +#endif { "[Socket 4 LX] Micro Star 586MC1", "586mc1", {{"Intel", cpus_Pentium5V}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 2, 128, 2, 127, machine_at_586mc1_init, NULL }, { "[Socket 5 NX] Intel Premiere/PCI II", "plato", MACHINE_CPUS_PENTIUM_S5, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 2, 128, 2, 127, machine_at_plato_init, NULL }, diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw index cd46ec67d..15b579cf3 100644 --- a/src/win/Makefile.mingw +++ b/src/win/Makefile.mingw @@ -8,7 +8,7 @@ # # Makefile for Win32 (MinGW32) environment. # -# Version: @(#)Makefile.mingw 1.0.141 2020/01/14 +# Version: @(#)Makefile.mingw 1.0.142 2020/01/18 # # Authors: Miran Grca, # Fred N. van Kempen, @@ -83,6 +83,9 @@ ifeq ($(DEV_BUILD), y) ifndef VECTRA54 VECTRA54 := y endif + ifndef VPP60 + VP660 := y + endif ifndef SIEMENS SIEMENS := y endif @@ -147,6 +150,9 @@ else ifndef VECTRA54 VECTRA54 := n endif + ifndef VPP60 + VP660 := n + endif ifndef SIEMENS SIEMENS := n endif @@ -506,6 +512,10 @@ ifeq ($(VECTRA54), y) OPTS += -DUSE_VECTRA54 endif +ifeq ($(VPP60), y) +OPTS += -DUSE_VPP60 +endif + ifeq ($(SIEMENS), y) OPTS += -DUSE_SIEMENS endif diff --git a/src/win/Makefile_ndr.mingw b/src/win/Makefile_ndr.mingw index 51bab0847..1ef8540d9 100644 --- a/src/win/Makefile_ndr.mingw +++ b/src/win/Makefile_ndr.mingw @@ -83,6 +83,9 @@ ifeq ($(DEV_BUILD), y) ifndef VECTRA54 VECTRA54 := y endif + ifndef VPP60 + VPP60 := y + endif ifndef SIEMENS SIEMENS := y endif @@ -147,6 +150,9 @@ else ifndef VECTRA54 VECTRA54 := n endif + ifndef VPP60 + VPP60 := n + endif ifndef SIEMENS SIEMENS := n endif @@ -512,6 +518,10 @@ ifeq ($(VECTRA54), y) OPTS += -DUSE_VECTRA54 endif +ifeq ($(VPP60), y) +OPTS += -DUSE_VPP60 +endif + ifeq ($(SIEMENS), y) OPTS += -DUSE_SIEMENS endif