diff options
Diffstat (limited to 'src/mame/drivers/circusc.cpp')
-rw-r--r-- | src/mame/drivers/circusc.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/mame/drivers/circusc.cpp b/src/mame/drivers/circusc.cpp index 5bd3d21549e..658176a16ef 100644 --- a/src/mame/drivers/circusc.cpp +++ b/src/mame/drivers/circusc.cpp @@ -347,22 +347,22 @@ WRITE_LINE_MEMBER(circusc_state::vblank_irq) MACHINE_CONFIG_START(circusc_state::circusc) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", KONAMI1, 2048000) /* 2 MHz? */ - MCFG_CPU_PROGRAM_MAP(circusc_map) + MCFG_DEVICE_ADD("maincpu", KONAMI1, 2048000) /* 2 MHz? */ + MCFG_DEVICE_PROGRAM_MAP(circusc_map) MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 2C - MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(circusc_state, flipscreen_w)) // FLIP - MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(circusc_state, irq_mask_w)) // INTST + MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, circusc_state, flipscreen_w)) // FLIP + MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, circusc_state, irq_mask_w)) // INTST MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(NOOP) // MUT - not used - MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(circusc_state, coin_counter_1_w)) // COIN1 - MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(circusc_state, coin_counter_2_w)) // COIN2 - MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(circusc_state, spritebank_w)) // OBJ CHENG + MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, circusc_state, coin_counter_1_w)) // COIN1 + MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, circusc_state, coin_counter_2_w)) // COIN2 + MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, circusc_state, spritebank_w)) // OBJ CHENG MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_VBLANK_INIT("screen", 8) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181)/4) - MCFG_CPU_PROGRAM_MAP(sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(14'318'181)/4) + MCFG_DEVICE_PROGRAM_MAP(sound_map) /* video hardware */ @@ -373,7 +373,7 @@ MACHINE_CONFIG_START(circusc_state::circusc) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(circusc_state, screen_update_circusc) MCFG_SCREEN_PALETTE("palette") - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(circusc_state, vblank_irq)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, circusc_state, vblank_irq)) MCFG_GFXDECODE_ADD("gfxdecode", "palette", circusc) MCFG_PALETTE_ADD("palette", 16*16+16*16) @@ -385,17 +385,17 @@ MACHINE_CONFIG_START(circusc_state::circusc) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_SOUND_ADD("sn1", SN76496, XTAL(14'318'181)/8) + MCFG_DEVICE_ADD("sn1", SN76496, XTAL(14'318'181)/8) MCFG_SOUND_ROUTE(0, "fltdisc", 1.0, 0) - MCFG_SOUND_ADD("sn2", SN76496, XTAL(14'318'181)/8) + MCFG_DEVICE_ADD("sn2", SN76496, XTAL(14'318'181)/8) MCFG_SOUND_ROUTE(0, "fltdisc", 1.0, 1) - MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(0, "fltdisc", 1.0, 2) // ls374.7g + r44+r45+r47+r48+r50+r56+r57+r58+r59 (20k) + r46+r49+r51+r52+r53+r54+r55 (10k) + upc324.3h + MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(0, "fltdisc", 1.0, 2) // ls374.7g + r44+r45+r47+r48+r50+r56+r57+r58+r59 (20k) + r46+r49+r51+r52+r53+r54+r55 (10k) + upc324.3h MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) - MCFG_SOUND_ADD("fltdisc", DISCRETE, 0) + MCFG_DEVICE_ADD("fltdisc", DISCRETE) MCFG_DISCRETE_INTF(circusc) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) |