diff options
Diffstat (limited to 'src/mame/drivers/senjyo.cpp')
-rw-r--r-- | src/mame/drivers/senjyo.cpp | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/mame/drivers/senjyo.cpp b/src/mame/drivers/senjyo.cpp index 0aa1069e66b..a2a911b24c3 100644 --- a/src/mame/drivers/senjyo.cpp +++ b/src/mame/drivers/senjyo.cpp @@ -551,23 +551,23 @@ GFXDECODE_END MACHINE_CONFIG_START(senjyo_state::senjyo) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz? */ - MCFG_CPU_PROGRAM_MAP(senjyo_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", senjyo_state, irq0_line_assert) + MCFG_DEVICE_ADD("maincpu", Z80, 4000000) /* 4 MHz? */ + MCFG_DEVICE_PROGRAM_MAP(senjyo_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", senjyo_state, irq0_line_assert) - MCFG_CPU_ADD("sub", Z80, 2000000) /* 2 MHz? */ + MCFG_DEVICE_ADD("sub", Z80, 2000000) /* 2 MHz? */ MCFG_Z80_DAISY_CHAIN(senjyo_daisy_chain) - MCFG_CPU_PROGRAM_MAP(senjyo_sound_map) - MCFG_CPU_IO_MAP(senjyo_sound_io_map) + MCFG_DEVICE_PROGRAM_MAP(senjyo_sound_map) + MCFG_DEVICE_IO_MAP(senjyo_sound_io_map) MCFG_DEVICE_ADD("z80pio", Z80PIO, 2000000) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("sub", INPUT_LINE_IRQ0)) - MCFG_Z80PIO_IN_PA_CB(READ8(senjyo_state, pio_pa_r)) + MCFG_Z80PIO_IN_PA_CB(READ8(*this, senjyo_state, pio_pa_r)) MCFG_DEVICE_ADD("z80ctc", Z80CTC, 2000000 /* same as "sub" */) MCFG_Z80CTC_INTR_CB(INPUTLINE("sub", INPUT_LINE_IRQ0)) - MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg1)) - MCFG_Z80CTC_ZC2_CB(WRITELINE(senjyo_state, sound_line_clock)) + MCFG_Z80CTC_ZC0_CB(WRITELINE("z80ctc", z80ctc_device, trg1)) + MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, senjyo_state, sound_line_clock)) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -588,16 +588,16 @@ MACHINE_CONFIG_START(senjyo_state::senjyo) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("speaker") - MCFG_SOUND_ADD("sn1", SN76496, 2000000) + MCFG_DEVICE_ADD("sn1", SN76496, 2000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) - MCFG_SOUND_ADD("sn2", SN76496, 2000000) + MCFG_DEVICE_ADD("sn2", SN76496, 2000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) - MCFG_SOUND_ADD("sn3", SN76496, 2000000) + MCFG_DEVICE_ADD("sn3", SN76496, 2000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) - MCFG_SOUND_ADD("dac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.05) // unknown DAC + MCFG_DEVICE_ADD("dac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.05) // 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 @@ -606,19 +606,19 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(senjyo_state::senjyox_e) senjyo(config); - MCFG_CPU_REPLACE("maincpu", SEGA_315_5015, 4000000) /* 4 MHz? */ - MCFG_CPU_PROGRAM_MAP(senjyo_map) - MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", senjyo_state, irq0_line_assert) + MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5015, 4000000) /* 4 MHz? */ + MCFG_DEVICE_PROGRAM_MAP(senjyo_map) + MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", senjyo_state, irq0_line_assert) MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END MACHINE_CONFIG_START(senjyo_state::senjyox_a) senjyo(config); - MCFG_CPU_REPLACE("maincpu", SEGA_315_5018, 4000000) /* 4 MHz? */ - MCFG_CPU_PROGRAM_MAP(senjyo_map) - MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", senjyo_state, irq0_line_assert) + MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5018, 4000000) /* 4 MHz? */ + MCFG_DEVICE_PROGRAM_MAP(senjyo_map) + MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", senjyo_state, irq0_line_assert) MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END @@ -627,11 +627,11 @@ MACHINE_CONFIG_START(senjyo_state::starforb) senjyox_e(config); /* basic machine hardware */ - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(starforb_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(starforb_map) - MCFG_CPU_MODIFY("sub") - MCFG_CPU_PROGRAM_MAP(starforb_sound_map) + MCFG_DEVICE_MODIFY("sub") + MCFG_DEVICE_PROGRAM_MAP(starforb_sound_map) MACHINE_CONFIG_END |