summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/z88.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/z88.cpp')
-rw-r--r--src/mame/drivers/z88.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mame/drivers/z88.cpp b/src/mame/drivers/z88.cpp
index 5bfa67a3e71..0a76470650a 100644
--- a/src/mame/drivers/z88.cpp
+++ b/src/mame/drivers/z88.cpp
@@ -626,9 +626,9 @@ static void z88_cart(device_slot_interface &device)
MACHINE_CONFIG_START(z88_state::z88)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(9'830'400)/3) // divided by 3 through the uPD65031
- MCFG_CPU_PROGRAM_MAP(z88_mem)
- MCFG_CPU_IO_MAP(z88_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(9'830'400)/3) // divided by 3 through the uPD65031
+ MCFG_DEVICE_PROGRAM_MAP(z88_mem)
+ MCFG_DEVICE_IO_MAP(z88_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", LCD)
@@ -645,16 +645,16 @@ MACHINE_CONFIG_START(z88_state::z88)
MCFG_DEFAULT_LAYOUT(layout_lcd)
MCFG_DEVICE_ADD("blink", UPD65031, XTAL(9'830'400))
- MCFG_UPD65031_KB_CALLBACK(READ8(z88_state, kb_r))
+ MCFG_UPD65031_KB_CALLBACK(READ8(*this, z88_state, kb_r))
MCFG_UPD65031_INT_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_UPD65031_NMI_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI))
- MCFG_UPD65031_SPKR_CALLBACK(DEVWRITELINE("speaker", speaker_sound_device, level_w))
+ MCFG_UPD65031_SPKR_CALLBACK(WRITELINE("speaker", speaker_sound_device, level_w))
MCFG_UPD65031_SCR_UPDATE_CB(z88_state, lcd_update)
MCFG_UPD65031_MEM_UPDATE_CB(z88_state, bankswitch_update)
/* 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.50)
/* internal ram */
@@ -665,13 +665,13 @@ MACHINE_CONFIG_START(z88_state::z88)
/* cartridges */
MCFG_DEVICE_ADD("slot1", Z88CART_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(z88_cart, nullptr, false)
- MCFG_Z88CART_SLOT_OUT_FLP_CB(DEVWRITELINE("blink", upd65031_device, flp_w))
+ MCFG_Z88CART_SLOT_OUT_FLP_CB(WRITELINE("blink", upd65031_device, flp_w))
MCFG_DEVICE_ADD("slot2", Z88CART_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(z88_cart, nullptr, false)
- MCFG_Z88CART_SLOT_OUT_FLP_CB(DEVWRITELINE("blink", upd65031_device, flp_w))
+ MCFG_Z88CART_SLOT_OUT_FLP_CB(WRITELINE("blink", upd65031_device, flp_w))
MCFG_DEVICE_ADD("slot3", Z88CART_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(z88_cart, nullptr, false)
- MCFG_Z88CART_SLOT_OUT_FLP_CB(DEVWRITELINE("blink", upd65031_device, flp_w))
+ MCFG_Z88CART_SLOT_OUT_FLP_CB(WRITELINE("blink", upd65031_device, flp_w))
/* software lists */
MCFG_SOFTWARE_LIST_ADD("cart_list", "z88_cart")