diff options
Diffstat (limited to 'src/mame/drivers/dooyong.cpp')
-rw-r--r-- | src/mame/drivers/dooyong.cpp | 120 |
1 files changed, 60 insertions, 60 deletions
diff --git a/src/mame/drivers/dooyong.cpp b/src/mame/drivers/dooyong.cpp index cbd1792218d..a6de06fcd87 100644 --- a/src/mame/drivers/dooyong.cpp +++ b/src/mame/drivers/dooyong.cpp @@ -1469,14 +1469,14 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::sound_2203) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_SOUND_ADD("ym1", YM2203, 1500000) - MCFG_YM2203_IRQ_HANDLER(WRITELINE(dooyong_z80_ym2203_state, irqhandler_2203_1)) - MCFG_AY8910_PORT_A_READ_CB(READ8(dooyong_z80_ym2203_state, unk_r)) + MCFG_DEVICE_ADD("ym1", YM2203, 1500000) + MCFG_YM2203_IRQ_HANDLER(WRITELINE(*this, dooyong_z80_ym2203_state, irqhandler_2203_1)) + MCFG_AY8910_PORT_A_READ_CB(READ8(*this, dooyong_z80_ym2203_state, unk_r)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) - MCFG_SOUND_ADD("ym2", YM2203, 1500000) - MCFG_YM2203_IRQ_HANDLER(WRITELINE(dooyong_z80_ym2203_state, irqhandler_2203_2)) - MCFG_AY8910_PORT_A_READ_CB(READ8(dooyong_z80_ym2203_state, unk_r)) + MCFG_DEVICE_ADD("ym2", YM2203, 1500000) + MCFG_YM2203_IRQ_HANDLER(WRITELINE(*this, dooyong_z80_ym2203_state, irqhandler_2203_2)) + MCFG_AY8910_PORT_A_READ_CB(READ8(*this, dooyong_z80_ym2203_state, unk_r)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MACHINE_CONFIG_END @@ -1511,12 +1511,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(dooyong_z80_ym2203_state::lastday) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, 16_MHz_XTAL/2) /* 8MHz verified for Last Day / D-day */ - MCFG_CPU_PROGRAM_MAP(lastday_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold) + MCFG_DEVICE_ADD("maincpu", Z80, 16_MHz_XTAL/2) /* 8MHz verified for Last Day / D-day */ + MCFG_DEVICE_PROGRAM_MAP(lastday_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold) - MCFG_CPU_ADD("audiocpu", Z80, 16_MHz_XTAL/4) /* 4MHz verified for Last Day / D-day */ - MCFG_CPU_PROGRAM_MAP(lastday_sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL/4) /* 4MHz verified for Last Day / D-day */ + MCFG_DEVICE_PROGRAM_MAP(lastday_sound_map) MCFG_MACHINE_START_OVERRIDE(dooyong_z80_ym2203_state, cpu_z80) MCFG_MACHINE_RESET_OVERRIDE(dooyong_z80_ym2203_state, sound_ym2203) @@ -1531,7 +1531,7 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::lastday) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 ) MCFG_SCREEN_UPDATE_DRIVER(dooyong_z80_ym2203_state, screen_update_lastday) - MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", lastday) @@ -1549,14 +1549,14 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::lastday) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_SOUND_ADD("ym1", YM2203, 16_MHz_XTAL/4) /* 4MHz verified for Last Day / D-day */ - MCFG_YM2203_IRQ_HANDLER(WRITELINE(dooyong_z80_ym2203_state, irqhandler_2203_1)) - MCFG_AY8910_PORT_A_READ_CB(READ8(dooyong_z80_ym2203_state, unk_r)) + MCFG_DEVICE_ADD("ym1", YM2203, 16_MHz_XTAL/4) /* 4MHz verified for Last Day / D-day */ + MCFG_YM2203_IRQ_HANDLER(WRITELINE(*this, dooyong_z80_ym2203_state, irqhandler_2203_1)) + MCFG_AY8910_PORT_A_READ_CB(READ8(*this, dooyong_z80_ym2203_state, unk_r)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) - MCFG_SOUND_ADD("ym2", YM2203, 16_MHz_XTAL/4) /* 4MHz verified for Last Day / D-day */ - MCFG_YM2203_IRQ_HANDLER(WRITELINE(dooyong_z80_ym2203_state, irqhandler_2203_2)) - MCFG_AY8910_PORT_A_READ_CB(READ8(dooyong_z80_ym2203_state, unk_r)) + MCFG_DEVICE_ADD("ym2", YM2203, 16_MHz_XTAL/4) /* 4MHz verified for Last Day / D-day */ + MCFG_YM2203_IRQ_HANDLER(WRITELINE(*this, dooyong_z80_ym2203_state, irqhandler_2203_2)) + MCFG_AY8910_PORT_A_READ_CB(READ8(*this, dooyong_z80_ym2203_state, unk_r)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MACHINE_CONFIG_END @@ -1564,12 +1564,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(dooyong_z80_ym2203_state::gulfstrm) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, 8000000) /* ??? */ - MCFG_CPU_PROGRAM_MAP(gulfstrm_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold) + MCFG_DEVICE_ADD("maincpu", Z80, 8000000) /* ??? */ + MCFG_DEVICE_PROGRAM_MAP(gulfstrm_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold) - MCFG_CPU_ADD("audiocpu", Z80, 8000000) /* ??? */ - MCFG_CPU_PROGRAM_MAP(lastday_sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, 8000000) /* ??? */ + MCFG_DEVICE_PROGRAM_MAP(lastday_sound_map) MCFG_MACHINE_START_OVERRIDE(dooyong_z80_ym2203_state, cpu_z80) MCFG_MACHINE_RESET_OVERRIDE(dooyong_z80_ym2203_state, sound_ym2203) @@ -1583,7 +1583,7 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::gulfstrm) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 ) MCFG_SCREEN_UPDATE_DRIVER(dooyong_z80_ym2203_state, screen_update_gulfstrm) - MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", lastday) @@ -1603,12 +1603,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(dooyong_z80_ym2203_state::pollux) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, 16_MHz_XTAL/2) /* 8Mhz */ - MCFG_CPU_PROGRAM_MAP(pollux_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold) + MCFG_DEVICE_ADD("maincpu", Z80, 16_MHz_XTAL/2) /* 8Mhz */ + MCFG_DEVICE_PROGRAM_MAP(pollux_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold) - MCFG_CPU_ADD("audiocpu", Z80, 16_MHz_XTAL/4) /* 4Mhz */ - MCFG_CPU_PROGRAM_MAP(pollux_sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL/4) /* 4Mhz */ + MCFG_DEVICE_PROGRAM_MAP(pollux_sound_map) MCFG_MACHINE_START_OVERRIDE(dooyong_z80_ym2203_state, cpu_z80) MCFG_MACHINE_RESET_OVERRIDE(dooyong_z80_ym2203_state, sound_ym2203) @@ -1622,7 +1622,7 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::pollux) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 ) MCFG_SCREEN_UPDATE_DRIVER(dooyong_z80_ym2203_state, screen_update_pollux) - MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", lastday) @@ -1642,12 +1642,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(dooyong_z80_state::bluehawk) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, 8000000) /* ??? */ - MCFG_CPU_PROGRAM_MAP(bluehawk_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold) + MCFG_DEVICE_ADD("maincpu", Z80, 8000000) /* ??? */ + MCFG_DEVICE_PROGRAM_MAP(bluehawk_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold) - MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* ??? */ - MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* ??? */ + MCFG_DEVICE_PROGRAM_MAP(bluehawk_sound_map) MCFG_MACHINE_START_OVERRIDE(dooyong_z80_state, cpu_z80) @@ -1660,7 +1660,7 @@ MACHINE_CONFIG_START(dooyong_z80_state::bluehawk) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 ) MCFG_SCREEN_UPDATE_DRIVER(dooyong_z80_state, screen_update_bluehawk) - MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", bluehawk) @@ -1682,12 +1682,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(dooyong_z80_state::flytiger) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, 16_MHz_XTAL/2) /* 8MHz */ - MCFG_CPU_PROGRAM_MAP(flytiger_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold) + MCFG_DEVICE_ADD("maincpu", Z80, 16_MHz_XTAL/2) /* 8MHz */ + MCFG_DEVICE_PROGRAM_MAP(flytiger_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold) - MCFG_CPU_ADD("audiocpu", Z80, 16_MHz_XTAL/4) /* 4Mhz */ - MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL/4) /* 4Mhz */ + MCFG_DEVICE_PROGRAM_MAP(bluehawk_sound_map) MCFG_MACHINE_START_OVERRIDE(dooyong_z80_state, cpu_z80) @@ -1700,7 +1700,7 @@ MACHINE_CONFIG_START(dooyong_z80_state::flytiger) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 ) MCFG_SCREEN_UPDATE_DRIVER(dooyong_z80_state, screen_update_flytiger) - MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", flytiger) @@ -1721,12 +1721,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(dooyong_z80_state::primella) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, 16_MHz_XTAL/2) /* 8MHz */ - MCFG_CPU_PROGRAM_MAP(primella_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold) + MCFG_DEVICE_ADD("maincpu", Z80, 16_MHz_XTAL/2) /* 8MHz */ + MCFG_DEVICE_PROGRAM_MAP(primella_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold) - MCFG_CPU_ADD("audiocpu", Z80, 16_MHz_XTAL/4) /* 4MHz */ - MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL/4) /* 4MHz */ + MCFG_DEVICE_PROGRAM_MAP(bluehawk_sound_map) MCFG_MACHINE_START_OVERRIDE(dooyong_z80_state, cpu_z80) @@ -1771,11 +1771,11 @@ TIMER_DEVICE_CALLBACK_MEMBER(dooyong_68k_state::scanline) MACHINE_CONFIG_START(rshark_state::dooyong_68k) // basic machine hardware - MCFG_CPU_ADD("maincpu", M68000, 8_MHz_XTAL) // 8MHz measured on Super-X + MCFG_DEVICE_ADD("maincpu", M68000, 8_MHz_XTAL) // 8MHz measured on Super-X MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", rshark_state, scanline, "screen", 0, 1) - MCFG_CPU_ADD("audiocpu", Z80, 8_MHz_XTAL/2) // 4MHz measured on Super-X - MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, 8_MHz_XTAL/2) // 4MHz measured on Super-X + MCFG_DEVICE_PROGRAM_MAP(bluehawk_sound_map) // video hardware MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") @@ -1786,7 +1786,7 @@ MACHINE_CONFIG_START(rshark_state::dooyong_68k) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1) MCFG_SCREEN_UPDATE_DRIVER(rshark_state, screen_update_rshark) - MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", rshark) @@ -1808,26 +1808,26 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(rshark_state::rshark) dooyong_68k(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(rshark_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(rshark_map) MACHINE_CONFIG_END MACHINE_CONFIG_START(rshark_state::superx) dooyong_68k(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(superx_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(superx_map) MACHINE_CONFIG_END MACHINE_CONFIG_START(popbingo_state::popbingo) // basic machine hardware - MCFG_CPU_ADD("maincpu", M68000, 20_MHz_XTAL/2) // 10MHz measured - MCFG_CPU_PROGRAM_MAP(popbingo_map) + MCFG_DEVICE_ADD("maincpu", M68000, 20_MHz_XTAL/2) // 10MHz measured + MCFG_DEVICE_PROGRAM_MAP(popbingo_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", popbingo_state, scanline, "screen", 0, 1) - MCFG_CPU_ADD("audiocpu", Z80, 16_MHz_XTAL/4) // 4MHz measured - MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL/4) // 4MHz measured + MCFG_DEVICE_PROGRAM_MAP(bluehawk_sound_map) // video hardware MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") @@ -1838,7 +1838,7 @@ MACHINE_CONFIG_START(popbingo_state::popbingo) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1) MCFG_SCREEN_UPDATE_DRIVER(popbingo_state, screen_update_popbingo) - MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", popbingo) |