summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/model1.cpp
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2018-01-07 22:20:14 +0100
committer Olivier Galibert <galibert@pobox.com>2018-01-17 16:11:18 +0100
commitd469cc04bcace0f601802301caeddc5b473b75f2 (patch)
treea9d71540c9c69cee5ab3a533476b81833fa02f5f /src/mame/drivers/model1.cpp
parent9f383f76ce6f00cc3320e5ba53dc323781e0077b (diff)
API Change: Machine configs are now a method of the owner class, and the prototype is simplified [O. Galibert]
Beware, the device context does not follow in MCFG_FRAGMENT_ADD anymore due to the prototype change. So creating a device then configuring through a fragment doesn't work as-is. The simplest solution is just to add a MCFG_DEVICE_MODIFY at the start of the fragment with the correct tag.
Diffstat (limited to 'src/mame/drivers/model1.cpp')
-rw-r--r--src/mame/drivers/model1.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mame/drivers/model1.cpp b/src/mame/drivers/model1.cpp
index 9ac1407f6d8..53403563b5a 100644
--- a/src/mame/drivers/model1.cpp
+++ b/src/mame/drivers/model1.cpp
@@ -1614,7 +1614,7 @@ ROM_START( netmerc )
ROM_LOAD16_BYTE( "u2", 0x0001, 0x4000, CRC(c589f428) SHA1(98dc0114a5f89636b4e237ed954e19f1cfd186ab) )
ROM_END
-static MACHINE_CONFIG_START( model1 )
+MACHINE_CONFIG_START(model1_state::model1)
MCFG_CPU_ADD("maincpu", V60, 16000000)
MCFG_CPU_PROGRAM_MAP(model1_mem)
MCFG_CPU_IO_MAP(model1_io)
@@ -1654,7 +1654,7 @@ static MACHINE_CONFIG_START( model1 )
MCFG_M1COMM_ADD("m1comm")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED(swa, model1)
+MACHINE_CONFIG_DERIVED(model1_state::swa, model1)
MCFG_SPEAKER_STANDARD_STEREO("dleft", "dright")
MCFG_DSBZ80_ADD(DSBZ80_TAG)
MCFG_SOUND_ROUTE(0, "dleft", 1.0)
@@ -1672,12 +1672,12 @@ static ADDRESS_MAP_START( polhemus_map, AS_PROGRAM, 16, model1_state )
AM_RANGE(0xf8000, 0xfffff) AM_ROM AM_REGION("polhemus", 0)
ADDRESS_MAP_END
-static MACHINE_CONFIG_DERIVED( netmerc, model1 )
+MACHINE_CONFIG_DERIVED(model1_state::netmerc, model1)
MCFG_CPU_ADD("polhemus", I386SX, 16000000)
MCFG_CPU_PROGRAM_MAP(polhemus_map)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( model1_vr )
+MACHINE_CONFIG_START(model1_state::model1_vr)
MCFG_CPU_ADD("maincpu", V60, 16000000)
MCFG_CPU_PROGRAM_MAP(model1_vr_mem)
MCFG_CPU_IO_MAP(model1_vr_io)