diff options
Diffstat (limited to 'src/mame/drivers/jangou.cpp')
-rw-r--r-- | src/mame/drivers/jangou.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/mame/drivers/jangou.cpp b/src/mame/drivers/jangou.cpp index b5ec0a0cb54..25d2751b802 100644 --- a/src/mame/drivers/jangou.cpp +++ b/src/mame/drivers/jangou.cpp @@ -869,14 +869,14 @@ MACHINE_RESET_MEMBER(jangou_state,jngolady) MACHINE_CONFIG_START(jangou_state::jangou) /* basic machine hardware */ - MCFG_CPU_ADD("cpu0", Z80, MASTER_CLOCK / 8) - MCFG_CPU_PROGRAM_MAP(cpu0_map) - MCFG_CPU_IO_MAP(cpu0_io) - MCFG_CPU_VBLANK_INT_DRIVER("screen", jangou_state, irq0_line_hold) + MCFG_DEVICE_ADD("cpu0", Z80, MASTER_CLOCK / 8) + MCFG_DEVICE_PROGRAM_MAP(cpu0_map) + MCFG_DEVICE_IO_MAP(cpu0_io) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", jangou_state, irq0_line_hold) - MCFG_CPU_ADD("cpu1", Z80, MASTER_CLOCK / 8) - MCFG_CPU_PROGRAM_MAP(cpu1_map) - MCFG_CPU_IO_MAP(cpu1_io) + MCFG_DEVICE_ADD("cpu1", Z80, MASTER_CLOCK / 8) + MCFG_DEVICE_PROGRAM_MAP(cpu1_map) + MCFG_DEVICE_IO_MAP(cpu1_io) MCFG_JANGOU_BLITTER_ADD("blitter", MASTER_CLOCK/4) @@ -894,12 +894,12 @@ MACHINE_CONFIG_START(jangou_state::jangou) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK / 16) - MCFG_AY8910_PORT_A_READ_CB(READ8(jangou_state, input_mux_r)) - MCFG_AY8910_PORT_B_READ_CB(READ8(jangou_state, input_system_r)) + MCFG_DEVICE_ADD("aysnd", AY8910, MASTER_CLOCK / 16) + MCFG_AY8910_PORT_A_READ_CB(READ8(*this, jangou_state, input_mux_r)) + MCFG_AY8910_PORT_B_READ_CB(READ8(*this, jangou_state, input_system_r)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) - MCFG_SOUND_ADD("cvsd", HC55516, MASTER_CLOCK / 1024) + MCFG_DEVICE_ADD("cvsd", HC55516, MASTER_CLOCK / 1024) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) MACHINE_CONFIG_END @@ -908,15 +908,15 @@ MACHINE_CONFIG_START(jangou_state::jngolady) /* basic machine hardware */ - MCFG_CPU_MODIFY("cpu0") - MCFG_CPU_PROGRAM_MAP(jngolady_cpu0_map) + MCFG_DEVICE_MODIFY("cpu0") + MCFG_DEVICE_PROGRAM_MAP(jngolady_cpu0_map) - MCFG_CPU_MODIFY("cpu1") - MCFG_CPU_PROGRAM_MAP(jngolady_cpu1_map) - MCFG_CPU_IO_MAP(jngolady_cpu1_io) + MCFG_DEVICE_MODIFY("cpu1") + MCFG_DEVICE_PROGRAM_MAP(jngolady_cpu1_map) + MCFG_DEVICE_IO_MAP(jngolady_cpu1_io) - MCFG_CPU_ADD("nsc", NSC8105, MASTER_CLOCK / 8) - MCFG_CPU_PROGRAM_MAP(nsc_map) + MCFG_DEVICE_ADD("nsc", NSC8105, MASTER_CLOCK / 8) + MCFG_DEVICE_PROGRAM_MAP(nsc_map) MCFG_MACHINE_START_OVERRIDE(jangou_state,jngolady) MCFG_MACHINE_RESET_OVERRIDE(jangou_state,jngolady) @@ -924,8 +924,8 @@ MACHINE_CONFIG_START(jangou_state::jngolady) /* sound hardware */ MCFG_DEVICE_REMOVE("cvsd") - MCFG_SOUND_ADD("msm", MSM5205, XTAL(400'000)) - MCFG_MSM5205_VCLK_CB(WRITELINE(jangou_state, jngolady_vclk_cb)) + MCFG_DEVICE_ADD("msm", MSM5205, XTAL(400'000)) + MCFG_MSM5205_VCLK_CB(WRITELINE(*this, jangou_state, jngolady_vclk_cb)) MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MACHINE_CONFIG_END @@ -935,9 +935,9 @@ MACHINE_CONFIG_START(jangou_state::cntrygrl) /* basic machine hardware */ - MCFG_CPU_MODIFY("cpu0") - MCFG_CPU_PROGRAM_MAP(cntrygrl_cpu0_map ) - MCFG_CPU_IO_MAP(cntrygrl_cpu0_io ) + MCFG_DEVICE_MODIFY("cpu0") + MCFG_DEVICE_PROGRAM_MAP(cntrygrl_cpu0_map ) + MCFG_DEVICE_IO_MAP(cntrygrl_cpu0_io ) MCFG_DEVICE_REMOVE("cpu1") @@ -954,9 +954,9 @@ MACHINE_CONFIG_START(jangou_state::roylcrdn) /* basic machine hardware */ - MCFG_CPU_MODIFY("cpu0") - MCFG_CPU_PROGRAM_MAP(roylcrdn_cpu0_map ) - MCFG_CPU_IO_MAP(roylcrdn_cpu0_io ) + MCFG_DEVICE_MODIFY("cpu0") + MCFG_DEVICE_PROGRAM_MAP(roylcrdn_cpu0_map ) + MCFG_DEVICE_IO_MAP(roylcrdn_cpu0_io ) MCFG_DEVICE_REMOVE("cpu1") |