diff options
Diffstat (limited to 'src/mame/drivers/taito_b.cpp')
-rw-r--r-- | src/mame/drivers/taito_b.cpp | 292 |
1 files changed, 146 insertions, 146 deletions
diff --git a/src/mame/drivers/taito_b.cpp b/src/mame/drivers/taito_b.cpp index 243907c5db0..4b6f499c177 100644 --- a/src/mame/drivers/taito_b.cpp +++ b/src/mame/drivers/taito_b.cpp @@ -1947,12 +1947,12 @@ void taitob_state::machine_reset() MACHINE_CONFIG_START(taitob_state::rastsag2) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ - MCFG_CPU_PROGRAM_MAP(rastsag2_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, rastansaga2_interrupt) + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ + MCFG_DEVICE_PROGRAM_MAP(rastsag2_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, rastansaga2_interrupt) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */ - MCFG_CPU_PROGRAM_MAP(sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */ + MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -1961,7 +1961,7 @@ MACHINE_CONFIG_START(taitob_state::rastsag2) 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(taitob_state, player_12_coin_ctrl_w)) + MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w)) MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2")) /* video hardware */ @@ -1971,7 +1971,7 @@ MACHINE_CONFIG_START(taitob_state::rastsag2) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) @@ -1989,7 +1989,7 @@ MACHINE_CONFIG_START(taitob_state::rastsag2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */ MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.25) MCFG_SOUND_ROUTE(1, "mono", 1.0) @@ -2004,12 +2004,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitob_state::masterw) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ - MCFG_CPU_PROGRAM_MAP(masterw_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, masterw_interrupt) + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ + MCFG_DEVICE_PROGRAM_MAP(masterw_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, masterw_interrupt) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* 6 MHz Z80B */ - MCFG_CPU_PROGRAM_MAP(masterw_sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* 6 MHz Z80B */ + MCFG_DEVICE_PROGRAM_MAP(masterw_sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -2018,7 +2018,7 @@ MACHINE_CONFIG_START(taitob_state::masterw) 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(taitob_state, player_12_coin_ctrl_w)) + MCFG_TC0040IOC_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w)) MCFG_TC0040IOC_READ_7_CB(IOPORT("IN2")) /* video hardware */ @@ -2028,7 +2028,7 @@ MACHINE_CONFIG_START(taitob_state::masterw) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) @@ -2046,9 +2046,9 @@ MACHINE_CONFIG_START(taitob_state::masterw) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(24'000'000)/8) /* 3 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(24'000'000)/8) /* 3 MHz */ MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) - MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(taitob_state, bankswitch_w)) + MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, taitob_state, bankswitch_w)) MCFG_SOUND_ROUTE(0, "mono", 0.25) MCFG_SOUND_ROUTE(1, "mono", 0.25) MCFG_SOUND_ROUTE(2, "mono", 0.25) @@ -2063,8 +2063,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitob_state::tetrist) /* Nastar conversion kit with slightly different memory map */ rastsag2(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(tetrist_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(tetrist_map) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -2074,20 +2074,20 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitob_state::tetrista) /* Master of Weapon conversion kit with slightly different memory map */ masterw(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(tetrista_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(tetrista_map) MACHINE_CONFIG_END MACHINE_CONFIG_START(taitob_state::ashura) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ - MCFG_CPU_PROGRAM_MAP(rastsag2_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, rastansaga2_interrupt) + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ + MCFG_DEVICE_PROGRAM_MAP(rastsag2_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, rastansaga2_interrupt) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */ - MCFG_CPU_PROGRAM_MAP(sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */ + MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -2096,7 +2096,7 @@ MACHINE_CONFIG_START(taitob_state::ashura) 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(taitob_state, player_12_coin_ctrl_w)) + MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w)) MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2")) /* video hardware */ @@ -2106,7 +2106,7 @@ MACHINE_CONFIG_START(taitob_state::ashura) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) @@ -2124,7 +2124,7 @@ MACHINE_CONFIG_START(taitob_state::ashura) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */ MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.25) MCFG_SOUND_ROUTE(1, "mono", 1.0) @@ -2139,12 +2139,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitob_state::crimec) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ - MCFG_CPU_PROGRAM_MAP(crimec_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, crimec_interrupt) + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ + MCFG_DEVICE_PROGRAM_MAP(crimec_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, crimec_interrupt) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */ - MCFG_CPU_PROGRAM_MAP(sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */ + MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -2153,7 +2153,7 @@ MACHINE_CONFIG_START(taitob_state::crimec) 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(taitob_state, player_12_coin_ctrl_w)) + MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w)) MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2")) /* video hardware */ @@ -2163,7 +2163,7 @@ MACHINE_CONFIG_START(taitob_state::crimec) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) @@ -2181,7 +2181,7 @@ MACHINE_CONFIG_START(taitob_state::crimec) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */ MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.25) @@ -2197,12 +2197,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitob_state::hitice) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ - MCFG_CPU_PROGRAM_MAP(hitice_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, hitice_interrupt) + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ + MCFG_DEVICE_PROGRAM_MAP(hitice_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, hitice_interrupt) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* 6 MHz Z80B */ - MCFG_CPU_PROGRAM_MAP(viofight_sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* 6 MHz Z80B */ + MCFG_DEVICE_PROGRAM_MAP(viofight_sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -2211,7 +2211,7 @@ MACHINE_CONFIG_START(taitob_state::hitice) 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(taitob_state, player_12_coin_ctrl_w)) + MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w)) MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2")) /* video hardware */ @@ -2221,7 +2221,7 @@ MACHINE_CONFIG_START(taitob_state::hitice) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) @@ -2240,9 +2240,9 @@ MACHINE_CONFIG_START(taitob_state::hitice) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(24'000'000)/8) /* 3 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(24'000'000)/8) /* 3 MHz */ MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) - MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(taitob_state, bankswitch_w)) + MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, taitob_state, bankswitch_w)) MCFG_SOUND_ROUTE(0, "mono", 0.25) MCFG_SOUND_ROUTE(1, "mono", 0.25) MCFG_SOUND_ROUTE(2, "mono", 0.25) @@ -2260,12 +2260,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitob_state::rambo3p) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* verified on pcb */ - MCFG_CPU_PROGRAM_MAP(rambo3_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, rambo3_interrupt) + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* verified on pcb */ + MCFG_DEVICE_PROGRAM_MAP(rambo3_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, rambo3_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_QUANTUM_TIME(attotime::from_hz(600)) @@ -2274,7 +2274,7 @@ MACHINE_CONFIG_START(taitob_state::rambo3p) 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(taitob_state, player_12_coin_ctrl_w)) + MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w)) MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2")) /* video hardware */ @@ -2284,7 +2284,7 @@ MACHINE_CONFIG_START(taitob_state::rambo3p) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", rambo3) @@ -2302,7 +2302,7 @@ MACHINE_CONFIG_START(taitob_state::rambo3p) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - 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, "mono", 0.25) @@ -2318,12 +2318,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitob_state::rambo3) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12MHz verified on pcb */ - MCFG_CPU_PROGRAM_MAP(rambo3_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, rambo3_interrupt) + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12MHz verified on pcb */ + MCFG_DEVICE_PROGRAM_MAP(rambo3_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, rambo3_interrupt) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4MHz verified on pcb */ - MCFG_CPU_PROGRAM_MAP(sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4MHz verified on pcb */ + MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -2332,7 +2332,7 @@ MACHINE_CONFIG_START(taitob_state::rambo3) 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(taitob_state, player_12_coin_ctrl_w)) + MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w)) MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2")) /* video hardware */ @@ -2342,7 +2342,7 @@ MACHINE_CONFIG_START(taitob_state::rambo3) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) @@ -2360,7 +2360,7 @@ MACHINE_CONFIG_START(taitob_state::rambo3) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz verified on pcb */ MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.25) MCFG_SOUND_ROUTE(1, "mono", 1.0) @@ -2375,12 +2375,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitob_state::pbobble) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ - MCFG_CPU_PROGRAM_MAP(pbobble_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, pbobble_interrupt) + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ + MCFG_DEVICE_PROGRAM_MAP(pbobble_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, pbobble_interrupt) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/2) /* 4 MHz */ - MCFG_CPU_PROGRAM_MAP(sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/2) /* 4 MHz */ + MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -2392,11 +2392,11 @@ MACHINE_CONFIG_START(taitob_state::pbobble) MCFG_TC0640FIO_READ_1_CB(IOPORT("COIN")) MCFG_TC0640FIO_READ_2_CB(IOPORT("START")) MCFG_TC0640FIO_READ_3_CB(IOPORT("P1_P2_A")) - MCFG_TC0640FIO_WRITE_4_CB(WRITE8(taitob_state, player_12_coin_ctrl_w)) + MCFG_TC0640FIO_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w)) MCFG_TC0640FIO_READ_7_CB(IOPORT("P1_P2_B")) MCFG_DEVICE_ADD("mb87078", MB87078, 0) - MCFG_MB87078_GAIN_CHANGED_CB(WRITE8(taitob_state, mb87078_gain_changed)) + MCFG_MB87078_GAIN_CHANGED_CB(WRITE8(*this, taitob_state, mb87078_gain_changed)) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2405,7 +2405,7 @@ MACHINE_CONFIG_START(taitob_state::pbobble) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) @@ -2423,7 +2423,7 @@ MACHINE_CONFIG_START(taitob_state::pbobble) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM2610B, XTAL(16'000'000)/2) /* 8 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2610B, XTAL(16'000'000)/2) /* 8 MHz */ MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.25) MCFG_SOUND_ROUTE(1, "mono", 1.0) @@ -2438,12 +2438,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitob_state::spacedx) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ - MCFG_CPU_PROGRAM_MAP(spacedx_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, pbobble_interrupt) + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ + MCFG_DEVICE_PROGRAM_MAP(spacedx_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, pbobble_interrupt) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */ - MCFG_CPU_PROGRAM_MAP(sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */ + MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -2455,11 +2455,11 @@ MACHINE_CONFIG_START(taitob_state::spacedx) MCFG_TC0640FIO_READ_1_CB(IOPORT("COIN")) MCFG_TC0640FIO_READ_2_CB(IOPORT("START")) MCFG_TC0640FIO_READ_3_CB(IOPORT("P1_P2_A")) - MCFG_TC0640FIO_WRITE_4_CB(WRITE8(taitob_state, player_12_coin_ctrl_w)) + MCFG_TC0640FIO_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w)) MCFG_TC0640FIO_READ_7_CB(IOPORT("P1_P2_B")) MCFG_DEVICE_ADD("mb87078", MB87078, 0) - MCFG_MB87078_GAIN_CHANGED_CB(WRITE8(taitob_state, mb87078_gain_changed)) + MCFG_MB87078_GAIN_CHANGED_CB(WRITE8(*this, taitob_state, mb87078_gain_changed)) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2468,7 +2468,7 @@ MACHINE_CONFIG_START(taitob_state::spacedx) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) @@ -2486,7 +2486,7 @@ MACHINE_CONFIG_START(taitob_state::spacedx) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */ MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.25) MCFG_SOUND_ROUTE(1, "mono", 1.0) @@ -2501,12 +2501,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitob_state::spacedxo) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ - MCFG_CPU_PROGRAM_MAP(spacedxo_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, selfeena_interrupt) + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ + MCFG_DEVICE_PROGRAM_MAP(spacedxo_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, selfeena_interrupt) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */ - MCFG_CPU_PROGRAM_MAP(sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */ + MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -2515,7 +2515,7 @@ MACHINE_CONFIG_START(taitob_state::spacedxo) 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(taitob_state, player_12_coin_ctrl_w)) + MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w)) MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2")) /* video hardware */ @@ -2525,7 +2525,7 @@ MACHINE_CONFIG_START(taitob_state::spacedxo) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) @@ -2543,7 +2543,7 @@ MACHINE_CONFIG_START(taitob_state::spacedxo) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */ MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.25) MCFG_SOUND_ROUTE(1, "mono", 1.0) @@ -2558,12 +2558,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitob_state::qzshowby) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz according to the readme*/ - MCFG_CPU_PROGRAM_MAP(qzshowby_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, pbobble_interrupt) + MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz according to the readme*/ + MCFG_DEVICE_PROGRAM_MAP(qzshowby_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, pbobble_interrupt) - 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)) @@ -2575,11 +2575,11 @@ MACHINE_CONFIG_START(taitob_state::qzshowby) MCFG_TC0640FIO_READ_1_CB(IOPORT("COIN")) MCFG_TC0640FIO_READ_2_CB(IOPORT("START")) MCFG_TC0640FIO_READ_3_CB(IOPORT("P1_P2_A")) - MCFG_TC0640FIO_WRITE_4_CB(WRITE8(taitob_state, player_12_coin_ctrl_w)) + MCFG_TC0640FIO_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w)) MCFG_TC0640FIO_READ_7_CB(IOPORT("P1_P2_B")) MCFG_DEVICE_ADD("mb87078", MB87078, 0) - MCFG_MB87078_GAIN_CHANGED_CB(WRITE8(taitob_state, mb87078_gain_changed)) + MCFG_MB87078_GAIN_CHANGED_CB(WRITE8(*this, taitob_state, mb87078_gain_changed)) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2588,7 +2588,7 @@ MACHINE_CONFIG_START(taitob_state::qzshowby) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) @@ -2606,7 +2606,7 @@ MACHINE_CONFIG_START(taitob_state::qzshowby) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM2610B, 8000000) + MCFG_DEVICE_ADD("ymsnd", YM2610B, 8000000) MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.25) MCFG_SOUND_ROUTE(1, "mono", 1.0) @@ -2621,12 +2621,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitob_state::viofight) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ - MCFG_CPU_PROGRAM_MAP(viofight_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, viofight_interrupt) + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ + MCFG_DEVICE_PROGRAM_MAP(viofight_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, viofight_interrupt) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* 6 MHz verified */ - MCFG_CPU_PROGRAM_MAP(viofight_sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* 6 MHz verified */ + MCFG_DEVICE_PROGRAM_MAP(viofight_sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -2635,7 +2635,7 @@ MACHINE_CONFIG_START(taitob_state::viofight) 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(taitob_state, player_12_coin_ctrl_w)) + MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w)) MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2")) /* video hardware */ @@ -2645,7 +2645,7 @@ MACHINE_CONFIG_START(taitob_state::viofight) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) @@ -2663,9 +2663,9 @@ MACHINE_CONFIG_START(taitob_state::viofight) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(24'000'000)/8) /* 3 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(24'000'000)/8) /* 3 MHz */ MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) - MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(taitob_state, bankswitch_w)) + MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, taitob_state, bankswitch_w)) MCFG_SOUND_ROUTE(0, "mono", 0.25) MCFG_SOUND_ROUTE(1, "mono", 0.25) MCFG_SOUND_ROUTE(2, "mono", 0.25) @@ -2683,12 +2683,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitob_state::silentd) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ - MCFG_CPU_PROGRAM_MAP(silentd_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, silentd_interrupt) + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ + MCFG_DEVICE_PROGRAM_MAP(silentd_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, silentd_interrupt) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */ - MCFG_CPU_PROGRAM_MAP(sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */ + MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -2697,7 +2697,7 @@ MACHINE_CONFIG_START(taitob_state::silentd) 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(taitob_state, player_12_coin_ctrl_w)) + MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w)) MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2")) /* video hardware */ @@ -2707,7 +2707,7 @@ MACHINE_CONFIG_START(taitob_state::silentd) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) @@ -2725,7 +2725,7 @@ MACHINE_CONFIG_START(taitob_state::silentd) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */ MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.25) MCFG_SOUND_ROUTE(1, "mono", 1.0) @@ -2740,12 +2740,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitob_state::selfeena) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ - MCFG_CPU_PROGRAM_MAP(selfeena_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, selfeena_interrupt) + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ + MCFG_DEVICE_PROGRAM_MAP(selfeena_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, selfeena_interrupt) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */ - MCFG_CPU_PROGRAM_MAP(sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */ + MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -2754,7 +2754,7 @@ MACHINE_CONFIG_START(taitob_state::selfeena) 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(taitob_state, player_12_coin_ctrl_w)) + MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w)) MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2")) /* video hardware */ @@ -2764,7 +2764,7 @@ MACHINE_CONFIG_START(taitob_state::selfeena) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) @@ -2782,7 +2782,7 @@ MACHINE_CONFIG_START(taitob_state::selfeena) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */ MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.25) MCFG_SOUND_ROUTE(1, "mono", 1.0) @@ -2806,12 +2806,12 @@ void taitob_state::ryujin_patch(void) MACHINE_CONFIG_START(taitob_state::ryujin) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ - MCFG_CPU_PROGRAM_MAP(selfeena_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, selfeena_interrupt) + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ + MCFG_DEVICE_PROGRAM_MAP(selfeena_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, selfeena_interrupt) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */ - MCFG_CPU_PROGRAM_MAP(sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */ + MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -2820,7 +2820,7 @@ MACHINE_CONFIG_START(taitob_state::ryujin) 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(taitob_state, player_12_coin_ctrl_w)) + MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w)) MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2")) /* video hardware */ @@ -2830,7 +2830,7 @@ MACHINE_CONFIG_START(taitob_state::ryujin) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) @@ -2848,7 +2848,7 @@ MACHINE_CONFIG_START(taitob_state::ryujin) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */ MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.25) MCFG_SOUND_ROUTE(1, "mono", 1.0) @@ -2870,12 +2870,12 @@ void taitob_state::sbm_patch(void) MACHINE_CONFIG_START(taitob_state::sbm) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */ - MCFG_CPU_PROGRAM_MAP(sbm_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, sbm_interrupt) + MCFG_DEVICE_ADD("maincpu", M68000, 12000000) /* 12 MHz */ + MCFG_DEVICE_PROGRAM_MAP(sbm_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, sbm_interrupt) - 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)) @@ -2884,7 +2884,7 @@ MACHINE_CONFIG_START(taitob_state::sbm) MCFG_TC0510NIO_READ_1_CB(IOPORT("DSWB")) MCFG_TC0510NIO_READ_2_CB(IOPORT("JOY")) MCFG_TC0510NIO_READ_3_CB(IOPORT("START")) - MCFG_TC0510NIO_WRITE_4_CB(WRITE8(taitob_state, player_12_coin_ctrl_w)) + MCFG_TC0510NIO_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w)) MCFG_TC0510NIO_READ_7_CB(IOPORT("PHOTOSENSOR")) /* video hardware */ @@ -2894,7 +2894,7 @@ MACHINE_CONFIG_START(taitob_state::sbm) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) @@ -2912,7 +2912,7 @@ MACHINE_CONFIG_START(taitob_state::sbm) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM2610B, 8000000) + MCFG_DEVICE_ADD("ymsnd", YM2610B, 8000000) MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.25) MCFG_SOUND_ROUTE(1, "mono", 1.0) @@ -2926,12 +2926,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitob_c_state::realpunc) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 12000000) - MCFG_CPU_PROGRAM_MAP(realpunc_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, realpunc_interrupt) + MCFG_DEVICE_ADD("maincpu", M68000, 12000000) + MCFG_DEVICE_PROGRAM_MAP(realpunc_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, realpunc_interrupt) - MCFG_CPU_ADD("audiocpu", Z80, 6000000) - MCFG_CPU_PROGRAM_MAP(sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, 6000000) + MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -2940,7 +2940,7 @@ MACHINE_CONFIG_START(taitob_c_state::realpunc) 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(taitob_state, player_12_coin_ctrl_w)) + MCFG_TC0510NIO_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w)) MCFG_TC0510NIO_READ_7_CB(IOPORT("IN2")) /* video hardware */ @@ -2950,7 +2950,7 @@ MACHINE_CONFIG_START(taitob_c_state::realpunc) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_realpunc) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) MCFG_PALETTE_ADD("palette", 4096) @@ -2970,7 +2970,7 @@ MACHINE_CONFIG_START(taitob_c_state::realpunc) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM2610B, 8000000) + MCFG_DEVICE_ADD("ymsnd", YM2610B, 8000000) MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.25) MCFG_SOUND_ROUTE(1, "mono", 1.0) |