summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/sapi1.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/sapi1.cpp')
-rw-r--r--src/mame/drivers/sapi1.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/mame/drivers/sapi1.cpp b/src/mame/drivers/sapi1.cpp
index 9e3c3deb865..142b7efb484 100644
--- a/src/mame/drivers/sapi1.cpp
+++ b/src/mame/drivers/sapi1.cpp
@@ -623,7 +623,7 @@ void sapi1_state::init_sapizps3b()
/* Machine driver */
MACHINE_CONFIG_START(sapi1_state::sapi1)
/* basic machine hardware */
- MCFG_DEVICE_ADD("maincpu", I8080A, XTAL(18'000'000) / 9) // Tesla MHB8080A + MHB8224 + MHB8228
+ MCFG_DEVICE_ADD(m_maincpu, I8080A, XTAL(18'000'000) / 9) // Tesla MHB8080A + MHB8224 + MHB8228
MCFG_DEVICE_PROGRAM_MAP(sapi1_mem)
MCFG_MACHINE_RESET_OVERRIDE(sapi1_state, sapi1)
@@ -642,14 +642,15 @@ MACHINE_CONFIG_START(sapi1_state::sapi1)
RAM(config, RAM_TAG).set_default_size("64K");
MACHINE_CONFIG_END
-MACHINE_CONFIG_START(sapi1_state::sapi2)
+void sapi1_state::sapi2(machine_config &config)
+{
sapi1(config);
/* basic machine hardware */
- MCFG_DEVICE_MODIFY("maincpu")
- MCFG_DEVICE_PROGRAM_MAP(sapi2_mem)
- MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(PUT(sapi1_state, kbd_put))
-MACHINE_CONFIG_END
+ m_maincpu->set_addrmap(AS_PROGRAM, &sapi1_state::sapi2_mem);
+
+ generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard", 0));
+ keyboard.set_keyboard_callback(FUNC(sapi1_state::kbd_put));
+}
MACHINE_CONFIG_START(sapi1_state::sapi3)
sapi2(config);