diff options
Diffstat (limited to 'src/mame/drivers/llc.cpp')
-rw-r--r-- | src/mame/drivers/llc.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/mame/drivers/llc.cpp b/src/mame/drivers/llc.cpp index b1df7121948..9fd175f26fc 100644 --- a/src/mame/drivers/llc.cpp +++ b/src/mame/drivers/llc.cpp @@ -201,10 +201,10 @@ GFXDECODE_END /* Machine driver */ MACHINE_CONFIG_START(llc_state::llc1) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, XTAL(3'000'000)) + MCFG_DEVICE_ADD("maincpu", Z80, XTAL(3'000'000)) MCFG_Z80_DAISY_CHAIN(llc1_daisy_chain) - MCFG_CPU_PROGRAM_MAP(llc1_mem) - MCFG_CPU_IO_MAP(llc1_io) + MCFG_DEVICE_PROGRAM_MAP(llc1_mem) + MCFG_DEVICE_IO_MAP(llc1_io) MCFG_MACHINE_START_OVERRIDE(llc_state, llc1 ) MCFG_MACHINE_RESET_OVERRIDE(llc_state, llc1 ) @@ -223,21 +223,21 @@ MACHINE_CONFIG_START(llc_state::llc1) MCFG_DEFAULT_LAYOUT(layout_llc1) MCFG_DEVICE_ADD("z80pio1", Z80PIO, XTAL(3'000'000)) - MCFG_Z80PIO_IN_PA_CB(READ8(llc_state, llc1_port1_a_r)) - MCFG_Z80PIO_OUT_PA_CB(WRITE8(llc_state, llc1_port1_a_w)) - MCFG_Z80PIO_OUT_PB_CB(WRITE8(llc_state, llc1_port1_b_w)) + MCFG_Z80PIO_IN_PA_CB(READ8(*this, llc_state, llc1_port1_a_r)) + MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, llc_state, llc1_port1_a_w)) + MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, llc_state, llc1_port1_b_w)) MCFG_DEVICE_ADD("z80pio2", Z80PIO, XTAL(3'000'000)) - MCFG_Z80PIO_IN_PA_CB(READ8(llc_state, llc1_port2_a_r)) - MCFG_Z80PIO_IN_PB_CB(READ8(llc_state, llc1_port2_b_r)) + MCFG_Z80PIO_IN_PA_CB(READ8(*this, llc_state, llc1_port2_a_r)) + MCFG_Z80PIO_IN_PB_CB(READ8(*this, llc_state, llc1_port2_b_r)) MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL(3'000'000)) // timer 0 irq does digit display, and timer 3 irq does scan of the // monitor keyboard. // No idea how the CTC is connected, so guessed. MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg1)) - MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg3)) + MCFG_Z80CTC_ZC0_CB(WRITELINE("z80ctc", z80ctc_device, trg1)) + MCFG_Z80CTC_ZC1_CB(WRITELINE("z80ctc", z80ctc_device, trg3)) MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0) MCFG_GENERIC_KEYBOARD_CB(PUT(llc_state, kbd_put)) @@ -245,10 +245,10 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(llc_state::llc2) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, XTAL(3'000'000)) + MCFG_DEVICE_ADD("maincpu", Z80, XTAL(3'000'000)) MCFG_Z80_DAISY_CHAIN(llc2_daisy_chain) - MCFG_CPU_PROGRAM_MAP(llc2_mem) - MCFG_CPU_IO_MAP(llc2_io) + MCFG_DEVICE_PROGRAM_MAP(llc2_mem) + MCFG_DEVICE_IO_MAP(llc2_io) MCFG_MACHINE_RESET_OVERRIDE(llc_state, llc2 ) @@ -266,16 +266,16 @@ MACHINE_CONFIG_START(llc_state::llc2) /* 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.15) MCFG_DEVICE_ADD("z80pio1", Z80PIO, XTAL(3'000'000)) - MCFG_Z80PIO_IN_PA_CB(DEVREAD8(K7659_KEYBOARD_TAG, k7659_keyboard_device, read)) - MCFG_Z80PIO_IN_PB_CB(READ8(llc_state, llc2_port1_b_r)) - MCFG_Z80PIO_OUT_PB_CB(WRITE8(llc_state, llc2_port1_b_w)) + MCFG_Z80PIO_IN_PA_CB(READ8(K7659_KEYBOARD_TAG, k7659_keyboard_device, read)) + MCFG_Z80PIO_IN_PB_CB(READ8(*this, llc_state, llc2_port1_b_r)) + MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, llc_state, llc2_port1_b_w)) MCFG_DEVICE_ADD("z80pio2", Z80PIO, XTAL(3'000'000)) - MCFG_Z80PIO_IN_PA_CB(READ8(llc_state, llc2_port2_a_r)) + MCFG_Z80PIO_IN_PA_CB(READ8(*this, llc_state, llc2_port2_a_r)) MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL(3'000'000)) |