diff options
Diffstat (limited to 'src/mame/drivers/deco32.cpp')
-rw-r--r-- | src/mame/drivers/deco32.cpp | 136 |
1 files changed, 68 insertions, 68 deletions
diff --git a/src/mame/drivers/deco32.cpp b/src/mame/drivers/deco32.cpp index 38a6ff5bd0b..0c7d41a92da 100644 --- a/src/mame/drivers/deco32.cpp +++ b/src/mame/drivers/deco32.cpp @@ -1879,18 +1879,18 @@ GFXDECODE_END MACHINE_CONFIG_START(captaven_state::captaven) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", ARM, XTAL(28'000'000)/4) /* verified on pcb (Data East 101 custom)*/ - MCFG_CPU_PROGRAM_MAP(captaven_map) + MCFG_DEVICE_ADD("maincpu", ARM, XTAL(28'000'000)/4) /* verified on pcb (Data East 101 custom)*/ + MCFG_DEVICE_PROGRAM_MAP(captaven_map) - MCFG_CPU_ADD("audiocpu", H6280, XTAL(32'220'000)/4/3) /* pin 10 is 32mhz/4, pin 14 is High so internal divisor is 3 (verified on pcb) */ - MCFG_CPU_PROGRAM_MAP(h6280_sound_map) + MCFG_DEVICE_ADD("audiocpu", H6280, XTAL(32'220'000)/4/3) /* pin 10 is 32mhz/4, pin 14 is High so internal divisor is 3 (verified on pcb) */ + MCFG_DEVICE_PROGRAM_MAP(h6280_sound_map) MCFG_INPUT_MERGER_ANY_HIGH("irq_merger") MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("maincpu", ARM_IRQ_LINE)) MCFG_DECO_IRQ_ADD("irq", "screen") - MCFG_DECO_IRQ_RASTER2_IRQ_CB(DEVWRITELINE("irq_merger", input_merger_any_high_device, in_w<0>)) - MCFG_DECO_IRQ_VBLANK_IRQ_CB(DEVWRITELINE("irq_merger", input_merger_any_high_device, in_w<1>)) + MCFG_DECO_IRQ_RASTER2_IRQ_CB(WRITELINE("irq_merger", input_merger_any_high_device, in_w<0>)) + MCFG_DECO_IRQ_VBLANK_IRQ_CB(WRITELINE("irq_merger", input_merger_any_high_device, in_w<1>)) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL(28'000'000) / 4, 442, 0, 320, 274, 8, 248) @@ -1949,7 +1949,7 @@ MACHINE_CONFIG_START(captaven_state::captaven) MCFG_YM2151_ADD("ymsnd", XTAL(32'220'000)/9) /* verified on pcb */ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) - MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(deco32_state, sound_bankswitch_w)) + MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, deco32_state, sound_bankswitch_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.42) MCFG_SOUND_ROUTE(1, "rspeaker", 0.42) @@ -1964,12 +1964,12 @@ MACHINE_CONFIG_END // DE-0380-2 MACHINE_CONFIG_START(fghthist_state::fghthist) - MCFG_CPU_ADD("maincpu", ARM, XTAL(28'000'000) / 4) - MCFG_CPU_PROGRAM_MAP(fghthist_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", deco32_state, irq0_line_assert) + MCFG_DEVICE_ADD("maincpu", ARM, XTAL(28'000'000) / 4) + MCFG_DEVICE_PROGRAM_MAP(fghthist_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", deco32_state, irq0_line_assert) - MCFG_CPU_ADD("audiocpu", H6280, XTAL(32'220'000) / 8) - MCFG_CPU_PROGRAM_MAP(h6280_sound_custom_latch_map) + MCFG_DEVICE_ADD("audiocpu", H6280, XTAL(32'220'000) / 8) + MCFG_DEVICE_PROGRAM_MAP(h6280_sound_custom_latch_map) MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") @@ -2018,7 +2018,7 @@ MACHINE_CONFIG_START(fghthist_state::fghthist) MCFG_DECO146_ADD("ioprot") MCFG_DECO146_IN_PORTA_CB(IOPORT("IN0")) - MCFG_DECO146_IN_PORTB_CB(DEVREADLINE("eeprom", eeprom_serial_93cxx_device, do_read)) MCFG_DEVCB_BIT(0) + MCFG_DECO146_IN_PORTB_CB(READLINE("eeprom", eeprom_serial_93cxx_device, do_read)) MCFG_DEVCB_BIT(0) MCFG_DECO146_IN_PORTC_CB(IOPORT("IN1")) MCFG_DECO146_SET_INTERFACE_SCRAMBLE_INTERLEAVE MCFG_DECO146_SET_USE_MAGIC_ADDRESS_XOR @@ -2033,7 +2033,7 @@ MACHINE_CONFIG_START(fghthist_state::fghthist) MCFG_YM2151_ADD("ymsnd", 32220000/9) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) - MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(deco32_state, sound_bankswitch_w)) + MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, deco32_state, sound_bankswitch_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.42) MCFG_SOUND_ROUTE(1, "rspeaker", 0.42) @@ -2049,11 +2049,11 @@ MACHINE_CONFIG_END // DE-0395-1 MACHINE_CONFIG_START(fghthist_state::fghthsta) fghthist(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(fghthsta_memmap) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(fghthsta_memmap) - MCFG_CPU_MODIFY("audiocpu") - MCFG_CPU_PROGRAM_MAP(h6280_sound_map) + MCFG_DEVICE_MODIFY("audiocpu") + MCFG_DEVICE_PROGRAM_MAP(h6280_sound_map) MCFG_DEVICE_REMOVE("soundlatch") @@ -2066,18 +2066,18 @@ MACHINE_CONFIG_START(fghthist_state::fghthistu) fghthsta(config); MCFG_DEVICE_REMOVE("audiocpu") - MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'220'000) / 9) - MCFG_CPU_PROGRAM_MAP(z80_sound_map) - MCFG_CPU_IO_MAP(z80_sound_io) + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(32'220'000) / 9) + MCFG_DEVICE_PROGRAM_MAP(z80_sound_map) + MCFG_DEVICE_IO_MAP(z80_sound_io) MCFG_INPUT_MERGER_ANY_HIGH("sound_irq_merger") MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_IRQ0)) MCFG_DEVICE_MODIFY("ioprot") - MCFG_DECO146_SOUNDLATCH_IRQ_CB(DEVWRITELINE("sound_irq_merger", input_merger_any_high_device, in_w<0>)) + MCFG_DECO146_SOUNDLATCH_IRQ_CB(WRITELINE("sound_irq_merger", input_merger_any_high_device, in_w<0>)) - MCFG_SOUND_MODIFY("ymsnd") - MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("sound_irq_merger", input_merger_any_high_device, in_w<1>)) + MCFG_DEVICE_MODIFY("ymsnd") + MCFG_YM2151_IRQ_HANDLER(WRITELINE("sound_irq_merger", input_merger_any_high_device, in_w<1>)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.40) MCFG_SOUND_ROUTE(1, "rspeaker", 0.40) @@ -2087,18 +2087,18 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(dragngun_state::dragngun) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", ARM, XTAL(28'000'000) / 4) - MCFG_CPU_PROGRAM_MAP(dragngun_map) + MCFG_DEVICE_ADD("maincpu", ARM, XTAL(28'000'000) / 4) + MCFG_DEVICE_PROGRAM_MAP(dragngun_map) - MCFG_CPU_ADD("audiocpu", H6280, 32220000/8) - MCFG_CPU_PROGRAM_MAP(h6280_sound_map) + MCFG_DEVICE_ADD("audiocpu", H6280, 32220000/8) + MCFG_DEVICE_PROGRAM_MAP(h6280_sound_map) MCFG_INPUT_MERGER_ANY_HIGH("irq_merger") MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("maincpu", ARM_IRQ_LINE)) MCFG_DECO_IRQ_ADD("irq", "screen") - MCFG_DECO_IRQ_RASTER2_IRQ_CB(DEVWRITELINE("irq_merger", input_merger_any_high_device, in_w<0>)) - MCFG_DECO_IRQ_VBLANK_IRQ_CB(DEVWRITELINE("irq_merger", input_merger_any_high_device, in_w<1>)) + MCFG_DECO_IRQ_RASTER2_IRQ_CB(WRITELINE("irq_merger", input_merger_any_high_device, in_w<0>)) + MCFG_DECO_IRQ_VBLANK_IRQ_CB(WRITELINE("irq_merger", input_merger_any_high_device, in_w<1>)) MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") @@ -2162,7 +2162,7 @@ MACHINE_CONFIG_START(dragngun_state::dragngun) MCFG_YM2151_ADD("ymsnd", 32220000/9) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) - MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(deco32_state, sound_bankswitch_w)) + MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, deco32_state, sound_bankswitch_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.42) MCFG_SOUND_ROUTE(1, "rspeaker", 0.42) @@ -2190,36 +2190,36 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(dragngun_state::lockloadu) dragngun(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(lockloadu_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(lockloadu_map) - MCFG_CPU_MODIFY("audiocpu") - MCFG_CPU_PROGRAM_MAP(lockloadu_sound_map) + MCFG_DEVICE_MODIFY("audiocpu") + MCFG_DEVICE_PROGRAM_MAP(lockloadu_sound_map) MCFG_DEVICE_MODIFY("irq") - MCFG_DECO_IRQ_LIGHTGUN_IRQ_CB(DEVWRITELINE("irq_merger", input_merger_any_high_device, in_w<2>)) + MCFG_DECO_IRQ_LIGHTGUN_IRQ_CB(WRITELINE("irq_merger", input_merger_any_high_device, in_w<2>)) MCFG_DEVICE_MODIFY("tilegen2") MCFG_DECO16IC_PF1_SIZE(DECO_32x32) MCFG_DECO16IC_PF2_SIZE(DECO_32x32) // lockload definitely wants pf34 half width.. - MCFG_SOUND_MODIFY("ymsnd") - MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(dragngun_state, lockload_okibank_lo_w)) + MCFG_DEVICE_MODIFY("ymsnd") + MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, dragngun_state, lockload_okibank_lo_w)) MACHINE_CONFIG_END // DE-0420-1 + Bottom board DE-0421-0 MACHINE_CONFIG_START(dragngun_state::lockload) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", ARM, XTAL(28'000'000) / 4) - MCFG_CPU_PROGRAM_MAP(lockload_map) + MCFG_DEVICE_ADD("maincpu", ARM, XTAL(28'000'000) / 4) + MCFG_DEVICE_PROGRAM_MAP(lockload_map) MCFG_INPUT_MERGER_ANY_HIGH("irq_merger") MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("maincpu", ARM_IRQ_LINE)) - MCFG_CPU_ADD("audiocpu", Z80, 32220000/8) - MCFG_CPU_PROGRAM_MAP(lockload_sound_map) - MCFG_CPU_IO_MAP(z80_sound_io) + MCFG_DEVICE_ADD("audiocpu", Z80, 32220000/8) + MCFG_DEVICE_PROGRAM_MAP(lockload_sound_map) + MCFG_DEVICE_IO_MAP(z80_sound_io) MCFG_INPUT_MERGER_ANY_HIGH("sound_irq_merger") MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_IRQ0)) @@ -2227,9 +2227,9 @@ MACHINE_CONFIG_START(dragngun_state::lockload) MCFG_DECO_IRQ_ADD("irq", "screen") MCFG_DECO_IRQ_LIGHTGUN1_CB(IOPORT("LIGHT0_Y")) MCFG_DECO_IRQ_LIGHTGUN2_CB(IOPORT("LIGHT1_Y")) - MCFG_DECO_IRQ_RASTER2_IRQ_CB(DEVWRITELINE("irq_merger", input_merger_any_high_device, in_w<0>)) - MCFG_DECO_IRQ_VBLANK_IRQ_CB(DEVWRITELINE("irq_merger", input_merger_any_high_device, in_w<1>)) - MCFG_DECO_IRQ_LIGHTGUN_IRQ_CB(DEVWRITELINE("irq_merger", input_merger_any_high_device, in_w<2>)) + MCFG_DECO_IRQ_RASTER2_IRQ_CB(WRITELINE("irq_merger", input_merger_any_high_device, in_w<0>)) + MCFG_DECO_IRQ_VBLANK_IRQ_CB(WRITELINE("irq_merger", input_merger_any_high_device, in_w<1>)) + MCFG_DECO_IRQ_LIGHTGUN_IRQ_CB(WRITELINE("irq_merger", input_merger_any_high_device, in_w<2>)) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* to improve main<->audio comms */ @@ -2286,15 +2286,15 @@ MACHINE_CONFIG_START(dragngun_state::lockload) MCFG_DECO146_IN_PORTA_CB(IOPORT("INPUTS")) MCFG_DECO146_IN_PORTB_CB(IOPORT("SYSTEM")) MCFG_DECO146_IN_PORTC_CB(IOPORT("DSW")) - MCFG_DECO146_SOUNDLATCH_IRQ_CB(DEVWRITELINE("sound_irq_merger", input_merger_any_high_device, in_w<0>)) + MCFG_DECO146_SOUNDLATCH_IRQ_CB(WRITELINE("sound_irq_merger", input_merger_any_high_device, in_w<0>)) MCFG_DECO146_SET_INTERFACE_SCRAMBLE_REVERSE /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_YM2151_ADD("ymsnd", 32220000/9) - MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("sound_irq_merger", input_merger_any_high_device, in_w<1>)) - MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(dragngun_state, lockload_okibank_lo_w)) + MCFG_YM2151_IRQ_HANDLER(WRITELINE("sound_irq_merger", input_merger_any_high_device, in_w<1>)) + MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, dragngun_state, lockload_okibank_lo_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.42) MCFG_SOUND_ROUTE(1, "rspeaker", 0.42) @@ -2314,9 +2314,9 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(nslasher_state::tattass) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", ARM, 28000000/4) // unconfirmed - MCFG_CPU_PROGRAM_MAP(tattass_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", deco32_state, irq0_line_assert) + MCFG_DEVICE_ADD("maincpu", ARM, 28000000/4) // unconfirmed + MCFG_DEVICE_PROGRAM_MAP(tattass_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", deco32_state, irq0_line_assert) MCFG_EEPROM_SERIAL_93C76_8BIT_ADD("eeprom") @@ -2372,9 +2372,9 @@ MACHINE_CONFIG_START(nslasher_state::tattass) MCFG_DECO104_ADD("ioprot") MCFG_DECO146_IN_PORTA_CB(IOPORT("IN0")) - MCFG_DECO146_IN_PORTB_CB(READ16(nslasher_state, port_b_tattass)) + MCFG_DECO146_IN_PORTB_CB(READ16(*this, nslasher_state, port_b_tattass)) MCFG_DECO146_IN_PORTC_CB(IOPORT("IN1")) - MCFG_DECO146_SOUNDLATCH_IRQ_CB(WRITELINE(nslasher_state, tattass_sound_irq_w)) + MCFG_DECO146_SOUNDLATCH_IRQ_CB(WRITELINE(*this, nslasher_state, tattass_sound_irq_w)) MCFG_DECO146_SET_INTERFACE_SCRAMBLE_INTERLEAVE MCFG_VIDEO_START_OVERRIDE(nslasher_state,nslasher) @@ -2386,13 +2386,13 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(nslasher_state::nslasher) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", ARM, XTAL(28'322'000) / 4) - MCFG_CPU_PROGRAM_MAP(nslasher_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", deco32_state, irq0_line_assert) + MCFG_DEVICE_ADD("maincpu", ARM, XTAL(28'322'000) / 4) + MCFG_DEVICE_PROGRAM_MAP(nslasher_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", deco32_state, irq0_line_assert) - MCFG_CPU_ADD("audiocpu", Z80, 32220000/9) - MCFG_CPU_PROGRAM_MAP(z80_sound_map) - MCFG_CPU_IO_MAP(z80_sound_io) + MCFG_DEVICE_ADD("audiocpu", Z80, 32220000/9) + MCFG_DEVICE_PROGRAM_MAP(z80_sound_map) + MCFG_DEVICE_IO_MAP(z80_sound_io) MCFG_INPUT_MERGER_ANY_HIGH("sound_irq_merger") MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_IRQ0)) @@ -2455,17 +2455,17 @@ MACHINE_CONFIG_START(nslasher_state::nslasher) MCFG_DECO104_ADD("ioprot") MCFG_DECO146_IN_PORTA_CB(IOPORT("IN0")) - MCFG_DECO146_IN_PORTB_CB(DEVREADLINE("eeprom", eeprom_serial_93cxx_device, do_read)) MCFG_DEVCB_BIT(0) + MCFG_DECO146_IN_PORTB_CB(READLINE("eeprom", eeprom_serial_93cxx_device, do_read)) MCFG_DEVCB_BIT(0) MCFG_DECO146_IN_PORTC_CB(IOPORT("IN1")) - MCFG_DECO146_SOUNDLATCH_IRQ_CB(DEVWRITELINE("sound_irq_merger", input_merger_any_high_device, in_w<0>)) + MCFG_DECO146_SOUNDLATCH_IRQ_CB(WRITELINE("sound_irq_merger", input_merger_any_high_device, in_w<0>)) MCFG_DECO146_SET_INTERFACE_SCRAMBLE_INTERLEAVE /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_YM2151_ADD("ymsnd", 32220000/9) - MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("sound_irq_merger", input_merger_any_high_device, in_w<1>)) - MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(deco32_state, sound_bankswitch_w)) + MCFG_YM2151_IRQ_HANDLER(WRITELINE("sound_irq_merger", input_merger_any_high_device, in_w<1>)) + MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, deco32_state, sound_bankswitch_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.40) MCFG_SOUND_ROUTE(1, "rspeaker", 0.40) @@ -2481,16 +2481,16 @@ MACHINE_CONFIG_END // the US release uses a H6280 instead of a Z80, much like Lock 'n' Loaded MACHINE_CONFIG_START(nslasher_state::nslasheru) nslasher(config); - MCFG_CPU_REPLACE("audiocpu", H6280, 32220000/8) - MCFG_CPU_PROGRAM_MAP(h6280_sound_map) + MCFG_DEVICE_REPLACE("audiocpu", H6280, 32220000/8) + MCFG_DEVICE_PROGRAM_MAP(h6280_sound_map) - MCFG_SOUND_MODIFY("ymsnd") + MCFG_DEVICE_MODIFY("ymsnd") MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) MCFG_DEVICE_REMOVE("ioprot") MCFG_DECO104_ADD("ioprot") MCFG_DECO146_IN_PORTA_CB(IOPORT("IN0")) - MCFG_DECO146_IN_PORTB_CB(DEVREADLINE("eeprom", eeprom_serial_93cxx_device, do_read)) MCFG_DEVCB_BIT(0) + MCFG_DECO146_IN_PORTB_CB(READLINE("eeprom", eeprom_serial_93cxx_device, do_read)) MCFG_DEVCB_BIT(0) MCFG_DECO146_IN_PORTC_CB(IOPORT("IN1")) MCFG_DECO146_SOUNDLATCH_IRQ_CB(INPUTLINE("audiocpu", 0)) MCFG_DECO146_SET_INTERFACE_SCRAMBLE_INTERLEAVE |