diff options
Diffstat (limited to 'src/mame/drivers/taito_x.cpp')
-rw-r--r-- | src/mame/drivers/taito_x.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/mame/drivers/taito_x.cpp b/src/mame/drivers/taito_x.cpp index 6fcd9cfed55..07b07a7a61f 100644 --- a/src/mame/drivers/taito_x.cpp +++ b/src/mame/drivers/taito_x.cpp @@ -824,18 +824,18 @@ TIMER_DEVICE_CALLBACK_MEMBER(taitox_state::cchip_irq_clear_cb) MACHINE_CONFIG_START(taitox_state::superman) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */ - MCFG_CPU_PROGRAM_MAP(superman_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", taitox_state, interrupt) + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */ + MCFG_DEVICE_PROGRAM_MAP(superman_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitox_state, interrupt) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* verified on pcb */ - MCFG_CPU_PROGRAM_MAP(sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* verified on pcb */ + MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_TAITO_CCHIP_ADD("cchip", XTAL(16'000'000)/2) /* 8MHz measured on pin 20 */ MCFG_CCHIP_IN_PORTA_CB(IOPORT("IN0")) MCFG_CCHIP_IN_PORTB_CB(IOPORT("IN1")) MCFG_CCHIP_IN_PORTAD_CB(IOPORT("IN2")) - MCFG_CCHIP_OUT_PORTC_CB(WRITE8(taitox_state, superman_counters_w)) + MCFG_CCHIP_OUT_PORTC_CB(WRITE8(*this, taitox_state, superman_counters_w)) MCFG_TIMER_DRIVER_ADD("cchip_irq_clear", taitox_state, cchip_irq_clear_cb) @@ -864,7 +864,7 @@ MACHINE_CONFIG_START(taitox_state::superman) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* verified on pcb */ MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.25) MCFG_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -879,12 +879,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitox_state::daisenpu) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */ - MCFG_CPU_PROGRAM_MAP(daisenpu_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", taitox_state, irq2_line_hold) + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */ + MCFG_DEVICE_PROGRAM_MAP(daisenpu_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitox_state, irq2_line_hold) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* verified on pcb */ - MCFG_CPU_PROGRAM_MAP(daisenpu_sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* verified on pcb */ + MCFG_DEVICE_PROGRAM_MAP(daisenpu_sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ @@ -924,12 +924,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitox_state::gigandes) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz? */ - MCFG_CPU_PROGRAM_MAP(gigandes_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", taitox_state, irq2_line_hold) + MCFG_DEVICE_ADD("maincpu", M68000, 8000000) /* 8 MHz? */ + MCFG_DEVICE_PROGRAM_MAP(gigandes_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitox_state, irq2_line_hold) - MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */ - MCFG_CPU_PROGRAM_MAP(sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */ + MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ @@ -956,7 +956,7 @@ MACHINE_CONFIG_START(taitox_state::gigandes) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_SOUND_ADD("ymsnd", YM2610, 8000000) + MCFG_DEVICE_ADD("ymsnd", YM2610, 8000000) MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.25) MCFG_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -971,12 +971,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitox_state::ballbros) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz? */ - MCFG_CPU_PROGRAM_MAP(ballbros_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", taitox_state, irq2_line_hold) + MCFG_DEVICE_ADD("maincpu", M68000, 8000000) /* 8 MHz? */ + MCFG_DEVICE_PROGRAM_MAP(ballbros_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitox_state, irq2_line_hold) - MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */ - MCFG_CPU_PROGRAM_MAP(sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */ + MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ @@ -1003,7 +1003,7 @@ MACHINE_CONFIG_START(taitox_state::ballbros) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_SOUND_ADD("ymsnd", YM2610, 8000000) + MCFG_DEVICE_ADD("ymsnd", YM2610, 8000000) MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.25) MCFG_SOUND_ROUTE(0, "rspeaker", 0.25) |