diff options
Diffstat (limited to 'src/mame/drivers/kc.cpp')
-rw-r--r-- | src/mame/drivers/kc.cpp | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/src/mame/drivers/kc.cpp b/src/mame/drivers/kc.cpp index 31fc08ab382..effb562b56d 100644 --- a/src/mame/drivers/kc.cpp +++ b/src/mame/drivers/kc.cpp @@ -98,26 +98,26 @@ void kc85_exp(device_slot_interface &device) MACHINE_CONFIG_START(kc_state::kc85_3) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, KC85_3_CLOCK) - MCFG_CPU_PROGRAM_MAP(kc85_3_mem) - MCFG_CPU_IO_MAP(kc85_3_io) + MCFG_DEVICE_ADD("maincpu", Z80, KC85_3_CLOCK) + MCFG_DEVICE_PROGRAM_MAP(kc85_3_mem) + MCFG_DEVICE_IO_MAP(kc85_3_io) MCFG_Z80_DAISY_CHAIN(kc85_daisy_chain) MCFG_QUANTUM_TIME(attotime::from_hz(60)) MCFG_DEVICE_ADD("z80pio", Z80PIO, KC85_3_CLOCK) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", 0)) - MCFG_Z80PIO_IN_PA_CB(READ8(kc_state, pio_porta_r)) - MCFG_Z80PIO_OUT_PA_CB(WRITE8(kc_state, pio_porta_w)) - MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(kc_state, pio_ardy_cb)) - MCFG_Z80PIO_IN_PB_CB(READ8(kc_state, pio_portb_r)) - MCFG_Z80PIO_OUT_PB_CB(WRITE8(kc_state, pio_portb_w)) - MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(kc_state, pio_brdy_cb)) + MCFG_Z80PIO_IN_PA_CB(READ8(*this, kc_state, pio_porta_r)) + MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, kc_state, pio_porta_w)) + MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(*this, kc_state, pio_ardy_cb)) + MCFG_Z80PIO_IN_PB_CB(READ8(*this, kc_state, pio_portb_r)) + MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, kc_state, pio_portb_w)) + MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(*this, kc_state, pio_brdy_cb)) MCFG_DEVICE_ADD("z80ctc", Z80CTC, KC85_3_CLOCK) MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", 0)) - MCFG_Z80CTC_ZC0_CB(WRITELINE(kc_state, ctc_zc0_callback)) - MCFG_Z80CTC_ZC1_CB(WRITELINE(kc_state, ctc_zc1_callback)) - MCFG_Z80CTC_ZC2_CB(WRITELINE(kc_state, video_toggle_blink_state)) + MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, kc_state, ctc_zc0_callback)) + MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, kc_state, ctc_zc1_callback)) + MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, kc_state, video_toggle_blink_state)) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -130,13 +130,13 @@ MACHINE_CONFIG_START(kc_state::kc85_3) MCFG_PALETTE_INIT_OWNER(kc_state, kc85 ) MCFG_DEVICE_ADD("keyboard", KC_KEYBOARD, XTAL(4'000'000)) - MCFG_KC_KEYBOARD_OUT_CALLBACK(WRITELINE(kc_state, keyboard_cb)) + MCFG_KC_KEYBOARD_OUT_CALLBACK(WRITELINE(*this, kc_state, keyboard_cb)) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette") MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) - MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0) + MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) /* devices */ @@ -182,26 +182,26 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(kc85_4_state::kc85_4) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, KC85_4_CLOCK) - MCFG_CPU_PROGRAM_MAP(kc85_4_mem) - MCFG_CPU_IO_MAP(kc85_4_io) + MCFG_DEVICE_ADD("maincpu", Z80, KC85_4_CLOCK) + MCFG_DEVICE_PROGRAM_MAP(kc85_4_mem) + MCFG_DEVICE_IO_MAP(kc85_4_io) MCFG_Z80_DAISY_CHAIN(kc85_daisy_chain) MCFG_QUANTUM_TIME(attotime::from_hz(60)) MCFG_DEVICE_ADD("z80pio", Z80PIO, KC85_4_CLOCK) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", 0)) - MCFG_Z80PIO_IN_PA_CB(READ8(kc_state, pio_porta_r)) - MCFG_Z80PIO_OUT_PA_CB(WRITE8(kc_state, pio_porta_w)) - MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(kc_state, pio_ardy_cb)) - MCFG_Z80PIO_IN_PB_CB(READ8(kc_state, pio_portb_r)) - MCFG_Z80PIO_OUT_PB_CB(WRITE8(kc_state, pio_portb_w)) - MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(kc_state, pio_brdy_cb)) + MCFG_Z80PIO_IN_PA_CB(READ8(*this, kc_state, pio_porta_r)) + MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, kc_state, pio_porta_w)) + MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(*this, kc_state, pio_ardy_cb)) + MCFG_Z80PIO_IN_PB_CB(READ8(*this, kc_state, pio_portb_r)) + MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, kc_state, pio_portb_w)) + MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(*this, kc_state, pio_brdy_cb)) MCFG_DEVICE_ADD("z80ctc", Z80CTC, KC85_4_CLOCK) MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", 0)) - MCFG_Z80CTC_ZC0_CB(WRITELINE(kc_state, ctc_zc0_callback)) - MCFG_Z80CTC_ZC1_CB(WRITELINE(kc_state, ctc_zc1_callback)) - MCFG_Z80CTC_ZC2_CB(WRITELINE(kc_state, video_toggle_blink_state)) + MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, kc_state, ctc_zc0_callback)) + MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, kc_state, ctc_zc1_callback)) + MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, kc_state, video_toggle_blink_state)) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -214,13 +214,13 @@ MACHINE_CONFIG_START(kc85_4_state::kc85_4) MCFG_PALETTE_INIT_OWNER(kc85_4_state, kc85 ) MCFG_DEVICE_ADD("keyboard", KC_KEYBOARD, XTAL(4'000'000)) - MCFG_KC_KEYBOARD_OUT_CALLBACK(WRITELINE(kc_state, keyboard_cb)) + MCFG_KC_KEYBOARD_OUT_CALLBACK(WRITELINE(*this, kc_state, keyboard_cb)) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette") MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) - MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0) + MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) /* devices */ |