summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/nycaptor.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/nycaptor.cpp')
-rw-r--r--src/mame/drivers/nycaptor.cpp110
1 files changed, 55 insertions, 55 deletions
diff --git a/src/mame/drivers/nycaptor.cpp b/src/mame/drivers/nycaptor.cpp
index 282dbbcc17f..7e95342636d 100644
--- a/src/mame/drivers/nycaptor.cpp
+++ b/src/mame/drivers/nycaptor.cpp
@@ -735,17 +735,17 @@ void nycaptor_state::machine_reset()
MACHINE_CONFIG_START(nycaptor_state::nycaptor)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,8000000/2) /* ??? */
- MCFG_CPU_PROGRAM_MAP(nycaptor_master_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", nycaptor_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,8000000/2) /* ??? */
+ MCFG_DEVICE_PROGRAM_MAP(nycaptor_master_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nycaptor_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80,8000000/2)
- MCFG_CPU_PROGRAM_MAP(nycaptor_slave_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", nycaptor_state, irq0_line_hold) /* IRQ generated by ??? */
+ MCFG_DEVICE_ADD("sub", Z80,8000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(nycaptor_slave_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nycaptor_state, irq0_line_hold) /* IRQ generated by ??? */
- MCFG_CPU_ADD("audiocpu", Z80,8000000/2)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(nycaptor_state, irq0_line_hold, 2*60) /* IRQ generated by ??? */
+ MCFG_DEVICE_ADD("audiocpu", Z80,8000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(nycaptor_state, irq0_line_hold, 2*60) /* IRQ generated by ??? */
MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU,2000000)
@@ -770,24 +770,24 @@ MACHINE_CONFIG_START(nycaptor_state::nycaptor)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundnmi", input_merger_device, in_w<0>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<0>))
MCFG_INPUT_MERGER_ALL_HIGH("soundnmi")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ay1", AY8910, 8000000/4)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(nycaptor_state, unk_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(nycaptor_state, unk_w))
+ MCFG_DEVICE_ADD("ay1", AY8910, 8000000/4)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, nycaptor_state, unk_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, nycaptor_state, unk_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15)
- MCFG_SOUND_ADD("ay2", AY8910, 8000000/4)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(nycaptor_state, unk_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(nycaptor_state, unk_w))
+ MCFG_DEVICE_ADD("ay2", AY8910, 8000000/4)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, nycaptor_state, unk_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, nycaptor_state, unk_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15)
- MCFG_SOUND_ADD("msm", MSM5232, 2000000)
+ MCFG_DEVICE_ADD("msm", MSM5232, 2000000)
MCFG_MSM5232_SET_CAPACITORS(0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6) /* 0.65 (???) uF capacitors (match the sample, not verified) */
MCFG_SOUND_ROUTE(0, "speaker", 1.0) // pin 28 2'-1
MCFG_SOUND_ROUTE(1, "speaker", 1.0) // pin 29 4'-1
@@ -803,24 +803,24 @@ MACHINE_CONFIG_START(nycaptor_state::nycaptor)
// Does the DAC also exist on this board? nycaptor writes 0x80 to 0xd600
// Update: of course it exists, sound board seems common Taito design.
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
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_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(nycaptor_state::cyclshtg)
- MCFG_CPU_ADD("maincpu", Z80,8000000/2)
- MCFG_CPU_PROGRAM_MAP(cyclshtg_master_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", nycaptor_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,8000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(cyclshtg_master_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nycaptor_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80,8000000/2)
- MCFG_CPU_PROGRAM_MAP(cyclshtg_slave_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", nycaptor_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("sub", Z80,8000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(cyclshtg_slave_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nycaptor_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,8000000/2)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(nycaptor_state, irq0_line_hold, 2*60)
+ MCFG_DEVICE_ADD("audiocpu", Z80,8000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(nycaptor_state, irq0_line_hold, 2*60)
#ifdef USE_MCU
MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU,2000000)
@@ -844,24 +844,24 @@ MACHINE_CONFIG_START(nycaptor_state::cyclshtg)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundnmi", input_merger_device, in_w<0>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<0>))
MCFG_INPUT_MERGER_ALL_HIGH("soundnmi")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ay1", AY8910, 8000000/4)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(nycaptor_state, unk_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(nycaptor_state, unk_w))
+ MCFG_DEVICE_ADD("ay1", AY8910, 8000000/4)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, nycaptor_state, unk_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, nycaptor_state, unk_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15)
- MCFG_SOUND_ADD("ay2", AY8910, 8000000/4)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(nycaptor_state, unk_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(nycaptor_state, unk_w))
+ MCFG_DEVICE_ADD("ay2", AY8910, 8000000/4)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, nycaptor_state, unk_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, nycaptor_state, unk_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15)
- MCFG_SOUND_ADD("msm", MSM5232, 2000000)
+ MCFG_DEVICE_ADD("msm", MSM5232, 2000000)
MCFG_MSM5232_SET_CAPACITORS(0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6) /* 0.65 (???) uF capacitors (match the sample, not verified) */
MCFG_SOUND_ROUTE(0, "speaker", 1.0) // pin 28 2'-1
MCFG_SOUND_ROUTE(1, "speaker", 1.0) // pin 29 4'-1
@@ -875,7 +875,7 @@ MACHINE_CONFIG_START(nycaptor_state::cyclshtg)
// pin 2 SOLO 16' not mapped
// pin 22 Noise Output not mapped
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
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_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -883,18 +883,18 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nycaptor_state::bronx)
- MCFG_CPU_ADD("maincpu", Z80,8000000/2)
- MCFG_CPU_PROGRAM_MAP(bronx_master_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", nycaptor_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,8000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(bronx_master_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nycaptor_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80,8000000/2)
- MCFG_CPU_PROGRAM_MAP(bronx_slave_map)
- MCFG_CPU_IO_MAP(bronx_slave_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", nycaptor_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("sub", Z80,8000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(bronx_slave_map)
+ MCFG_DEVICE_IO_MAP(bronx_slave_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nycaptor_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,8000000/2)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(nycaptor_state, irq0_line_hold, 2*60)
+ MCFG_DEVICE_ADD("audiocpu", Z80,8000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(nycaptor_state, irq0_line_hold, 2*60)
MCFG_QUANTUM_TIME(attotime::from_hz(120))
@@ -913,24 +913,24 @@ MACHINE_CONFIG_START(nycaptor_state::bronx)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundnmi", input_merger_device, in_w<0>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<0>))
MCFG_INPUT_MERGER_ALL_HIGH("soundnmi")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ay1", AY8910, 8000000/4)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(nycaptor_state, unk_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(nycaptor_state, unk_w))
+ MCFG_DEVICE_ADD("ay1", AY8910, 8000000/4)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, nycaptor_state, unk_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, nycaptor_state, unk_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15)
- MCFG_SOUND_ADD("ay2", AY8910, 8000000/4)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(nycaptor_state, unk_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(nycaptor_state, unk_w))
+ MCFG_DEVICE_ADD("ay2", AY8910, 8000000/4)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, nycaptor_state, unk_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, nycaptor_state, unk_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15)
- MCFG_SOUND_ADD("msm", MSM5232, 2000000)
+ MCFG_DEVICE_ADD("msm", MSM5232, 2000000)
MCFG_MSM5232_SET_CAPACITORS(0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6) /* 0.65 (???) uF capacitors (match the sample, not verified) */
MCFG_SOUND_ROUTE(0, "speaker", 1.0) // pin 28 2'-1
MCFG_SOUND_ROUTE(1, "speaker", 1.0) // pin 29 4'-1
@@ -944,7 +944,7 @@ MACHINE_CONFIG_START(nycaptor_state::bronx)
// pin 2 SOLO 16' not mapped
// pin 22 Noise Output not mapped
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
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_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END