From cc7579b8987e1dad83d9b7173b293143889dc958 Mon Sep 17 00:00:00 2001 From: OBattler Date: Sun, 28 Jan 2018 17:56:32 +0100 Subject: [PATCH] Moved the two Laser XT machines to the Dev branch. --- src/machine/machine.h | 12 +++++------- src/machine/machine_table.c | 22 +++++++++------------- src/rom.c | 20 +++++++------------- src/rom.h | 6 ++++-- src/win/Makefile.mingw | 13 +++++++++++-- 5 files changed, 36 insertions(+), 37 deletions(-) diff --git a/src/machine/machine.h b/src/machine/machine.h index 4c80a70f9..282c14e09 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.17 2018/01/22 + * Version: @(#)machine.h 1.0.18 2018/01/28 * * Authors: Sarah Walker, * Miran Grca, @@ -128,12 +128,10 @@ extern void machine_at_p55tvp4_init(machine_t *); extern void machine_at_i430vx_init(machine_t *); extern void machine_at_p55va_init(machine_t *); -#ifdef DEV_BRANCH -#ifdef USE_I686 +#if defined(DEV_BRANCH) && defined(USE_I686) extern void machine_at_i440fx_init(machine_t *); extern void machine_at_s1668_init(machine_t *); #endif -#endif extern void machine_at_ali1429_init(machine_t *); extern void machine_at_cmdpc_init(machine_t *); @@ -150,11 +148,9 @@ extern void machine_at_r418_init(machine_t *); extern void machine_at_wd76c10_init(machine_t *); -#ifdef DEV_BRANCH -#ifdef USE_GREENB +#if defined(DEV_BRANCH) && defined(USE_GREENB) extern void machine_at_4gpv31_init(machine_t *); #endif -#endif extern void machine_pcjr_init(machine_t *); @@ -186,7 +182,9 @@ extern int tandy1k_eeprom_read(void); extern void machine_xt_init(machine_t *); extern void machine_xt_compaq_init(machine_t *); +#if defined(DEV_BRANCH) && defined(USE_LASERXT) extern void machine_xt_laserxt_init(machine_t *); +#endif #endif /*EMU_MACHINE_H*/ diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index c2aaa7b28..031a09cfa 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.16 2018/01/28 + * Version: @(#)machine_table.c 1.0.17 2018/01/28 * * Authors: Sarah Walker, * Miran Grca, @@ -47,7 +47,9 @@ machine_t machines[] = { { "[8088] Schneider EuroPC", ROM_EUROPC, "europc", {{"Siemens",cpus_europc}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_HDC | MACHINE_VIDEO | MACHINE_MOUSE, 512, 640, 128, 0, machine_europc_init, NULL, NULL }, { "[8088] Tandy 1000", ROM_TANDY, "tandy", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA, 128, 640, 128, 0, machine_tandy1k_init, NULL, NULL }, { "[8088] Tandy 1000 HX", ROM_TANDY1000HX, "tandy1000hx", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA, 256, 640, 128, 0, machine_tandy1k_init, NULL, NULL }, +#if defined(DEV_BRANCH) && defined(USE_LASERXT) { "[8088] VTech Laser Turbo XT", ROM_LTXT, "ltxt", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA, 512, 512, 256, 0, machine_xt_laserxt_init, NULL, NULL }, +#endif { "[8086] Amstrad PC1512", ROM_PC1512, "pc1512", {{"", cpus_pc1512}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_VIDEO | MACHINE_MOUSE, 512, 640, 128, 63, machine_amstrad_init, NULL, nvr_at_close }, { "[8086] Amstrad PC1640", ROM_PC1640, "pc1640", {{"", cpus_8086}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_VIDEO | MACHINE_MOUSE, 640, 640, 0, 63, machine_amstrad_init, NULL, nvr_at_close }, @@ -56,16 +58,16 @@ machine_t machines[] = { { "[8086] Amstrad PC20(0)", ROM_PC200, "pc200", {{"", cpus_8086}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_VIDEO | MACHINE_MOUSE, 512, 640, 128, 63, machine_amstrad_init, NULL, nvr_at_close }, { "[8086] Olivetti M24", ROM_OLIM24, "olivetti_m24", {{"", cpus_8086}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_VIDEO | MACHINE_MOUSE, 128, 640, 128, 0, machine_olim24_init, NULL, NULL }, { "[8086] Tandy 1000 SL/2", ROM_TANDY1000SL2, "tandy1000sl2", {{"", cpus_8086}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA, 512, 768, 128, 0, machine_tandy1k_init, NULL, NULL }, +#if defined(DEV_BRANCH) && defined(USE_LASERXT) { "[8086] VTech Laser XT3", ROM_LXT3, "lxt3", {{"", cpus_8086}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA, 256, 512, 256, 0, machine_xt_laserxt_init, NULL, NULL }, +#endif { "[286 ISA] AMI 286 clone", ROM_AMI286, "ami286", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 512,16384, 128, 127, machine_at_neat_ami_init, NULL, nvr_at_close }, { "[286 ISA] Award 286 clone", ROM_AWARD286, "award286", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 512,16384, 128, 127, machine_at_scat_init, NULL, nvr_at_close }, { "[286 ISA] Commodore PC 30 III", ROM_CMDPC30, "cmdpc30", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 640,16384, 128, 127, machine_at_cmdpc_init, NULL, nvr_at_close }, { "[286 ISA] Compaq Portable II", ROM_PORTABLEII, "portableii", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 640,16384, 128, 127, machine_at_compaq_init, NULL, nvr_at_close }, -#ifdef DEV_BRANCH -#ifdef USE_PORTABLE3 +#if defined(DEV_BRANCH) && defined(USE_PORTABLE3) { "[286 ISA] Compaq Portable III", ROM_PORTABLEIII, "portableiii", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_AT | MACHINE_VIDEO, 640,16384, 128, 127, machine_at_compaq_init, NULL, nvr_at_close }, -#endif #endif { "[286 ISA] Hyundai Super-286TR", ROM_SUPER286TR, "super286tr", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 512,16384, 128, 127, machine_at_scat_init, NULL, nvr_at_close }, { "[286 ISA] IBM AT", ROM_IBMAT, "ibmat", {{"", cpus_ibmat}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 256,15872, 128, 63, machine_at_ibm_init, NULL, nvr_at_close }, @@ -93,10 +95,8 @@ machine_t machines[] = { { "[386DX ISA] Amstrad MegaPC 386DX", ROM_MEGAPCDX, "megapcdx", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC | MACHINE_VIDEO, 1, 32, 1, 127, machine_at_wd76c10_init, NULL, nvr_at_close }, { "[386DX ISA] Award 386DX clone", ROM_AWARD386DX_OPTI495, "award386dx", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 1, 64, 1, 127, machine_at_opti495_init, NULL, nvr_at_close }, { "[386DX ISA] MR 386DX clone", ROM_MR386DX_OPTI495, "mr386dx", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 1, 64, 1, 127, machine_at_opti495_ami_init, NULL, nvr_at_close }, -#ifdef DEV_BRANCH -#ifdef USE_PORTABLE3 +#if defined(DEV_BRANCH) && defined(USE_PORTABLE3) { "[386DX ISA] Compaq Portable III (386)", ROM_PORTABLEIII386, "portableiii386", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_AT | MACHINE_HDC | MACHINE_VIDEO, 1, 14, 1, 127, machine_at_compaq_init, NULL, nvr_at_close }, -#endif #endif { "[386DX MCA] IBM PS/2 model 80", ROM_IBMPS2_M80, "ibmps2_m80", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, 1, MACHINE_MCA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC_PS2, 1, 12, 1, 63, machine_ps2_model_80_init, NULL, nvr_at_close }, @@ -113,11 +113,9 @@ machine_t machines[] = { { "[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, nvr_at_close }, -#ifdef DEV_BRANCH -#ifdef USE_GREENB +#if defined(DEV_BRANCH) && defined(USE_GREENB) { "[486 VLB] Green-B 4GP V3.1", ROM_4GPV31, "4gpv31", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_VLB | MACHINE_AT, 1, 128, 1, 127, machine_at_4gpv31_init, NULL, nvr_at_close }, #endif -#endif { "[Socket 4 LX] Intel Premiere/PCI", ROM_REVENGE, "revenge", {{"Intel", cpus_Pentium5V}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 2, 128, 2, 127, machine_at_batman_init, NULL, nvr_at_close }, @@ -142,11 +140,9 @@ machine_t machines[] = { { "[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, nvr_at_close }, { "[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, nvr_at_close }, -#ifdef DEV_BRANCH -#ifdef USE_I686 +#if defined(DEV_BRANCH) && defined(USE_I686) { "[Socket 8 FX] Tyan Titan-Pro AT", ROM_440FX, "440fx", {{"Intel", cpus_PentiumPro}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 1024, 8, 127, machine_at_i440fx_init, NULL, nvr_at_close }, { "[Socket 8 FX] Tyan Titan-Pro ATX", ROM_S1668, "tpatx", {{"Intel", cpus_PentiumPro}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 1024, 8, 127, machine_at_s1668_init, NULL, nvr_at_close }, -#endif #endif { "", -1, "", {{"", 0}, {"", 0}, {"", 0}}, 0,0,0,0, 0 } }; diff --git a/src/rom.c b/src/rom.c index 6284b49cd..a92af40c4 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.27 2018/01/25 + * Version: @(#)rom.c 1.0.28 2018/01/28 * * Authors: Sarah Walker, * Miran Grca, @@ -410,8 +410,7 @@ rom_load_bios(int rom_id) biosmask = 0x7fff; return(1); -#ifdef DEV_BRANCH -#ifdef USE_PORTABLE3 +#if defined(DEV_BRANCH) && defined(USE_PORTABLE3) case ROM_PORTABLEIII: case ROM_PORTABLEIII386: if (rom_load_interleaved( @@ -419,7 +418,6 @@ rom_load_bios(int rom_id) L"roms/machines/portableiii/109737-002.bin", 0x000000, 65536, 0, rom)) return(1); break; -#endif #endif case ROM_DTKXT: @@ -577,8 +575,7 @@ rom_load_bios(int rom_id) biosmask = 0x1ffff; return(1); -#ifdef DEV_BRANCH -#ifdef USE_PORTABLE3 +#if defined(DEV_BRANCH) && defined(USE_PORTABLE3) case ROM_DESKPRO_386: if (! rom_load_interleaved( L"roms/machines/deskpro386/109592-005.u11.bin", @@ -586,7 +583,6 @@ rom_load_bios(int rom_id) 0x000000, 32768, 0, rom)) break; biosmask = 0x7fff; return(1); -#endif #endif case ROM_AMIXT: @@ -595,6 +591,7 @@ rom_load_bios(int rom_id) 0x00e000, 8192, 0, rom)) return(1); break; +#if defined(DEV_BRANCH) && defined(USE_LASERXT) case ROM_LTXT: if (rom_load_linear( L"roms/machines/ltxt/27c64.bin", @@ -606,6 +603,7 @@ rom_load_bios(int rom_id) L"roms/machines/lxt3/27c64d.bin", 0x00e000, 8192, 0, rom)) return(1); break; +#endif case ROM_SPC4200P: /* Samsung SPC-4200P */ if (rom_load_linear( @@ -746,8 +744,7 @@ rom_load_bios(int rom_id) biosmask = 0x1ffff; return(1); -#ifdef DEV_BRANCH -#ifdef USE_I686 +#if defined(DEV_BRANCH) && defined(USE_I686) case ROM_440FX: /* working Tyan BIOS */ if (! rom_load_linear( L"roms/machines/440fx/ntmaw501.bin", @@ -761,7 +758,6 @@ rom_load_bios(int rom_id) 0x000000, 131072, 0, rom)) break; biosmask = 0x1ffff; return(1); -#endif #endif case ROM_THOR: @@ -822,14 +818,12 @@ rom_load_bios(int rom_id) biosmask = 0x1ffff; return(1); -#ifdef DEV_BRANCH -#ifdef USE_GREENB +#if defined(DEV_BRANCH) && defined(USE_GREENB) case ROM_4GPV31: if (! rom_load_linear( L"roms/machines/green-b/4gpv31-ami-1993-8273517.bin", 0x000000, 65536, 0, rom)) break; return(1); -#endif #endif case ROM_T3100E: diff --git a/src/rom.h b/src/rom.h index b88b58ea1..2069fdee9 100644 --- a/src/rom.h +++ b/src/rom.h @@ -8,7 +8,7 @@ * * Definitions for the ROM image handler. * - * Version: @(#)rom.h 1.0.12 2018/01/25 + * Version: @(#)rom.h 1.0.13 2018/01/28 * * Author: Fred N. van Kempen, * Copyright 2018 Fred N. van Kempen. @@ -45,10 +45,12 @@ enum { ROM_GENXT, /* 'Generic XT BIOS' */ ROM_JUKOPC, ROM_PORTABLE, - ROM_LTXT, ROM_PXXT, +#if defined(DEV_BRANCH) && defined(USE_LASERXT) + ROM_LTXT, ROM_LXT3, +#endif ROM_IBMPCJR, ROM_TANDY, diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw index 0d76e8ff9..f499992be 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.95 2018/01/28 +# Version: @(#)Makefile.mingw 1.0.96 2018/01/28 # # Authors: Miran Grca, # Fred N. van Kempen, @@ -71,6 +71,9 @@ endif ifndef I686 I686 := n endif +ifndef LASERXT +LASERXT := n +endif ifndef NV_RIVA NV_RIVA := n endif @@ -112,6 +115,7 @@ DEV_BRANCH := y CIRRUS := y GREENB := y I686 := y +LASERXT := y NV_RIVA := y PAS16 := y PORTABLE3 := y @@ -319,6 +323,11 @@ OPTS += -DUSE_I686 DEVBROBJ += m_at_440fx.o endif +ifeq ($(LASERXT), y) +OPTS += -DUSE_LASERXT +DEVBROBJ += m_xt_laserxt.o +endif + ifeq ($(NV_RIVA), y) OPTS += -DUSE_RIVA DEVBROBJ += vid_nv_riva128.o @@ -371,7 +380,7 @@ CPUOBJ := cpu.o cpu_table.o \ MCHOBJ := machine.o machine_table.o \ m_amstrad.o m_europc.o m_europc_hdc.o \ m_olivetti_m24.o m_tandy.o \ - m_xt.o m_xt_compaq.o m_xt_laserxt.o \ + m_xt.o m_xt_compaq.o \ m_at.o m_at_ali1429.o m_at_commodore.o \ m_at_neat.o m_at_headland.o \ m_at_t3100e.o \