diff options
Diffstat (limited to 'src/mame/drivers/nightgal.cpp')
-rw-r--r-- | src/mame/drivers/nightgal.cpp | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/src/mame/drivers/nightgal.cpp b/src/mame/drivers/nightgal.cpp index de272a2dc86..8552f07a6a8 100644 --- a/src/mame/drivers/nightgal.cpp +++ b/src/mame/drivers/nightgal.cpp @@ -790,13 +790,13 @@ void nightgal_state::machine_reset() MACHINE_CONFIG_START(nightgal_state::royalqn) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80,MASTER_CLOCK / 8) /* ? MHz */ - MCFG_CPU_PROGRAM_MAP(royalqn_map) - MCFG_CPU_IO_MAP(royalqn_io) - MCFG_CPU_VBLANK_INT_DRIVER("screen", nightgal_state, irq0_line_hold) + MCFG_DEVICE_ADD("maincpu", Z80,MASTER_CLOCK / 8) /* ? MHz */ + MCFG_DEVICE_PROGRAM_MAP(royalqn_map) + MCFG_DEVICE_IO_MAP(royalqn_io) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nightgal_state, irq0_line_hold) - MCFG_CPU_ADD("sub", NSC8105, MASTER_CLOCK / 8) - MCFG_CPU_PROGRAM_MAP(royalqn_nsc_map) + MCFG_DEVICE_ADD("sub", NSC8105, MASTER_CLOCK / 8) + MCFG_DEVICE_PROGRAM_MAP(royalqn_nsc_map) MCFG_QUANTUM_PERFECT_CPU("maincpu") @@ -814,9 +814,9 @@ MACHINE_CONFIG_START(nightgal_state::royalqn) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK / 8) - MCFG_AY8910_PORT_A_READ_CB(READ8(nightgal_state, input_1p_r)) - MCFG_AY8910_PORT_B_READ_CB(READ8(nightgal_state, input_2p_r)) + MCFG_DEVICE_ADD("aysnd", AY8910, MASTER_CLOCK / 8) + MCFG_AY8910_PORT_A_READ_CB(READ8(*this, nightgal_state, input_1p_r)) + MCFG_AY8910_PORT_B_READ_CB(READ8(*this, nightgal_state, input_2p_r)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MACHINE_CONFIG_END @@ -824,36 +824,36 @@ MACHINE_CONFIG_START(nightgal_state::sexygal) royalqn(config); /* basic machine hardware */ - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(sexygal_map) - MCFG_CPU_IO_MAP(sexygal_io) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(sexygal_map) + MCFG_DEVICE_IO_MAP(sexygal_io) - MCFG_CPU_MODIFY("sub") - MCFG_CPU_PROGRAM_MAP(sexygal_nsc_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", nightgal_state, irq0_line_hold) + MCFG_DEVICE_MODIFY("sub") + MCFG_DEVICE_PROGRAM_MAP(sexygal_nsc_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nightgal_state, irq0_line_hold) - MCFG_CPU_ADD("audiocpu", NSC8105, MASTER_CLOCK / 8) - MCFG_CPU_PROGRAM_MAP(sexygal_audio_map) + MCFG_DEVICE_ADD("audiocpu", NSC8105, MASTER_CLOCK / 8) + MCFG_DEVICE_PROGRAM_MAP(sexygal_audio_map) MCFG_DEVICE_ADD("sampleclk", CLOCK, 6000) // quite a wild guess MCFG_CLOCK_SIGNAL_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI)) - MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) // unknown DAC + MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) // unknown DAC MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MCFG_DEVICE_REMOVE("aysnd") - MCFG_SOUND_ADD("ymsnd", YM2203, MASTER_CLOCK / 8) - MCFG_AY8910_PORT_A_READ_CB(READ8(nightgal_state, input_1p_r)) - MCFG_AY8910_PORT_B_READ_CB(READ8(nightgal_state, input_2p_r)) + MCFG_DEVICE_ADD("ymsnd", YM2203, MASTER_CLOCK / 8) + MCFG_AY8910_PORT_A_READ_CB(READ8(*this, nightgal_state, input_1p_r)) + MCFG_AY8910_PORT_B_READ_CB(READ8(*this, nightgal_state, input_2p_r)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MACHINE_CONFIG_END MACHINE_CONFIG_START(nightgal_state::sweetgal) sexygal(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(sweetgal_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(sweetgal_map) // doesn't have the extra NSC8105 (so how does this play samples?) MCFG_DEVICE_REMOVE("audiocpu") @@ -862,19 +862,19 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(nightgal_state::ngalsumr) royalqn(config); - MCFG_CPU_MODIFY("maincpu") + MCFG_DEVICE_MODIFY("maincpu") // TODO: happens from protection device - MCFG_CPU_PERIODIC_INT_DRIVER(nightgal_state, nmi_line_pulse, 60) + MCFG_DEVICE_PERIODIC_INT_DRIVER(nightgal_state, nmi_line_pulse, 60) MACHINE_CONFIG_END MACHINE_CONFIG_START(nightgal_state::sgaltrop) sexygal(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_IO_MAP(sgaltrop_io) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_IO_MAP(sgaltrop_io) - MCFG_CPU_MODIFY("sub") - MCFG_CPU_PROGRAM_MAP(sgaltrop_nsc_map) + MCFG_DEVICE_MODIFY("sub") + MCFG_DEVICE_PROGRAM_MAP(sgaltrop_nsc_map) MCFG_DEVICE_REMOVE("audiocpu") MCFG_DEVICE_REMOVE("sampleclk") |