From f484b49573f81d1ec12731f1d60edbe0bbf286f1 Mon Sep 17 00:00:00 2001 From: AJR Date: Sun, 4 Mar 2018 09:39:37 -0500 Subject: [PATCH] 315-5195 mapper has same clock as CPU (nw) --- src/mame/drivers/segaorun.cpp | 4 +++- src/mame/drivers/segas16b.cpp | 6 ++++-- src/mame/drivers/segas18.cpp | 4 +++- src/mame/machine/segaic16.h | 6 +++--- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/mame/drivers/segaorun.cpp b/src/mame/drivers/segaorun.cpp index d0cb1a1a920..33536e51c3a 100644 --- a/src/mame/drivers/segaorun.cpp +++ b/src/mame/drivers/segaorun.cpp @@ -1164,7 +1164,9 @@ MACHINE_CONFIG_START(segaorun_state::outrun_base) MCFG_I8255_IN_PORTC_CB(READ8(segaorun_state, unknown_portc_r)) MCFG_I8255_OUT_PORTC_CB(WRITE8(segaorun_state, video_control_w)) - MCFG_SEGA_315_5195_MAPPER_ADD("mapper", "maincpu", segaorun_state, memory_mapper) + MCFG_DEVICE_ADD("mapper", SEGA_315_5195_MEM_MAPPER, MASTER_CLOCK/4) + MCFG_SEGA_315_5195_CPU("maincpu") + MCFG_SEGA_315_5195_MAPPER_HANDLER(segaorun_state, memory_mapper) MCFG_SEGA_315_5195_PBF_CALLBACK(INPUTLINE("soundcpu", INPUT_LINE_NMI)) // video hardware diff --git a/src/mame/drivers/segas16b.cpp b/src/mame/drivers/segas16b.cpp index f71dd535b96..a86d6a93f3f 100644 --- a/src/mame/drivers/segas16b.cpp +++ b/src/mame/drivers/segas16b.cpp @@ -881,7 +881,7 @@ S11 S13 S15 S17 |EPR12194 - - - EPR12195 - - // CONSTANTS //************************************************************************** -#define MASTER_CLOCK_10MHz XTAL(10'000'000) +#define MASTER_CLOCK_10MHz XTAL(20'000'000) / 2 #define MASTER_CLOCK_8MHz XTAL(8'000'000) #define MASTER_CLOCK_25MHz XTAL(25'174'800) @@ -3710,7 +3710,9 @@ MACHINE_CONFIG_START(segas16b_state::system16b) MCFG_NVRAM_ADD_0FILL("nvram") - MCFG_SEGA_315_5195_MAPPER_ADD("mapper", "maincpu", segas16b_state, memory_mapper) + MCFG_DEVICE_ADD("mapper", SEGA_315_5195_MEM_MAPPER, MASTER_CLOCK_10MHz) + MCFG_SEGA_315_5195_CPU("maincpu") + MCFG_SEGA_315_5195_MAPPER_HANDLER(segas16b_state, memory_mapper) MCFG_SEGA_315_5195_PBF_CALLBACK(INPUTLINE("soundcpu", 0)) // video hardware diff --git a/src/mame/drivers/segas18.cpp b/src/mame/drivers/segas18.cpp index 481a9f0a8ca..6d6faf7efd8 100644 --- a/src/mame/drivers/segas18.cpp +++ b/src/mame/drivers/segas18.cpp @@ -1307,7 +1307,9 @@ MACHINE_CONFIG_START(segas18_state::system18) MCFG_NVRAM_ADD_0FILL("nvram") - MCFG_SEGA_315_5195_MAPPER_ADD("mapper", "maincpu", segas18_state, memory_mapper) + MCFG_DEVICE_ADD("mapper", SEGA_315_5195_MEM_MAPPER, 10000000) + MCFG_SEGA_315_5195_CPU("maincpu") + MCFG_SEGA_315_5195_MAPPER_HANDLER(segas18_state, memory_mapper) MCFG_SEGA_315_5195_PBF_CALLBACK(INPUTLINE("soundcpu", INPUT_LINE_NMI)) MCFG_DEVICE_ADD("io", SEGA_315_5296, 16000000) diff --git a/src/mame/machine/segaic16.h b/src/mame/machine/segaic16.h index 53e6f67f00c..baf37378c41 100644 --- a/src/mame/machine/segaic16.h +++ b/src/mame/machine/segaic16.h @@ -21,9 +21,9 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MCFG_SEGA_315_5195_MAPPER_ADD(_tag, _cputag, _class, _mapper) \ - MCFG_DEVICE_ADD(_tag, SEGA_315_5195_MEM_MAPPER, 0) \ - downcast(*device).set_cputag("^" _cputag); \ +#define MCFG_SEGA_315_5195_CPU(_cputag) \ + downcast(*device).set_cputag("^" _cputag); +#define MCFG_SEGA_315_5195_MAPPER_HANDLER(_class, _mapper) \ downcast(*device).set_mapper(sega_315_5195_mapper_device::mapper_delegate(&_class::_mapper, #_class "::" #_mapper, nullptr, (_class *)nullptr)); #define MCFG_SEGA_315_5195_PBF_CALLBACK(_devcb) \ devcb = &downcast(*device).set_pbf_callback(DEVCB_##_devcb);