diff options
author | 2019-03-25 22:44:58 +0100 | |
---|---|---|
committer | 2019-03-25 22:44:58 +0100 | |
commit | c24473ddff715ecec2e258a6eb38960cf8c8e98e (patch) | |
tree | 8ea44b6396a6129913c0aac13859b5de9965e972 /src/mame/drivers/scorpion.cpp | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
Diffstat (limited to 'src/mame/drivers/scorpion.cpp')
-rw-r--r-- | src/mame/drivers/scorpion.cpp | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/src/mame/drivers/scorpion.cpp b/src/mame/drivers/scorpion.cpp index 4fb403cbeb1..d88d0f09ca9 100644 --- a/src/mame/drivers/scorpion.cpp +++ b/src/mame/drivers/scorpion.cpp @@ -292,36 +292,39 @@ static GFXDECODE_START( gfx_quorum ) GFXDECODE_ENTRY( "maincpu", 0x1fb00, quorum_charlayout, 0, 8 ) GFXDECODE_END -MACHINE_CONFIG_START(scorpion_state::scorpion) +void scorpion_state::scorpion(machine_config &config) +{ spectrum_128(config); - MCFG_DEVICE_MODIFY("maincpu") - MCFG_DEVICE_PROGRAM_MAP(scorpion_mem) - MCFG_DEVICE_IO_MAP(scorpion_io) - MCFG_DEVICE_OPCODES_MAP(scorpion_switch) + + m_maincpu->set_addrmap(AS_PROGRAM, &scorpion_state::scorpion_mem); + m_maincpu->set_addrmap(AS_IO, &scorpion_state::scorpion_io); + m_maincpu->set_addrmap(AS_OPCODES, &scorpion_state::scorpion_switch); MCFG_MACHINE_START_OVERRIDE(scorpion_state, scorpion ) MCFG_MACHINE_RESET_OVERRIDE(scorpion_state, scorpion ) - MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_scorpion) + subdevice<gfxdecode_device>("gfxdecode")->set_info(gfx_scorpion); BETA_DISK(config, m_beta, 0); /* internal ram */ m_ram->set_default_size("256K"); - MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_timer", scorpion_state, nmi_check_callback, attotime::from_hz(50)) + TIMER(config, "nmi_timer").configure_periodic(FUNC(scorpion_state::nmi_check_callback), attotime::from_hz(50)); - MCFG_DEVICE_REMOVE("exp") -MACHINE_CONFIG_END + config.device_remove("exp"); +} -MACHINE_CONFIG_START(scorpion_state::profi) +void scorpion_state::profi(machine_config &config) +{ scorpion(config); - MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_profi) -MACHINE_CONFIG_END + subdevice<gfxdecode_device>("gfxdecode")->set_info(gfx_profi); +} -MACHINE_CONFIG_START(scorpion_state::quorum) +void scorpion_state::quorum(machine_config &config) +{ scorpion(config); - MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_quorum) -MACHINE_CONFIG_END + subdevice<gfxdecode_device>("gfxdecode")->set_info(gfx_quorum); +} |