From 66d09a189a1366b16c36f99971c76a31fdacfa74 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Mon, 26 Apr 2021 00:32:55 +0500 Subject: [PATCH] Properly remove the FIC VIP-IO2 from the dev branch --- src/include/86box/machine.h | 2 -- src/machine/machine_table.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h index 804cc3e4a..318283ebf 100644 --- a/src/include/86box/machine.h +++ b/src/include/86box/machine.h @@ -344,9 +344,7 @@ extern int machine_at_486sp3_init(const machine_t *); extern int machine_at_486sp3c_init(const machine_t *); extern int machine_at_486sp3g_init(const machine_t *); extern int machine_at_486ap4_init(const machine_t *); -#if defined(DEV_BRANCH) && defined(NO_SIO) extern int machine_at_486vipio2_init(const machine_t *); -#endif extern int machine_at_abpb4_init(const machine_t *); extern int machine_at_win486pci_init(const machine_t *); diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index b8390528a..924c3c140 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -249,9 +249,7 @@ const machine_t machines[] = { { "[STPC Consumer-II] Acrosser AR-B1479", "arb1479", MACHINE_TYPE_486, CPU_PKG_STPC, 0, 66666667, 66666667, 0, 0, 2.0, 2.0, MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL, 32768, 163840, 8192, 255, machine_at_arb1479_init, NULL }, { "[STPC Elite] Advantech PCM-9340", "pcm9340", MACHINE_TYPE_486, CPU_PKG_STPC, 0, 66666667, 66666667, 0, 0, 2.0, 2.0, MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL, 32768, 98304, 8192, 255, machine_at_pcm9340_init, NULL }, { "[STPC Atlas] AAEON PCM-5330", "pcm5330", MACHINE_TYPE_486, CPU_PKG_STPC, 0, 66666667, 66666667, 0, 0, 2.0, 2.0, MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL, 32768, 131072,32768, 255, machine_at_pcm5330_init, NULL }, -#if defined(DEV_BRANCH) && defined(NO_SIO) { "[VIA VT82C496G] FIC VIP-IO2", "486vipio2", MACHINE_TYPE_486, CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0, MACHINE_PCIV | MACHINE_IDE_DUAL, 1024, 131072, 1024, 255, machine_at_486vipio2_init, NULL }, -#endif /* Socket 4 machines */ /* 430LX */