diff options
Diffstat (limited to 'src/mame/drivers/fcrash.cpp')
-rw-r--r-- | src/mame/drivers/fcrash.cpp | 172 |
1 files changed, 86 insertions, 86 deletions
diff --git a/src/mame/drivers/fcrash.cpp b/src/mame/drivers/fcrash.cpp index 1fd30a261a5..498e23b26a1 100644 --- a/src/mame/drivers/fcrash.cpp +++ b/src/mame/drivers/fcrash.cpp @@ -1618,13 +1618,13 @@ MACHINE_RESET_MEMBER(cps_state,fcrash) MACHINE_CONFIG_START(cps_state::fcrash) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 10000000) - MCFG_CPU_PROGRAM_MAP(fcrash_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack) + MCFG_DEVICE_ADD("maincpu", M68000, 10000000) + MCFG_DEVICE_PROGRAM_MAP(fcrash_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack) - MCFG_CPU_ADD("audiocpu", Z80, 24000000/6) /* ? */ - MCFG_CPU_PROGRAM_MAP(sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, 24000000/6) /* ? */ + MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_MACHINE_START_OVERRIDE(cps_state,fcrash) MCFG_MACHINE_RESET_OVERRIDE(cps_state,fcrash) @@ -1636,7 +1636,7 @@ MACHINE_CONFIG_START(cps_state::fcrash) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 ) MCFG_SCREEN_UPDATE_DRIVER(cps_state, screen_update_fcrash) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cps_state, screen_vblank_cps1)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1) @@ -1649,25 +1649,25 @@ MACHINE_CONFIG_START(cps_state::fcrash) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_SOUND_ADD("ym1", YM2203, 24000000/6) /* ? */ + MCFG_DEVICE_ADD("ym1", YM2203, 24000000/6) /* ? */ MCFG_SOUND_ROUTE(0, "mono", 0.10) MCFG_SOUND_ROUTE(1, "mono", 0.10) MCFG_SOUND_ROUTE(2, "mono", 0.10) MCFG_SOUND_ROUTE(3, "mono", 1.0) - MCFG_SOUND_ADD("ym2", YM2203, 24000000/6) /* ? */ + MCFG_DEVICE_ADD("ym2", YM2203, 24000000/6) /* ? */ MCFG_SOUND_ROUTE(0, "mono", 0.10) MCFG_SOUND_ROUTE(1, "mono", 0.10) MCFG_SOUND_ROUTE(2, "mono", 0.10) MCFG_SOUND_ROUTE(3, "mono", 1.0) - MCFG_SOUND_ADD("msm1", MSM5205, 24000000/64) /* ? */ - MCFG_MSM5205_VCLK_CB(WRITELINE(cps_state, m5205_int1)) /* interrupt function */ + MCFG_DEVICE_ADD("msm1", MSM5205, 24000000/64) /* ? */ + MCFG_MSM5205_VCLK_CB(WRITELINE(*this, cps_state, m5205_int1)) /* interrupt function */ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz 4-bit */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) - MCFG_SOUND_ADD("msm2", MSM5205, 24000000/64) /* ? */ - MCFG_MSM5205_VCLK_CB(WRITELINE(cps_state, m5205_int2)) /* interrupt function */ + MCFG_DEVICE_ADD("msm2", MSM5205, 24000000/64) /* ? */ + MCFG_MSM5205_VCLK_CB(WRITELINE(*this, cps_state, m5205_int2)) /* interrupt function */ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz 4-bit */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END @@ -1675,8 +1675,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cps_state::cawingbl) fcrash(config); /* basic machine hardware */ - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, irq6_line_hold) /* needed to write to scroll values */ + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cps_state, irq6_line_hold) /* needed to write to scroll values */ MCFG_MACHINE_START_OVERRIDE(cps_state, cawingbl) MACHINE_CONFIG_END @@ -1684,13 +1684,13 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cps_state::kodb) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 10000000) - MCFG_CPU_PROGRAM_MAP(fcrash_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack) + MCFG_DEVICE_ADD("maincpu", M68000, 10000000) + MCFG_DEVICE_PROGRAM_MAP(fcrash_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack) - MCFG_CPU_ADD("audiocpu", Z80, 3579545) - MCFG_CPU_PROGRAM_MAP(kodb_sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, 3579545) + MCFG_DEVICE_PROGRAM_MAP(kodb_sound_map) MCFG_MACHINE_START_OVERRIDE(cps_state,kodb) @@ -1701,7 +1701,7 @@ MACHINE_CONFIG_START(cps_state::kodb) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 ) MCFG_SCREEN_UPDATE_DRIVER(cps_state, screen_update_fcrash) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cps_state, screen_vblank_cps1)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1) @@ -1727,12 +1727,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cps_state::sf2mdt) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 12000000) - MCFG_CPU_PROGRAM_MAP(sf2mdt_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, irq4_line_hold) /* triggers the sprite ram and scroll writes */ + MCFG_DEVICE_ADD("maincpu", M68000, 12000000) + MCFG_DEVICE_PROGRAM_MAP(sf2mdt_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cps_state, irq4_line_hold) /* triggers the sprite ram and scroll writes */ - MCFG_CPU_ADD("audiocpu", Z80, 3579545) - MCFG_CPU_PROGRAM_MAP(sf2mdt_z80map) + MCFG_DEVICE_ADD("audiocpu", Z80, 3579545) + MCFG_DEVICE_PROGRAM_MAP(sf2mdt_z80map) MCFG_MACHINE_START_OVERRIDE(cps_state, sf2mdt) MCFG_MACHINE_RESET_OVERRIDE(cps_state,fcrash) @@ -1744,7 +1744,7 @@ MACHINE_CONFIG_START(cps_state::sf2mdt) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 ) MCFG_SCREEN_UPDATE_DRIVER(cps_state, screen_update_fcrash) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cps_state, screen_vblank_cps1)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1) @@ -1762,33 +1762,33 @@ MACHINE_CONFIG_START(cps_state::sf2mdt) MCFG_SOUND_ROUTE(1, "mono", 0.35) /* has 2x MSM5205 instead of OKI6295 */ - MCFG_SOUND_ADD("msm1", MSM5205, 24000000/64) /* ? */ - MCFG_MSM5205_VCLK_CB(WRITELINE(cps_state, m5205_int1)) /* interrupt function */ + MCFG_DEVICE_ADD("msm1", MSM5205, 24000000/64) /* ? */ + MCFG_MSM5205_VCLK_CB(WRITELINE(*this, cps_state, m5205_int1)) /* interrupt function */ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz 4-bit */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) - MCFG_SOUND_ADD("msm2", MSM5205, 24000000/64) /* ? */ - MCFG_MSM5205_VCLK_CB(WRITELINE(cps_state, m5205_int2)) /* interrupt function */ + MCFG_DEVICE_ADD("msm2", MSM5205, 24000000/64) /* ? */ + MCFG_MSM5205_VCLK_CB(WRITELINE(*this, cps_state, m5205_int2)) /* interrupt function */ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz 4-bit */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END MACHINE_CONFIG_START(cps_state::sf2b) sf2mdt(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(sf2b_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(sf2b_map) MACHINE_CONFIG_END MACHINE_CONFIG_START(cps_state::knightsb) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 24000000 / 2) - MCFG_CPU_PROGRAM_MAP(knightsb_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack) + MCFG_DEVICE_ADD("maincpu", M68000, 24000000 / 2) + MCFG_DEVICE_PROGRAM_MAP(knightsb_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack) - MCFG_CPU_ADD("audiocpu", Z80, 29821000 / 8) - MCFG_CPU_PROGRAM_MAP(knightsb_z80map) + MCFG_DEVICE_ADD("audiocpu", Z80, 29821000 / 8) + MCFG_DEVICE_PROGRAM_MAP(knightsb_z80map) MCFG_MACHINE_START_OVERRIDE(cps_state, knightsb) @@ -1799,7 +1799,7 @@ MACHINE_CONFIG_START(cps_state::knightsb) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 ) MCFG_SCREEN_UPDATE_DRIVER(cps_state, screen_update_fcrash) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cps_state, screen_vblank_cps1)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1) @@ -1818,13 +1818,13 @@ MACHINE_CONFIG_START(cps_state::knightsb) MCFG_SOUND_ROUTE(1, "mono", 0.35) /* has 2x MSM5205 instead of OKI6295 */ - MCFG_SOUND_ADD("msm1", MSM5205, 24000000/64) /* ? */ - MCFG_MSM5205_VCLK_CB(WRITELINE(cps_state, m5205_int1)) /* interrupt function */ + MCFG_DEVICE_ADD("msm1", MSM5205, 24000000/64) /* ? */ + MCFG_MSM5205_VCLK_CB(WRITELINE(*this, cps_state, m5205_int1)) /* interrupt function */ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz 4-bit */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) - MCFG_SOUND_ADD("msm2", MSM5205, 24000000/64) /* ? */ - MCFG_MSM5205_VCLK_CB(WRITELINE(cps_state, m5205_int2)) /* interrupt function */ + MCFG_DEVICE_ADD("msm2", MSM5205, 24000000/64) /* ? */ + MCFG_MSM5205_VCLK_CB(WRITELINE(*this, cps_state, m5205_int2)) /* interrupt function */ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz 4-bit */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END @@ -2165,12 +2165,12 @@ MACHINE_START_MEMBER(cps_state, dinopic) MACHINE_CONFIG_START(cps_state::dinopic) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 12000000) - MCFG_CPU_PROGRAM_MAP(dinopic_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack) + MCFG_DEVICE_ADD("maincpu", M68000, 12000000) + MCFG_DEVICE_PROGRAM_MAP(dinopic_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack) - //MCFG_CPU_ADD("audiocpu", PIC16C57, 12000000) + //MCFG_DEVICE_ADD("audiocpu", PIC16C57, 12000000) //MCFG_DEVICE_DISABLE() /* no valid dumps .. */ MCFG_MACHINE_START_OVERRIDE(cps_state, dinopic) @@ -2184,7 +2184,7 @@ MACHINE_CONFIG_START(cps_state::dinopic) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 ) MCFG_SCREEN_UPDATE_DRIVER(cps_state, screen_update_fcrash) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cps_state, screen_vblank_cps1)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1) @@ -2325,13 +2325,13 @@ DRIVER_INIT_MEMBER(cps_state, dinopic) MACHINE_CONFIG_START(cps_state::sgyxz) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 12000000) - MCFG_CPU_PROGRAM_MAP(sgyxz_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack) + MCFG_DEVICE_ADD("maincpu", M68000, 12000000) + MCFG_DEVICE_PROGRAM_MAP(sgyxz_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack) - MCFG_CPU_ADD("audiocpu", Z80, 3579545) - MCFG_CPU_PROGRAM_MAP(sgyxz_sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, 3579545) + MCFG_DEVICE_PROGRAM_MAP(sgyxz_sound_map) MCFG_MACHINE_START_OVERRIDE(cps_state,sgyxz) @@ -2342,7 +2342,7 @@ MACHINE_CONFIG_START(cps_state::sgyxz) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 ) MCFG_SCREEN_UPDATE_DRIVER(cps_state, screen_update_fcrash) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cps_state, screen_vblank_cps1)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1) MCFG_PALETTE_ADD("palette", 0xc00) @@ -2402,8 +2402,8 @@ ROM_END MACHINE_CONFIG_START(cps_state::wofabl) sgyxz(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(wofabl_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(wofabl_map) MACHINE_CONFIG_END ROM_START( wofabl ) @@ -2450,12 +2450,12 @@ MACHINE_START_MEMBER(cps_state, punipic) MACHINE_CONFIG_START(cps_state::punipic) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 12000000) - MCFG_CPU_PROGRAM_MAP(punipic_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack) + MCFG_DEVICE_ADD("maincpu", M68000, 12000000) + MCFG_DEVICE_PROGRAM_MAP(punipic_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack) - //MCFG_CPU_ADD("audiocpu", PIC16C57, 12000000) + //MCFG_DEVICE_ADD("audiocpu", PIC16C57, 12000000) //MCFG_DEVICE_DISABLE() /* no valid dumps .. */ MCFG_MACHINE_START_OVERRIDE(cps_state, punipic) @@ -2469,7 +2469,7 @@ MACHINE_CONFIG_START(cps_state::punipic) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 ) MCFG_SCREEN_UPDATE_DRIVER(cps_state, screen_update_fcrash) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cps_state, screen_vblank_cps1)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1) @@ -2646,13 +2646,13 @@ DRIVER_INIT_MEMBER(cps_state, punipic3) MACHINE_CONFIG_START(cps_state::sf2m1) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000) ) - MCFG_CPU_PROGRAM_MAP(sf2m1_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack) + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(12'000'000) ) + MCFG_DEVICE_PROGRAM_MAP(sf2m1_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) - MCFG_CPU_PROGRAM_MAP(sgyxz_sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545)) + MCFG_DEVICE_PROGRAM_MAP(sgyxz_sound_map) MCFG_MACHINE_START_OVERRIDE(cps_state,sf2m1) @@ -2660,7 +2660,7 @@ MACHINE_CONFIG_START(cps_state::sf2m1) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(CPS_PIXEL_CLOCK, CPS_HTOTAL, CPS_HBEND, CPS_HBSTART, CPS_VTOTAL, CPS_VBEND, CPS_VBSTART) MCFG_SCREEN_UPDATE_DRIVER(cps_state, screen_update_fcrash) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cps_state, screen_vblank_cps1)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1) @@ -3029,12 +3029,12 @@ MACHINE_START_MEMBER(cps_state, slampic) MACHINE_CONFIG_START(cps_state::slampic) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 12000000) - MCFG_CPU_PROGRAM_MAP(slampic_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack) + MCFG_DEVICE_ADD("maincpu", M68000, 12000000) + MCFG_DEVICE_PROGRAM_MAP(slampic_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack) - //MCFG_CPU_ADD("audiocpu", PIC16C57, 12000000) + //MCFG_DEVICE_ADD("audiocpu", PIC16C57, 12000000) //MCFG_DEVICE_DISABLE() /* no valid dumps .. */ MCFG_MACHINE_START_OVERRIDE(cps_state, slampic) @@ -3048,7 +3048,7 @@ MACHINE_CONFIG_START(cps_state::slampic) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 ) MCFG_SCREEN_UPDATE_DRIVER(cps_state, screen_update_fcrash) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cps_state, screen_vblank_cps1)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1) @@ -3132,13 +3132,13 @@ void cps_state::varthb_map(address_map &map) MACHINE_CONFIG_START(cps_state::varthb) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 12000000) - MCFG_CPU_PROGRAM_MAP(varthb_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack) + MCFG_DEVICE_ADD("maincpu", M68000, 12000000) + MCFG_DEVICE_PROGRAM_MAP(varthb_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack) - MCFG_CPU_ADD("audiocpu", Z80, 3579545) - MCFG_CPU_PROGRAM_MAP(sgyxz_sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, 3579545) + MCFG_DEVICE_PROGRAM_MAP(sgyxz_sound_map) MCFG_MACHINE_START_OVERRIDE(cps_state,cps1) @@ -3149,7 +3149,7 @@ MACHINE_CONFIG_START(cps_state::varthb) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 ) MCFG_SCREEN_UPDATE_DRIVER(cps_state, screen_update_cps1) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cps_state, screen_vblank_cps1)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1) |