diff options
Diffstat (limited to 'src/mame/drivers/taito_l.cpp')
-rw-r--r-- | src/mame/drivers/taito_l.cpp | 134 |
1 files changed, 67 insertions, 67 deletions
diff --git a/src/mame/drivers/taito_l.cpp b/src/mame/drivers/taito_l.cpp index 11d1022c85a..f777001c1cf 100644 --- a/src/mame/drivers/taito_l.cpp +++ b/src/mame/drivers/taito_l.cpp @@ -1472,7 +1472,7 @@ MACHINE_CONFIG_START(taitol_state::l_system_video) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(taitol_state, screen_update_taitol) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitol_state, screen_vblank_taitol)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitol_state, screen_vblank_taitol)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_l) @@ -1488,16 +1488,16 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(fhawk_state::fhawk) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, XTAL(13'330'560)/2) /* verified freq on pin122 of TC0090LVC cpu */ - MCFG_CPU_PROGRAM_MAP(fhawk_map) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback) + MCFG_DEVICE_ADD("maincpu", Z80, XTAL(13'330'560)/2) /* verified freq on pin122 of TC0090LVC cpu */ + MCFG_DEVICE_PROGRAM_MAP(fhawk_map) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback) - MCFG_CPU_ADD("audiocpu", Z80, 12_MHz_XTAL/3) /* verified on pcb */ - MCFG_CPU_PROGRAM_MAP(fhawk_3_map) + MCFG_DEVICE_ADD("audiocpu", Z80, 12_MHz_XTAL/3) /* verified on pcb */ + MCFG_DEVICE_PROGRAM_MAP(fhawk_3_map) - MCFG_CPU_ADD("slave", Z80, 12_MHz_XTAL/3) /* verified on pcb */ - MCFG_CPU_PROGRAM_MAP(fhawk_2_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", taitol_state, irq0_line_hold) + MCFG_DEVICE_ADD("slave", Z80, 12_MHz_XTAL/3) /* verified on pcb */ + MCFG_DEVICE_PROGRAM_MAP(fhawk_2_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitol_state, irq0_line_hold) MCFG_QUANTUM_PERFECT_CPU("maincpu") @@ -1506,7 +1506,7 @@ MACHINE_CONFIG_START(fhawk_state::fhawk) MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB")) MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0")) MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1")) - MCFG_TC0220IOC_WRITE_4_CB(WRITE8(taitol_state, coin_control_w)) + MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitol_state, coin_control_w)) MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2")) MCFG_MACHINE_START_OVERRIDE(taitol_state, taito_l) @@ -1518,9 +1518,9 @@ MACHINE_CONFIG_START(fhawk_state::fhawk) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM2203, 12_MHz_XTAL/4) /* verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2203, 12_MHz_XTAL/4) /* verified on pcb */ MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) - MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(fhawk_state, portA_w)) + MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, fhawk_state, portA_w)) MCFG_SOUND_ROUTE(0, "mono", 0.20) MCFG_SOUND_ROUTE(1, "mono", 0.20) MCFG_SOUND_ROUTE(2, "mono", 0.20) @@ -1536,23 +1536,23 @@ MACHINE_CONFIG_START(champwr_state::champwr) fhawk(config); /* basic machine hardware */ - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(champwr_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(champwr_map) - MCFG_CPU_MODIFY("audiocpu") - MCFG_CPU_PROGRAM_MAP(champwr_3_map) + MCFG_DEVICE_MODIFY("audiocpu") + MCFG_DEVICE_PROGRAM_MAP(champwr_3_map) - MCFG_CPU_MODIFY("slave") - MCFG_CPU_PROGRAM_MAP(champwr_2_map) + MCFG_DEVICE_MODIFY("slave") + MCFG_DEVICE_PROGRAM_MAP(champwr_2_map) /* sound hardware */ - MCFG_SOUND_MODIFY("ymsnd") + MCFG_DEVICE_MODIFY("ymsnd") MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) - MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(champwr_state, portA_w)) - MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(champwr_state, msm5205_volume_w)) + MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, champwr_state, portA_w)) + MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, champwr_state, msm5205_volume_w)) - MCFG_SOUND_ADD("msm", MSM5205, 384_kHz_XTAL) - MCFG_MSM5205_VCLK_CB(WRITELINE(champwr_state, msm5205_vck)) /* VCK function */ + MCFG_DEVICE_ADD("msm", MSM5205, 384_kHz_XTAL) + MCFG_MSM5205_VCLK_CB(WRITELINE(*this, champwr_state, msm5205_vck)) /* VCK function */ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MACHINE_CONFIG_END @@ -1561,16 +1561,16 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitol_2cpu_state::raimais) - MCFG_CPU_ADD("maincpu", Z80, 13330560/2) // needs verification from pin122 of TC0090LVC - MCFG_CPU_PROGRAM_MAP(raimais_map) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback) + MCFG_DEVICE_ADD("maincpu", Z80, 13330560/2) // needs verification from pin122 of TC0090LVC + MCFG_DEVICE_PROGRAM_MAP(raimais_map) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback) - MCFG_CPU_ADD("audiocpu", Z80, 12000000/3) // not verified - MCFG_CPU_PROGRAM_MAP(raimais_3_map) + MCFG_DEVICE_ADD("audiocpu", Z80, 12000000/3) // not verified + MCFG_DEVICE_PROGRAM_MAP(raimais_3_map) - MCFG_CPU_ADD("slave", Z80, 12000000/3) // not verified - MCFG_CPU_PROGRAM_MAP(raimais_2_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", taitol_state, irq0_line_hold) + MCFG_DEVICE_ADD("slave", Z80, 12000000/3) // not verified + MCFG_DEVICE_PROGRAM_MAP(raimais_2_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitol_state, irq0_line_hold) MCFG_QUANTUM_PERFECT_CPU("maincpu") @@ -1579,7 +1579,7 @@ MACHINE_CONFIG_START(taitol_2cpu_state::raimais) MCFG_TC0040IOC_READ_1_CB(IOPORT("DSWB")) MCFG_TC0040IOC_READ_2_CB(IOPORT("IN0")) MCFG_TC0040IOC_READ_3_CB(IOPORT("IN1")) - MCFG_TC0040IOC_WRITE_4_CB(WRITE8(taitol_state, coin_control_w)) + MCFG_TC0040IOC_WRITE_4_CB(WRITE8(*this, taitol_state, coin_control_w)) MCFG_TC0040IOC_READ_7_CB(IOPORT("IN2")) MCFG_DEVICE_ADD("dpram", MB8421, 0) @@ -1593,7 +1593,7 @@ MACHINE_CONFIG_START(taitol_2cpu_state::raimais) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM2610, 8_MHz_XTAL) /* verified on pcb (8Mhz OSC is also for the 2nd z80) */ + MCFG_DEVICE_ADD("ymsnd", YM2610, 8_MHz_XTAL) /* verified on pcb (8Mhz OSC is also for the 2nd z80) */ MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.25) MCFG_SOUND_ROUTE(1, "mono", 1.0) @@ -1608,13 +1608,13 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitol_2cpu_state::kurikint) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, XTAL(13'330'560)/2) /* verified freq on pin122 of TC0090LVC cpu */ - MCFG_CPU_PROGRAM_MAP(kurikint_map) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback) + MCFG_DEVICE_ADD("maincpu", Z80, XTAL(13'330'560)/2) /* verified freq on pin122 of TC0090LVC cpu */ + MCFG_DEVICE_PROGRAM_MAP(kurikint_map) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback) - MCFG_CPU_ADD("audiocpu", Z80, 12_MHz_XTAL/3) /* verified on pcb */ - MCFG_CPU_PROGRAM_MAP(kurikint_2_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", taitol_state, irq0_line_hold) + MCFG_DEVICE_ADD("audiocpu", Z80, 12_MHz_XTAL/3) /* verified on pcb */ + MCFG_DEVICE_PROGRAM_MAP(kurikint_2_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitol_state, irq0_line_hold) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) @@ -1625,7 +1625,7 @@ MACHINE_CONFIG_START(taitol_2cpu_state::kurikint) MCFG_TC0040IOC_READ_1_CB(IOPORT("DSWB")) MCFG_TC0040IOC_READ_2_CB(IOPORT("IN0")) MCFG_TC0040IOC_READ_3_CB(IOPORT("IN1")) - MCFG_TC0040IOC_WRITE_4_CB(WRITE8(taitol_state, coin_control_w)) + MCFG_TC0040IOC_WRITE_4_CB(WRITE8(*this, taitol_state, coin_control_w)) MCFG_TC0040IOC_READ_7_CB(IOPORT("IN2")) MCFG_MACHINE_START_OVERRIDE(taitol_state, taito_l) @@ -1637,7 +1637,7 @@ MACHINE_CONFIG_START(taitol_2cpu_state::kurikint) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM2203, 12_MHz_XTAL/4) /* verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2203, 12_MHz_XTAL/4) /* verified on pcb */ MCFG_SOUND_ROUTE(0, "mono", 0.20) MCFG_SOUND_ROUTE(1, "mono", 0.20) MCFG_SOUND_ROUTE(2, "mono", 0.20) @@ -1648,9 +1648,9 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitol_1cpu_state::plotting) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, XTAL(13'330'560)/2) /* verified freq on pin122 of TC0090LVC cpu */ - MCFG_CPU_PROGRAM_MAP(plotting_map) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback) + MCFG_DEVICE_ADD("maincpu", Z80, XTAL(13'330'560)/2) /* verified freq on pin122 of TC0090LVC cpu */ + MCFG_DEVICE_PROGRAM_MAP(plotting_map) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback) MCFG_MACHINE_START_OVERRIDE(taitol_state, taito_l) MCFG_MACHINE_RESET_OVERRIDE(taitol_state, taito_l) @@ -1661,9 +1661,9 @@ MACHINE_CONFIG_START(taitol_1cpu_state::plotting) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(13'330'560)/4) /* verified on pcb */ - MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("dswmux", ls157_x2_device, output_r)) - MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("inmux", ls157_x2_device, output_r)) + MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(13'330'560)/4) /* verified on pcb */ + MCFG_AY8910_PORT_A_READ_CB(READ8("dswmux", ls157_x2_device, output_r)) + MCFG_AY8910_PORT_B_READ_CB(READ8("inmux", ls157_x2_device, output_r)) MCFG_SOUND_ROUTE(0, "mono", 0.20) MCFG_SOUND_ROUTE(1, "mono", 0.20) MCFG_SOUND_ROUTE(2, "mono", 0.20) @@ -1683,8 +1683,8 @@ MACHINE_CONFIG_START(taitol_1cpu_state::puzznic) plotting(config); /* basic machine hardware */ - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(puzznic_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(puzznic_map) MCFG_DEVICE_ADD("mcu", ARKANOID_68705P3, 3_MHz_XTAL) MACHINE_CONFIG_END @@ -1693,8 +1693,8 @@ MACHINE_CONFIG_START(taitol_1cpu_state::puzznici) plotting(config); /* basic machine hardware */ - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(puzznici_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(puzznici_map) MACHINE_CONFIG_END @@ -1702,8 +1702,8 @@ MACHINE_CONFIG_START(horshoes_state::horshoes) plotting(config); /* basic machine hardware */ - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(horshoes_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(horshoes_map) MCFG_DEVICE_ADD("upd4701", UPD4701A, 0) MCFG_UPD4701_PORTX("AN0") @@ -1715,15 +1715,15 @@ MACHINE_CONFIG_START(taitol_1cpu_state::palamed) plotting(config); /* basic machine hardware */ - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(palamed_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(palamed_map) MCFG_DEVICE_ADD("ppi", I8255, 0) // Toshiba TMP8255AP-5 MCFG_I8255_IN_PORTA_CB(IOPORT("IN0")) MCFG_I8255_IN_PORTB_CB(IOPORT("IN1")) MCFG_I8255_IN_PORTC_CB(IOPORT("IN2")) - MCFG_SOUND_MODIFY("ymsnd") + MCFG_DEVICE_MODIFY("ymsnd") MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSWA")) MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSWB")) @@ -1736,15 +1736,15 @@ MACHINE_CONFIG_START(taitol_1cpu_state::cachat) plotting(config); /* basic machine hardware */ - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(cachat_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(cachat_map) MCFG_DEVICE_ADD("ppi", I8255, 0) // NEC D70155C MCFG_I8255_IN_PORTA_CB(IOPORT("IN0")) MCFG_I8255_IN_PORTB_CB(IOPORT("IN1")) MCFG_I8255_IN_PORTC_CB(IOPORT("IN2")) - MCFG_SOUND_MODIFY("ymsnd") + MCFG_DEVICE_MODIFY("ymsnd") MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSWA")) MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSWB")) @@ -1755,13 +1755,13 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitol_2cpu_state::evilston) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, XTAL(13'330'560)/2) /* not verified */ - MCFG_CPU_PROGRAM_MAP(evilston_map) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback) + MCFG_DEVICE_ADD("maincpu", Z80, XTAL(13'330'560)/2) /* not verified */ + MCFG_DEVICE_PROGRAM_MAP(evilston_map) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback) - MCFG_CPU_ADD("audiocpu", Z80, 12_MHz_XTAL/3) /* not verified */ - MCFG_CPU_PROGRAM_MAP(evilston_2_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", taitol_state, irq0_line_hold) + MCFG_DEVICE_ADD("audiocpu", Z80, 12_MHz_XTAL/3) /* not verified */ + MCFG_DEVICE_PROGRAM_MAP(evilston_2_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitol_state, irq0_line_hold) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) @@ -1770,7 +1770,7 @@ MACHINE_CONFIG_START(taitol_2cpu_state::evilston) MCFG_TC0510NIO_READ_1_CB(IOPORT("DSWB")) MCFG_TC0510NIO_READ_2_CB(IOPORT("IN0")) MCFG_TC0510NIO_READ_3_CB(IOPORT("IN1")) - MCFG_TC0510NIO_WRITE_4_CB(WRITE8(taitol_state, coin_control_w)) + MCFG_TC0510NIO_WRITE_4_CB(WRITE8(*this, taitol_state, coin_control_w)) MCFG_TC0510NIO_READ_7_CB(IOPORT("IN2")) MCFG_DEVICE_ADD("dpram", MB8421, 0) @@ -1785,7 +1785,7 @@ MACHINE_CONFIG_START(taitol_2cpu_state::evilston) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM2203, 12_MHz_XTAL/4) /* not verified */ + MCFG_DEVICE_ADD("ymsnd", YM2203, 12_MHz_XTAL/4) /* not verified */ MCFG_SOUND_ROUTE(0, "mono", 0.25) MCFG_SOUND_ROUTE(1, "mono", 0.25) MCFG_SOUND_ROUTE(2, "mono", 0.25) |