diff options
Diffstat (limited to 'src/mame/drivers/mpf1.cpp')
-rw-r--r-- | src/mame/drivers/mpf1.cpp | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/mame/drivers/mpf1.cpp b/src/mame/drivers/mpf1.cpp index 468c9b8af0f..f4b49c2b579 100644 --- a/src/mame/drivers/mpf1.cpp +++ b/src/mame/drivers/mpf1.cpp @@ -358,10 +358,10 @@ void mpf1_state::machine_reset() MACHINE_CONFIG_START(mpf1_state::mpf1) /* basic machine hardware */ - MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(3'579'545)/2) - MCFG_CPU_PROGRAM_MAP(mpf1_map) - MCFG_CPU_OPCODES_MAP(mpf1_step) - MCFG_CPU_IO_MAP(mpf1_io_map) + MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(3'579'545)/2) + MCFG_DEVICE_PROGRAM_MAP(mpf1_map) + MCFG_DEVICE_OPCODES_MAP(mpf1_step) + MCFG_DEVICE_IO_MAP(mpf1_io_map) MCFG_Z80_DAISY_CHAIN(mpf1_daisy_chain) /* devices */ @@ -372,9 +372,9 @@ MACHINE_CONFIG_START(mpf1_state::mpf1) MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0) - MCFG_I8255_IN_PORTA_CB(READ8(mpf1_state, ppi_pa_r)) - MCFG_I8255_OUT_PORTB_CB(WRITE8(mpf1_state, ppi_pb_w)) - MCFG_I8255_OUT_PORTC_CB(WRITE8(mpf1_state, ppi_pc_w)) + MCFG_I8255_IN_PORTA_CB(READ8(*this, mpf1_state, ppi_pa_r)) + MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, mpf1_state, ppi_pb_w)) + MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, mpf1_state, ppi_pc_w)) MCFG_CASSETTE_ADD("cassette") MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED) @@ -384,7 +384,7 @@ MACHINE_CONFIG_START(mpf1_state::mpf1) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0) + MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MCFG_TIMER_DRIVER_ADD_PERIODIC("halt_timer", mpf1_state, check_halt_callback, attotime::from_hz(1)) @@ -392,10 +392,10 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(mpf1_state::mpf1b) /* basic machine hardware */ - MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(3'579'545)/2) - MCFG_CPU_PROGRAM_MAP(mpf1b_map) - MCFG_CPU_OPCODES_MAP(mpf1_step) - MCFG_CPU_IO_MAP(mpf1b_io_map) + MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(3'579'545)/2) + MCFG_DEVICE_PROGRAM_MAP(mpf1b_map) + MCFG_DEVICE_OPCODES_MAP(mpf1_step) + MCFG_DEVICE_IO_MAP(mpf1b_io_map) MCFG_Z80_DAISY_CHAIN(mpf1_daisy_chain) /* devices */ @@ -406,9 +406,9 @@ MACHINE_CONFIG_START(mpf1_state::mpf1b) MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0) - MCFG_I8255_IN_PORTA_CB(READ8(mpf1_state, ppi_pa_r)) - MCFG_I8255_OUT_PORTB_CB(WRITE8(mpf1_state, ppi_pb_w)) - MCFG_I8255_OUT_PORTC_CB(WRITE8(mpf1_state, ppi_pc_w)) + MCFG_I8255_IN_PORTA_CB(READ8(*this, mpf1_state, ppi_pa_r)) + MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, mpf1_state, ppi_pb_w)) + MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, mpf1_state, ppi_pc_w)) MCFG_CASSETTE_ADD("cassette") MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED) @@ -418,10 +418,10 @@ MACHINE_CONFIG_START(mpf1_state::mpf1b) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0) + MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) - MCFG_SOUND_ADD(TMS5220_TAG, TMS5220, 680000L) + MCFG_DEVICE_ADD(TMS5220_TAG, TMS5220, 680000L) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_TIMER_DRIVER_ADD_PERIODIC("halt_timer", mpf1_state, check_halt_callback, attotime::from_hz(1)) @@ -429,10 +429,10 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(mpf1_state::mpf1p) /* basic machine hardware */ - MCFG_CPU_ADD(Z80_TAG, Z80, 2500000) - MCFG_CPU_PROGRAM_MAP(mpf1p_map) - MCFG_CPU_OPCODES_MAP(mpf1_step) - MCFG_CPU_IO_MAP(mpf1p_io_map) + MCFG_DEVICE_ADD(Z80_TAG, Z80, 2500000) + MCFG_DEVICE_PROGRAM_MAP(mpf1p_map) + MCFG_DEVICE_OPCODES_MAP(mpf1_step) + MCFG_DEVICE_IO_MAP(mpf1p_io_map) MCFG_Z80_DAISY_CHAIN(mpf1_daisy_chain) /* video hardware */ @@ -446,16 +446,16 @@ MACHINE_CONFIG_START(mpf1_state::mpf1p) MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0) - MCFG_I8255_IN_PORTA_CB(READ8(mpf1_state, ppi_pa_r)) - MCFG_I8255_OUT_PORTB_CB(WRITE8(mpf1_state, ppi_pb_w)) - MCFG_I8255_OUT_PORTC_CB(WRITE8(mpf1_state, ppi_pc_w)) + MCFG_I8255_IN_PORTA_CB(READ8(*this, mpf1_state, ppi_pa_r)) + MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, mpf1_state, ppi_pb_w)) + MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, mpf1_state, ppi_pc_w)) MCFG_CASSETTE_ADD("cassette") MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0) + MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MCFG_TIMER_DRIVER_ADD_PERIODIC("halt_timer", mpf1_state, check_halt_callback, attotime::from_hz(1)) |