diff options
Diffstat (limited to 'src/mame/drivers/darius.cpp')
-rw-r--r-- | src/mame/drivers/darius.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/mame/drivers/darius.cpp b/src/mame/drivers/darius.cpp index 95955651ad1..6b333915b7b 100644 --- a/src/mame/drivers/darius.cpp +++ b/src/mame/drivers/darius.cpp @@ -707,20 +707,20 @@ void darius_state::machine_reset() MACHINE_CONFIG_START(darius_state::darius) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* 8 MHz */ - MCFG_CPU_PROGRAM_MAP(darius_map) - MCFG_CPU_VBLANK_INT_DRIVER("lscreen", darius_state, irq4_line_hold) + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* 8 MHz */ + MCFG_DEVICE_PROGRAM_MAP(darius_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", darius_state, irq4_line_hold) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* 4 MHz */ - MCFG_CPU_PROGRAM_MAP(darius_sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* 4 MHz */ + MCFG_DEVICE_PROGRAM_MAP(darius_sound_map) - MCFG_CPU_ADD("cpub", M68000, XTAL(16'000'000)/2) /* 8 MHz */ - MCFG_CPU_PROGRAM_MAP(darius_cpub_map) - MCFG_CPU_VBLANK_INT_DRIVER("lscreen", darius_state, irq4_line_hold) + MCFG_DEVICE_ADD("cpub", M68000, XTAL(16'000'000)/2) /* 8 MHz */ + MCFG_DEVICE_PROGRAM_MAP(darius_cpub_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", darius_state, irq4_line_hold) - MCFG_CPU_ADD("adpcm", Z80, XTAL(8'000'000)/2) /* 4 MHz */ /* ADPCM player using MSM5205 */ - MCFG_CPU_PROGRAM_MAP(darius_sound2_map) - MCFG_CPU_IO_MAP(darius_sound2_io_map) + MCFG_DEVICE_ADD("adpcm", Z80, XTAL(8'000'000)/2) /* 4 MHz */ /* ADPCM player using MSM5205 */ + MCFG_DEVICE_PROGRAM_MAP(darius_sound2_map) + MCFG_DEVICE_IO_MAP(darius_sound2_io_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame ? */ @@ -766,10 +766,10 @@ MACHINE_CONFIG_START(darius_state::darius) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_SOUND_ADD("ym1", YM2203, XTAL(8'000'000)/2) /* 4 MHz */ + MCFG_DEVICE_ADD("ym1", YM2203, XTAL(8'000'000)/2) /* 4 MHz */ MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) /* assumes Z80 sandwiched between 68Ks */ - MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(darius_state, darius_write_portA0)) /* portA write */ - MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(darius_state, darius_write_portB0)) /* portB write */ + MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, darius_state, darius_write_portA0)) /* portA write */ + MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, darius_state, darius_write_portB0)) /* portB write */ MCFG_SOUND_ROUTE(0, "filter0.0l", 0.08) MCFG_SOUND_ROUTE(0, "filter0.0r", 0.08) MCFG_SOUND_ROUTE(1, "filter0.1l", 0.08) @@ -779,9 +779,9 @@ MACHINE_CONFIG_START(darius_state::darius) MCFG_SOUND_ROUTE(3, "filter0.3l", 0.60) MCFG_SOUND_ROUTE(3, "filter0.3r", 0.60) - MCFG_SOUND_ADD("ym2", YM2203, XTAL(8'000'000)/2) /* 4 MHz */ - MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(darius_state, darius_write_portA1)) /* portA write */ - MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(darius_state, darius_write_portB1)) /* portB write */ + MCFG_DEVICE_ADD("ym2", YM2203, XTAL(8'000'000)/2) /* 4 MHz */ + MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, darius_state, darius_write_portA1)) /* portA write */ + MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, darius_state, darius_write_portB1)) /* portB write */ MCFG_SOUND_ROUTE(0, "filter1.0l", 0.08) MCFG_SOUND_ROUTE(0, "filter1.0r", 0.08) MCFG_SOUND_ROUTE(1, "filter1.1l", 0.08) @@ -791,8 +791,8 @@ MACHINE_CONFIG_START(darius_state::darius) MCFG_SOUND_ROUTE(3, "filter1.3l", 0.60) MCFG_SOUND_ROUTE(3, "filter1.3r", 0.60) - MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000)) - MCFG_MSM5205_VCLK_CB(WRITELINE(darius_state, darius_adpcm_int)) /* interrupt function */ + MCFG_DEVICE_ADD("msm", MSM5205, XTAL(384'000)) + MCFG_MSM5205_VCLK_CB(WRITELINE(*this, darius_state, darius_adpcm_int)) /* interrupt function */ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8KHz */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "msm5205.l", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "msm5205.r", 1.0) |