summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/elf.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/elf.cpp')
-rw-r--r--src/mame/drivers/elf.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/mame/drivers/elf.cpp b/src/mame/drivers/elf.cpp
index dee2c473c66..0ee0657748c 100644
--- a/src/mame/drivers/elf.cpp
+++ b/src/mame/drivers/elf.cpp
@@ -235,16 +235,16 @@ QUICKLOAD_LOAD_MEMBER( elf2_state, elf )
MACHINE_CONFIG_START(elf2_state::elf2)
/* basic machine hardware */
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL(3'579'545)/2)
- MCFG_CPU_PROGRAM_MAP(elf2_mem)
- MCFG_CPU_IO_MAP(elf2_io)
- MCFG_COSMAC_WAIT_CALLBACK(READLINE(elf2_state, wait_r))
- MCFG_COSMAC_CLEAR_CALLBACK(READLINE(elf2_state, clear_r))
- MCFG_COSMAC_EF4_CALLBACK(READLINE(elf2_state, ef4_r))
- MCFG_COSMAC_Q_CALLBACK(WRITELINE(elf2_state, q_w))
- MCFG_COSMAC_DMAR_CALLBACK(READ8(elf2_state, dma_r))
- MCFG_COSMAC_DMAW_CALLBACK(DEVWRITE8(CDP1861_TAG, cdp1861_device, dma_w))
- MCFG_COSMAC_SC_CALLBACK(WRITE8(elf2_state, sc_w))
+ MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, XTAL(3'579'545)/2)
+ MCFG_DEVICE_PROGRAM_MAP(elf2_mem)
+ MCFG_DEVICE_IO_MAP(elf2_io)
+ MCFG_COSMAC_WAIT_CALLBACK(READLINE(*this, elf2_state, wait_r))
+ MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, elf2_state, clear_r))
+ MCFG_COSMAC_EF4_CALLBACK(READLINE(*this, elf2_state, ef4_r))
+ MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, elf2_state, q_w))
+ MCFG_COSMAC_DMAR_CALLBACK(READ8(*this, elf2_state, dma_r))
+ MCFG_COSMAC_DMAW_CALLBACK(WRITE8(CDP1861_TAG, cdp1861_device, dma_w))
+ MCFG_COSMAC_SC_CALLBACK(WRITE8(*this, elf2_state, sc_w))
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_elf2)
@@ -259,16 +259,16 @@ MACHINE_CONFIG_START(elf2_state::elf2)
MCFG_DEVICE_ADD(MM74C923_TAG, MM74C923, 0)
MCFG_MM74C922_OSC(CAP_U(0.15))
MCFG_MM74C922_DEBOUNCE(CAP_U(1))
- MCFG_MM74C922_DA_CALLBACK(WRITELINE(elf2_state, da_w))
+ MCFG_MM74C922_DA_CALLBACK(WRITELINE(*this, elf2_state, da_w))
MCFG_MM74C922_X1_CALLBACK(IOPORT("X1"))
MCFG_MM74C922_X2_CALLBACK(IOPORT("X2"))
MCFG_MM74C922_X3_CALLBACK(IOPORT("X3"))
MCFG_MM74C922_X4_CALLBACK(IOPORT("X4"))
MCFG_DEVICE_ADD(DM9368_H_TAG, DM9368, 0)
- MCFG_DM9368_UPDATE_CALLBACK(WRITE8(elf2_state, digit_w<0>))
+ MCFG_DM9368_UPDATE_CALLBACK(WRITE8(*this, elf2_state, digit_w<0>))
MCFG_DEVICE_ADD(DM9368_L_TAG, DM9368, 0)
- MCFG_DM9368_UPDATE_CALLBACK(WRITE8(elf2_state, digit_w<1>))
+ MCFG_DM9368_UPDATE_CALLBACK(WRITE8(*this, elf2_state, digit_w<1>))
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED)