From f8f702157d85c5a96ed2cded50122a7b6414ac2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Banaan=20Ananas?= Date: Wed, 19 Feb 2014 18:38:17 +0000 Subject: [PATCH] gdarius is COH-1002T, the other fx1b games have 1MB VRAM --- src/emu/cpu/mn10200/mn10200.c | 4 ++-- src/emu/cpu/mn10200/mn10200.h | 2 +- src/mame/audio/taito_zm.c | 2 +- src/mame/drivers/zn.c | 21 +++++++++++++++++---- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/emu/cpu/mn10200/mn10200.c b/src/emu/cpu/mn10200/mn10200.c index cbd521f2bc5..d032275c6f2 100644 --- a/src/emu/cpu/mn10200/mn10200.c +++ b/src/emu/cpu/mn10200/mn10200.c @@ -33,14 +33,14 @@ enum mn10200_flag FLAG_D15 = 0x8000 // ? }; -const device_type MN10200 = &device_creator; +const device_type MN1020012A = &device_creator; static ADDRESS_MAP_START( mn1020012_internal_map, AS_PROGRAM, 16, mn10200_device ) AM_RANGE(0x00fc00, 0x00ffff) AM_READWRITE8(io_control_r, io_control_w, 0xffff) ADDRESS_MAP_END mn10200_device::mn10200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : cpu_device(mconfig, MN10200, "MN10200", tag, owner, clock, "mn10200", __FILE__), + : cpu_device(mconfig, MN1020012A, "MN1020012A", tag, owner, clock, "mn1020012a", __FILE__), m_program_config("program", ENDIANNESS_LITTLE, 16, 24, 0, ADDRESS_MAP_NAME(mn1020012_internal_map)), m_io_config("data", ENDIANNESS_LITTLE, 8, 8, 0) { diff --git a/src/emu/cpu/mn10200/mn10200.h b/src/emu/cpu/mn10200/mn10200.h index 36674a39188..4fa67fd7bdb 100644 --- a/src/emu/cpu/mn10200/mn10200.h +++ b/src/emu/cpu/mn10200/mn10200.h @@ -48,7 +48,7 @@ enum }; -extern const device_type MN10200; +extern const device_type MN1020012A; #define MN10200_NUM_PRESCALERS (2) diff --git a/src/mame/audio/taito_zm.c b/src/mame/audio/taito_zm.c index 7a2f0316c06..4e505326232 100644 --- a/src/mame/audio/taito_zm.c +++ b/src/mame/audio/taito_zm.c @@ -171,7 +171,7 @@ MACHINE_CONFIG_FRAGMENT( taito_zoom_sound ) /* basic machine hardware */ MCFG_TAITO_ZOOM_ADD("taito_zoom") - MCFG_CPU_ADD("mn10200", MN10200, XTAL_25MHz/2) + MCFG_CPU_ADD("mn10200", MN1020012A, XTAL_25MHz/2) MCFG_CPU_PROGRAM_MAP(taitozoom_mn_map) MCFG_CPU_IO_MAP(taitozoom_mn_io_map) diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c index 077faf205bb..a25605d86d1 100644 --- a/src/mame/drivers/zn.c +++ b/src/mame/drivers/zn.c @@ -93,6 +93,7 @@ public: DECLARE_MACHINE_RESET(coh1000c); DECLARE_MACHINE_RESET(coh1000ta); DECLARE_MACHINE_RESET(coh1000tb); + DECLARE_MACHINE_RESET(coh1002tb); DECLARE_MACHINE_RESET(coh1002e); DECLARE_MACHINE_RESET(bam2); DECLARE_MACHINE_RESET(coh1001l); @@ -1205,7 +1206,19 @@ MACHINE_RESET_MEMBER(zn_state,coh1000tb) membank( "bankedroms" )->set_base( memregion( "bankedroms" )->base() ); /* banked game rom */ } -static MACHINE_CONFIG_DERIVED(coh1000tb, zn1_2mb_vram) +static MACHINE_CONFIG_DERIVED(coh1000tb, zn1_1mb_vram) + MCFG_CPU_MODIFY("maincpu") + MCFG_CPU_PROGRAM_MAP(coh1000tb_map) + + MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000tb) + MCFG_NVRAM_ADD_1FILL("fm1208s") + + MCFG_MB3773_ADD("mb3773") + + MCFG_FRAGMENT_ADD(taito_zoom_sound) +MACHINE_CONFIG_END + +static MACHINE_CONFIG_DERIVED(coh1002tb, zn1_2mb_vram) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(coh1000tb_map) @@ -4799,9 +4812,9 @@ GAME( 1996, ftimpact, ftimpcta, coh1000tb, zn, zn_state, coh1000tb, ROT0, "Tait GAME( 1996, ftimpactu, ftimpcta, coh1000tb, zn, zn_state, coh1000tb, ROT0, "Taito", "Fighters' Impact (Ver 2.02A)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND ) GAME( 1996, ftimpactj, ftimpcta, coh1000tb, zn, zn_state, coh1000tb, ROT0, "Taito", "Fighters' Impact (Ver 2.02J)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND ) GAME( 1997, ftimpcta, taitofx1, coh1000tb, zn, zn_state, coh1000tb, ROT0, "Taito", "Fighters' Impact A (Ver 2.00J)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND ) -GAME( 1997, gdarius, gdarius2, coh1000tb, zn, zn_state, coh1000tb, ROT0, "Taito", "G-Darius (Ver 2.01J)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND ) -GAME( 1997, gdariusb, gdarius2, coh1000tb, zn, zn_state, coh1000tb, ROT0, "Taito", "G-Darius (Ver 2.02A)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND ) -GAME( 1997, gdarius2, taitofx1, coh1000tb, zn, zn_state, coh1000tb, ROT0, "Taito", "G-Darius Ver.2 (Ver 2.03J)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND ) +GAME( 1997, gdarius, gdarius2, coh1002tb, zn, zn_state, coh1000tb, ROT0, "Taito", "G-Darius (Ver 2.01J)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND ) +GAME( 1997, gdariusb, gdarius2, coh1002tb, zn, zn_state, coh1000tb, ROT0, "Taito", "G-Darius (Ver 2.02A)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND ) +GAME( 1997, gdarius2, taitofx1, coh1002tb, zn, zn_state, coh1000tb, ROT0, "Taito", "G-Darius Ver.2 (Ver 2.03J)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND ) /* Eighting / Raizing */