diff options
Diffstat (limited to 'src/mame/drivers/eti660.cpp')
-rw-r--r-- | src/mame/drivers/eti660.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/mame/drivers/eti660.cpp b/src/mame/drivers/eti660.cpp index bde64892b81..fe17fa3a487 100644 --- a/src/mame/drivers/eti660.cpp +++ b/src/mame/drivers/eti660.cpp @@ -306,15 +306,15 @@ QUICKLOAD_LOAD_MEMBER( eti660_state, eti660 ) MACHINE_CONFIG_START(eti660_state::eti660) /* basic machine hardware */ - MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL(8'867'238)/5) - MCFG_CPU_PROGRAM_MAP(mem_map) - MCFG_CPU_IO_MAP(io_map) + MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, XTAL(8'867'238)/5) + MCFG_DEVICE_PROGRAM_MAP(mem_map) + MCFG_DEVICE_IO_MAP(io_map) MCFG_COSMAC_WAIT_CALLBACK(VCC) - MCFG_COSMAC_CLEAR_CALLBACK(READLINE(eti660_state, clear_r)) - MCFG_COSMAC_EF2_CALLBACK(READLINE(eti660_state, ef2_r)) - MCFG_COSMAC_EF4_CALLBACK(READLINE(eti660_state, ef4_r)) - MCFG_COSMAC_Q_CALLBACK(WRITELINE(eti660_state, q_w)) - MCFG_COSMAC_DMAW_CALLBACK(WRITE8(eti660_state, dma_w)) + MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, eti660_state, clear_r)) + MCFG_COSMAC_EF2_CALLBACK(READLINE(*this, eti660_state, ef2_r)) + MCFG_COSMAC_EF4_CALLBACK(READLINE(*this, eti660_state, ef4_r)) + MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, eti660_state, q_w)) + MCFG_COSMAC_DMAW_CALLBACK(WRITE8(*this, eti660_state, dma_w)) /* video hardware */ MCFG_CDP1864_SCREEN_ADD(SCREEN_TAG, XTAL(8'867'238)/5) @@ -322,14 +322,14 @@ MACHINE_CONFIG_START(eti660_state::eti660) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_CDP1864_ADD(CDP1864_TAG, SCREEN_TAG, XTAL(8'867'238)/5, GND, INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_DMAOUT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_EF1), NOOP, READLINE(eti660_state, rdata_r), READLINE(eti660_state, bdata_r), READLINE(eti660_state, gdata_r)) + MCFG_CDP1864_ADD(CDP1864_TAG, SCREEN_TAG, XTAL(8'867'238)/5, GND, INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_DMAOUT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_EF1), NOOP, READLINE(*this, eti660_state, rdata_r), READLINE(*this, eti660_state, bdata_r), READLINE(*this, eti660_state, gdata_r)) MCFG_CDP1864_CHROMINANCE(RES_K(2.2), RES_K(1), RES_K(4.7), RES_K(4.7)) // R7, R5, R6, R4 MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) /* devices */ MCFG_DEVICE_ADD(MC6821_TAG, PIA6821, 0) - MCFG_PIA_READPA_HANDLER(READ8(eti660_state, pia_pa_r)) - MCFG_PIA_WRITEPA_HANDLER(WRITE8(eti660_state, pia_pa_w)) + MCFG_PIA_READPA_HANDLER(READ8(*this, eti660_state, pia_pa_r)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, eti660_state, pia_pa_w)) MCFG_PIA_IRQA_HANDLER(INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT)) MCFG_DEVCB_INVERT MCFG_PIA_IRQB_HANDLER(INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT)) MCFG_DEVCB_INVERT |