summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/wardner.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/wardner.cpp')
-rw-r--r--src/mame/drivers/wardner.cpp46
1 files changed, 23 insertions, 23 deletions
diff --git a/src/mame/drivers/wardner.cpp b/src/mame/drivers/wardner.cpp
index 8dc890f1d07..f1c9c24bde3 100644
--- a/src/mame/drivers/wardner.cpp
+++ b/src/mame/drivers/wardner.cpp
@@ -378,9 +378,9 @@ void wardner_state::machine_reset()
MACHINE_CONFIG_START(wardner_state::wardner)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000)/4) /* 6MHz */
- MCFG_CPU_PROGRAM_MAP(main_program_map)
- MCFG_CPU_IO_MAP(main_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(24'000'000)/4) /* 6MHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_program_map)
+ MCFG_DEVICE_IO_MAP(main_io_map)
MCFG_DEVICE_ADD("membank", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(main_bank_map)
@@ -389,31 +389,31 @@ MACHINE_CONFIG_START(wardner_state::wardner)
MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(18)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x8000)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'000'000)/4) /* 3.5MHz */
- MCFG_CPU_PROGRAM_MAP(sound_program_map)
- MCFG_CPU_IO_MAP(sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(14'000'000)/4) /* 3.5MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_program_map)
+ MCFG_DEVICE_IO_MAP(sound_io_map)
- MCFG_CPU_ADD("dsp", TMS32010, XTAL(14'000'000)) /* 14MHz Crystal CLKin */
- MCFG_CPU_PROGRAM_MAP(DSP_program_map)
+ MCFG_DEVICE_ADD("dsp", TMS32010, XTAL(14'000'000)) /* 14MHz Crystal CLKin */
+ MCFG_DEVICE_PROGRAM_MAP(DSP_program_map)
/* Data Map is internal to the CPU */
- MCFG_CPU_IO_MAP(DSP_io_map)
- MCFG_TMS32010_BIO_IN_CB(READLINE(wardner_state, twincobr_BIO_r))
+ MCFG_DEVICE_IO_MAP(DSP_io_map)
+ MCFG_TMS32010_BIO_IN_CB(READLINE(*this, wardner_state, twincobr_BIO_r))
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame */
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(wardner_state, int_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(wardner_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(wardner_state, bg_ram_bank_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(wardner_state, fg_rom_bank_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(wardner_state, display_on_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, wardner_state, int_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, wardner_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, wardner_state, bg_ram_bank_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, wardner_state, fg_rom_bank_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, wardner_state, display_on_w))
MCFG_DEVICE_ADD("coinlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(wardner_state, dsp_int_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(wardner_state, coin_counter_1_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(wardner_state, coin_counter_2_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(wardner_state, coin_lockout_1_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(wardner_state, coin_lockout_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, wardner_state, dsp_int_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, wardner_state, coin_counter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, wardner_state, coin_counter_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, wardner_state, coin_lockout_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, wardner_state, coin_lockout_2_w))
/* video hardware */
MCFG_MC6845_ADD("crtc", HD6845, "screen", XTAL(14'000'000)/4) /* 3.5MHz measured on CLKin */
@@ -428,8 +428,8 @@ MACHINE_CONFIG_START(wardner_state::wardner)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_RAW_PARAMS(XTAL(14'000'000)/2, 446, 0, 320, 286, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(wardner_state, screen_update_toaplan0)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram8", buffered_spriteram8_device, vblank_copy_rising))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(wardner_state, wardner_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram8", buffered_spriteram8_device, vblank_copy_rising))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, wardner_state, wardner_vblank_irq))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", wardner)
@@ -441,7 +441,7 @@ MACHINE_CONFIG_START(wardner_state::wardner)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(14'000'000)/4)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(14'000'000)/4)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END