From 4b64212b357cd76d8457211b5d609e8c5130515d Mon Sep 17 00:00:00 2001 From: OBattler Date: Wed, 12 Sep 2018 14:42:13 +0200 Subject: [PATCH] Added the Jetway J656VXD (430VX-based Award PCI machine); Moved the IBM PS/2 Model 70 Type 4 to the DEV branch. --- src/machine/m_at_4x0.c | 22 +++++++++++++++++++++- src/machine/m_at_neat.c | 24 ++++++++++++------------ src/machine/m_ps2_mca.c | 15 +++------------ src/machine/machine.h | 12 ++++-------- src/machine/machine_table.c | 9 +++++---- src/nvr_ps2.c | 6 +++++- src/rom.c | 19 ++++++++++--------- src/rom.h | 26 ++++++++------------------ src/video/vid_table.c | 8 +++++++- src/win/Makefile.mingw | 12 +++++++++++- 10 files changed, 86 insertions(+), 67 deletions(-) diff --git a/src/machine/m_at_4x0.c b/src/machine/m_at_4x0.c index 29833ab99..5a84147a7 100644 --- a/src/machine/m_at_4x0.c +++ b/src/machine/m_at_4x0.c @@ -8,7 +8,7 @@ * * Implementation of the Intel PCISet chips from 430LX to 440FX. * - * Version: @(#)m_at_430lx_nx.c 1.0.0 2018/05/09 + * Version: @(#)m_at_430lx_nx.c 1.0.1 2018/09/12 * * Authors: Sarah Walker, * Miran Grca, @@ -871,6 +871,26 @@ machine_at_p55va_init(const machine_t *model) } +void +machine_at_j656vxd_init(const machine_t *model) +{ + machine_at_common_init(model); + device_add(&keyboard_ps2_pci_device); + + pci_init(PCI_CONFIG_TYPE_1); + pci_register_slot(0x00, PCI_CARD_SPECIAL, 0, 0, 0, 0); + pci_register_slot(0x11, PCI_CARD_NORMAL, 1, 2, 3, 4); + pci_register_slot(0x12, PCI_CARD_NORMAL, 2, 3, 4, 1); + pci_register_slot(0x13, PCI_CARD_NORMAL, 3, 4, 1, 2); + pci_register_slot(0x07, PCI_CARD_SPECIAL, 0, 0, 0, 0); + device_add(&i430vx_device); + device_add(&piix3_device); + fdc37c669_init(); + + device_add(&intel_flash_bxt_device); +} + + #if defined(DEV_BRANCH) && defined(USE_I686) void machine_at_i440fx_init(const machine_t *model) diff --git a/src/machine/m_at_neat.c b/src/machine/m_at_neat.c index 59524c3cb..0de13c233 100644 --- a/src/machine/m_at_neat.c +++ b/src/machine/m_at_neat.c @@ -13,7 +13,7 @@ * 8MB of DRAM chips', because it works fine with bus-based * memory expansion. * - * Version: @(#)m_at_neat.c 1.0.2 2018/09/03 + * Version: @(#)m_at_neat.c 1.0.3 2018/09/12 * * Author: Fred N. van Kempen, * @@ -872,22 +872,22 @@ neat_init(void) void machine_at_neat_init(const machine_t *model) { - machine_at_init(model); - - neat_init(); - - device_add(&fdc_at_device); + machine_at_init(model); + + neat_init(); + + device_add(&fdc_at_device); } void machine_at_neat_ami_init(const machine_t *model) { - machine_at_common_init(model); + machine_at_common_init(model); - neat_init(); - - device_add(&keyboard_at_ami_device); - - device_add(&fdc_at_device); + neat_init(); + + device_add(&keyboard_at_ami_device); + + device_add(&fdc_at_device); } diff --git a/src/machine/m_ps2_mca.c b/src/machine/m_ps2_mca.c index 92390e629..68c5f6dee 100644 --- a/src/machine/m_ps2_mca.c +++ b/src/machine/m_ps2_mca.c @@ -8,7 +8,7 @@ * * Implementation of MCA-based PS/2 machines. * - * Version: @(#)m_ps2_mca.c 1.0.0 2018/09/02 + * Version: @(#)m_ps2_mca.c 1.0.1 2018/09/12 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -1274,6 +1274,7 @@ machine_ps2_model_70_type3_init(const machine_t *model) ps2_mca_board_model_70_type34_init(0); } +#if defined(DEV_BRANCH) && defined(USE_PS2M70T4) void machine_ps2_model_70_type4_init(const machine_t *model) { @@ -1281,6 +1282,7 @@ machine_ps2_model_70_type4_init(const machine_t *model) ps2_mca_board_model_70_type34_init(1); } +#endif void machine_ps2_model_80_init(const machine_t *model) @@ -1289,14 +1291,3 @@ machine_ps2_model_80_init(const machine_t *model) ps2_mca_board_model_80_type2_init(0); } - - -#ifdef WALTJE -void -machine_ps2_model_80_486_init(const machine_t *model) -{ - machine_ps2_common_init(model); - - ps2_mca_board_model_80_type2_init(1); -} -#endif diff --git a/src/machine/machine.h b/src/machine/machine.h index 3293501db..1dfb1577a 100644 --- a/src/machine/machine.h +++ b/src/machine/machine.h @@ -8,7 +8,7 @@ * * Handling of the emulated machines. * - * Version: @(#)machine.h 1.0.27 2018/09/02 + * Version: @(#)machine.h 1.0.28 2018/09/12 * * Authors: Sarah Walker, * Miran Grca, @@ -124,6 +124,7 @@ extern void machine_at_plato_init(const machine_t *); extern void machine_at_p55tvp4_init(const machine_t *); extern void machine_at_i430vx_init(const machine_t *); extern void machine_at_p55va_init(const machine_t *); +extern void machine_at_j656vxd_init(const machine_t *); #if defined(DEV_BRANCH) && defined(USE_I686) extern void machine_at_i440fx_init(const machine_t *); @@ -146,10 +147,6 @@ extern void machine_at_r418_init(const machine_t *); extern void machine_at_wd76c10_init(const machine_t *); -#if defined(DEV_BRANCH) && defined(USE_GREENB) -extern void machine_at_4gpv31_init(const machine_t *); -#endif - extern void machine_pcjr_init(const machine_t *); extern void machine_ps1_m2011_init(const machine_t *); @@ -166,11 +163,10 @@ extern void machine_ps2_m30_286_init(const machine_t *); extern void machine_ps2_model_50_init(const machine_t *); extern void machine_ps2_model_55sx_init(const machine_t *); extern void machine_ps2_model_70_type3_init(const machine_t *); +#if defined(DEV_BRANCH) && defined(USE_PS2M70T4) extern void machine_ps2_model_70_type4_init(const machine_t *); -extern void machine_ps2_model_80_init(const machine_t *); -#ifdef WALTJE -extern void machine_ps2_model_80_486_init(const machine_t *); #endif +extern void machine_ps2_model_80_init(const machine_t *); extern void machine_amstrad_init(const machine_t *); diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index 8f18e6296..2250721cc 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -11,7 +11,7 @@ * NOTES: OpenAT wip for 286-class machine with open BIOS. * PS2_M80-486 wip, pending receipt of TRM's for machine. * - * Version: @(#)machine_table.c 1.0.36 2018/09/03 + * Version: @(#)machine_table.c 1.0.37 2018/09/12 * * Authors: Sarah Walker, * Miran Grca, @@ -79,9 +79,6 @@ const machine_t machines[] = { { "[286 ISA] IBM XT Model 286", ROM_IBMXT286, "ibmxt286", {{"", cpus_ibmxt286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 256,15872, 128, 127, machine_at_ibm_init, NULL }, { "[286 ISA] Samsung SPC-4200P", ROM_SPC4200P, "spc4200p", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_PS2, 512, 2048, 128, 127, machine_at_scat_init, NULL }, { "[286 ISA] Samsung SPC-4216P", ROM_SPC4216P, "spc4216p", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_PS2, 1, 5, 1, 127, machine_at_scat_init, NULL }, -#ifdef WALTJE - { "[286 ISA] OpenAT 286", ROM_OPENAT, "open_at", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 512, 4096, 128, 127, machine_at_init, NULL }, -#endif { "[286 ISA] Toshiba T3100e", ROM_T3100E, "t3100e", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 1024, 5120, 256, 63, machine_at_t3100e_init, NULL }, { "[286 ISA] Trigem 286M", ROM_TG286M, "tg286m", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_VIDEO, 512, 8192, 128, 127, machine_at_headland_init, at_tg286_get_device }, @@ -115,7 +112,9 @@ const machine_t machines[] = { { "[486 ISA] DTK PKM-0038S E-2", ROM_DTK486, "dtk486", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC, 1, 128, 1, 127, machine_at_dtk486_init, NULL }, { "[486 ISA] IBM PS/1 model 2133", ROM_IBMPS1_2133, "ibmps1_2133", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 1, 64, 1, 127, machine_ps1_m2133_init, NULL }, +#if defined(DEV_BRANCH) && defined(USE_PS2M70T4) { "[486 MCA] IBM PS/2 model 70 (type 4)", ROM_IBMPS2_M70_TYPE4, "ibmps2_m70_type4", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}, {"", NULL}, {"", NULL}}, 0, MACHINE_MCA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC_PS2 | MACHINE_VIDEO, 2, 16, 2, 63, machine_ps2_model_70_type4_init, NULL }, +#endif { "[486 PCI] Rise Computer R418", ROM_R418, "r418", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC, 1, 255, 1, 127, machine_at_r418_init, NULL }, @@ -145,6 +144,7 @@ const machine_t machines[] = { { "[Socket 7 VX] ASUS P/I-P55TVP4", ROM_P55TVP4, "p55tvp4", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"AMD", cpus_K56}, {"Cyrix", cpus_6x86},{"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_p55tvp4_init, NULL }, { "[Socket 7 VX] Award 430VX PCI", ROM_430VX, "430vx", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"AMD", cpus_K56}, {"Cyrix", cpus_6x86},{"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_i430vx_init, NULL }, { "[Socket 7 VX] Epox P55-VA", ROM_P55VA, "p55va", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"AMD", cpus_K56}, {"Cyrix", cpus_6x86},{"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_p55va_init, NULL }, + { "[Socket 7 VX] Jetway J656VXD", ROM_J656VXD, "j656vxd", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"AMD", cpus_K56}, {"Cyrix", cpus_6x86},{"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_j656vxd_init, NULL }, #else { "[Socket 5 NX] Intel Premiere/PCI II", ROM_PLATO, "plato", {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 2, 128, 2, 127, machine_at_plato_init, NULL }, @@ -169,6 +169,7 @@ const machine_t machines[] = { { "[Socket 7 VX] ASUS P/I-P55TVP4", ROM_P55TVP4, "p55tvp4", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_p55tvp4_init, NULL }, { "[Socket 7 VX] Award 430VX PCI", ROM_430VX, "430vx", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_i430vx_init, NULL }, { "[Socket 7 VX] Epox P55-VA", ROM_P55VA, "p55va", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_p55va_init, NULL }, + { "[Socket 7 VX] Jetway J656VXD", ROM_J656VXD, "j656vxd", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_j656vxd_init, NULL }, #endif #if defined(DEV_BRANCH) && defined(USE_I686) diff --git a/src/nvr_ps2.c b/src/nvr_ps2.c index 4431d7a4f..665967f48 100644 --- a/src/nvr_ps2.c +++ b/src/nvr_ps2.c @@ -8,7 +8,7 @@ * * Handling of the PS/2 series CMOS devices. * - * Version: @(#)nvr_ps2.c 1.0.7 2018/04/26 + * Version: @(#)nvr_ps2.c 1.0.8 2018/09/12 * * Authors: Fred N. van Kempen, * Sarah Walker, @@ -118,9 +118,11 @@ ps2_nvr_init(const device_t *info) case ROM_IBMPS2_M70_TYPE3: f = nvr_fopen(L"ibmps2_m70_type3_sec.nvr", L"rb"); break; +#if defined(DEV_BRANCH) && defined(USE_PS2M70T4) case ROM_IBMPS2_M70_TYPE4: f = nvr_fopen(L"ibmps2_m70_type4_sec.nvr", L"rb"); break; +#endif case ROM_IBMPS2_M80: f = nvr_fopen(L"ibmps2_m80_sec.nvr", L"rb"); break; @@ -146,9 +148,11 @@ ps2_nvr_close(void *priv) case ROM_IBMPS2_M70_TYPE3: f = nvr_fopen(L"ibmps2_m70_type3_sec.nvr", L"wb"); break; +#if defined(DEV_BRANCH) && defined(USE_PS2M70T4) case ROM_IBMPS2_M70_TYPE4: f = nvr_fopen(L"ibmps2_m70_type4_sec.nvr", L"wb"); break; +#endif case ROM_IBMPS2_M80: f = nvr_fopen(L"ibmps2_m80_sec.nvr", L"wb"); break; diff --git a/src/rom.c b/src/rom.c index 49bb7dc4b..1f31b8bf9 100644 --- a/src/rom.c +++ b/src/rom.c @@ -13,7 +13,7 @@ * - c386sx16 BIOS fails checksum * - the loadfont() calls should be done elsewhere * - * Version: @(#)rom.c 1.0.38 2018/08/16 + * Version: @(#)rom.c 1.0.39 2018/09/12 * * Authors: Sarah Walker, * Miran Grca, @@ -407,14 +407,6 @@ rom_load_bios(int rom_id) 0x000000, 65536, 0, rom)) return(1); break; -#ifdef WALTJE - case ROM_OPENAT: /* PC/AT clone with OpenBIOS */ - if (rom_load_linear( - L"roms/machines/open_at/bios.bin", - 0x000000, 65536, 0, rom)) return(1); - break; -#endif - case ROM_GENXT: /* Generic PC-XT clone */ if (rom_load_linear( L"roms/machines/genxt/pcxt.rom", @@ -756,6 +748,7 @@ rom_load_bios(int rom_id) biosmask = 0x1ffff; return(1); +#if defined(DEV_BRANCH) && defined(USE_PS2M70T4) case ROM_IBMPS2_M70_TYPE4: if (! rom_load_interleaved( L"roms/machines/ibmps2_m70_type4/70-b_even.bin", @@ -763,6 +756,7 @@ rom_load_bios(int rom_id) 0x000000, 131072, 0, rom)) break; biosmask = 0x1ffff; return(1); +#endif case ROM_DTK486: if (rom_load_linear( @@ -866,6 +860,13 @@ rom_load_bios(int rom_id) biosmask = 0x1ffff; return(1); + case ROM_J656VXD: + if (! rom_load_linear( + L"roms/machines/j656vxd/J656VXD.BIN", + 0x000000, 131072, 0, rom)) break; + biosmask = 0x1ffff; + return(1); + #if defined(DEV_BRANCH) && defined(USE_I686) case ROM_440FX: /* working Tyan BIOS */ if (! rom_load_linear( diff --git a/src/rom.h b/src/rom.h index b911820fc..5cbb9bbd9 100644 --- a/src/rom.h +++ b/src/rom.h @@ -8,7 +8,7 @@ * * Definitions for the ROM image handler. * - * Version: @(#)rom.h 1.0.18 2018/08/16 + * Version: @(#)rom.h 1.0.19 2018/09/12 * * Author: Fred N. van Kempen, * Copyright 2018 Fred N. van Kempen. @@ -18,16 +18,6 @@ #define PCJR (romset==ROM_IBMPCJR) -#if defined(DEV_BRANCH) && defined(USE_GREENB) -#define AMIBIOS (romset==ROM_AMI386SX || \ - romset==ROM_AMI486 || \ - romset==ROM_WIN486 || \ - romset==ROM_4GPV31) -#else -#define AMIBIOS (romset==ROM_AMI386SX || \ - romset==ROM_AMI486 || \ - romset==ROM_WIN486) -#endif typedef struct { @@ -74,7 +64,7 @@ enum { ROM_AMI286, ROM_AWARD286, ROM_CMDPC30, - ROM_TG286M, + ROM_TG286M, ROM_PORTABLEII, #if defined(DEV_BRANCH) && defined(USE_PORTABLE3) ROM_PORTABLEIII, @@ -87,13 +77,10 @@ enum { ROM_IBMXT286, ROM_SPC4200P, /* Samsung SPC-4200P/SCAT/Phoenix */ ROM_SPC4216P, /* Samsung SPC-4216P/SCAT */ -#ifdef WALTJE - ROM_OPENAT, /* PC/AT clone with Open BIOS */ -#endif ROM_IBMPS2_M50, - ROM_AMA932J, + ROM_AMA932J, ROM_AMI386SX, ROM_KMXC02, ROM_MEGAPC, @@ -127,7 +114,9 @@ enum { ROM_IBMPS1_2133, ROM_IBMPS2_M70_TYPE3, - ROM_IBMPS2_M70_TYPE4, +#if defined(DEV_BRANCH) && defined(USE_PS2M70T4) + ROM_IBMPS2_M70_TYPE4, +#endif ROM_R418, /* Rise Computer R418/SiS 496/497/Award/SMC FDC37C665 */ @@ -156,9 +145,10 @@ enum { ROM_P55T2P4, /* ASUS P/I-P55T2P4/430HX/Award/Winbond W8387F*/ ROM_P55T2S, /* ASUS P/I-P55T2S/430HX/AMI/NS PC87306 */ - ROM_P55TVP4, /* ASUS P/I-P55TVP4/430HX/Award/Winbond W8387F*/ + ROM_P55TVP4, /* ASUS P/I-P55TVP4/430VX/Award/Winbond W8387F*/ ROM_430VX, /* Award 430VX PCI/430VX/Award/UMC UM8669F*/ ROM_P55VA, /* Epox P55-VA/430VX/Award/SMC FDC37C932FR*/ + ROM_J656VXD, /* Jetway J656VXD/430VX/Award/SMC FDC37C669*/ #if defined(DEV_BRANCH) && defined(USE_I686) ROM_440FX, /* Tyan Titan-Pro AT/440FX/Award BIOS/SMC FDC37C665 */ diff --git a/src/video/vid_table.c b/src/video/vid_table.c index 61c4f6ed3..72fdbb530 100644 --- a/src/video/vid_table.c +++ b/src/video/vid_table.c @@ -8,7 +8,7 @@ * * Define all known video cards. * - * Version: @(#)vid_table.c 1.0.35 2018/09/02 + * Version: @(#)vid_table.c 1.0.36 2018/09/12 * * Authors: Miran Grca, * Fred N. van Kempen, @@ -352,7 +352,9 @@ int video_is_mda(void) case ROM_IBMPS2_M50: case ROM_IBMPS2_M55SX: case ROM_IBMPS2_M70_TYPE3: +#if defined(DEV_BRANCH) && defined(USE_PS2M70T4) case ROM_IBMPS2_M70_TYPE4: +#endif case ROM_IBMPS2_M80: case ROM_IBMPS1_2121: case ROM_T3100E: @@ -386,7 +388,9 @@ int video_is_cga(void) case ROM_IBMPS2_M50: case ROM_IBMPS2_M55SX: case ROM_IBMPS2_M70_TYPE3: +#if defined(DEV_BRANCH) && defined(USE_PS2M70T4) case ROM_IBMPS2_M70_TYPE4: +#endif case ROM_IBMPS2_M80: case ROM_IBMPS1_2121: return 0; @@ -419,7 +423,9 @@ int video_is_ega_vga(void) case ROM_IBMPS2_M50: case ROM_IBMPS2_M55SX: case ROM_IBMPS2_M70_TYPE3: +#if defined(DEV_BRANCH) && defined(USE_PS2M70T4) case ROM_IBMPS2_M70_TYPE4: +#endif case ROM_IBMPS2_M80: case ROM_IBMPS1_2121: return 1; diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw index 7593f5bf0..b47eb8310 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.124 2018/09/09 +# Version: @(#)Makefile.mingw 1.0.125 2018/09/12 # # Authors: Miran Grca, # Fred N. van Kempen, @@ -59,6 +59,9 @@ ifeq ($(DEV_BUILD), y) ifndef PORTABLE3 PORTABLE3 := y endif + ifndef PS2M70T4 + PS2M70T4 := y + endif ifndef STEALTH32 STEALTH32 := y endif @@ -99,6 +102,9 @@ else ifndef PORTABLE3 PORTABLE3 := n endif + ifndef PS2M70T4 + PS2M70T4 := n + endif ifndef STEALTH32 STEALTH32 := n endif @@ -379,6 +385,10 @@ ifeq ($(PORTABLE3), y) OPTS += -DUSE_PORTABLE3 endif +ifeq ($(PS2M70T4), y) +OPTS += -DUSE_PS2M70T4 +endif + ifeq ($(STEALTH32), y) OPTS += -DUSE_STEALTH32 DEVBROBJ += vid_icd2061.o