summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/cps1.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/cps1.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/cps1.cpp')
-rw-r--r--src/mame/drivers/cps1.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mame/drivers/cps1.cpp b/src/mame/drivers/cps1.cpp
index 4d152a988df..4be6caf51c7 100644
--- a/src/mame/drivers/cps1.cpp
+++ b/src/mame/drivers/cps1.cpp
@@ -3336,7 +3336,7 @@ MACHINE_START_MEMBER(cps_state,qsound)
membank("bank1")->configure_entries(0, 6, memregion("audiocpu")->base() + 0x10000, 0x4000);
}
-static MACHINE_CONFIG_START( cps1_10MHz )
+MACHINE_CONFIG_START(cps_state::cps1_10MHz)
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz ) /* verified on pcb */
@@ -3377,7 +3377,7 @@ static MACHINE_CONFIG_START( cps1_10MHz )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED( forgottn, cps1_10MHz )
+MACHINE_CONFIG_DERIVED(cps_state::forgottn, cps1_10MHz)
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(forgottn_map)
@@ -3386,20 +3386,20 @@ static MACHINE_CONFIG_DERIVED( forgottn, cps1_10MHz )
MCFG_UPD4701_PORTY("DIAL1")
MACHINE_CONFIG_END
-MACHINE_CONFIG_DERIVED( cps1_12MHz, cps1_10MHz )
+MACHINE_CONFIG_DERIVED(cps_state::cps1_12MHz, cps1_10MHz)
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_CLOCK( XTAL_12MHz ) /* verified on pcb */
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED( pang3, cps1_12MHz )
+MACHINE_CONFIG_DERIVED(cps_state::pang3, cps1_12MHz)
/* basic machine hardware */
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED( ganbare, cps1_10MHz )
+MACHINE_CONFIG_DERIVED(cps_state::ganbare, cps1_10MHz)
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -3408,7 +3408,7 @@ static MACHINE_CONFIG_DERIVED( ganbare, cps1_10MHz )
MCFG_M48T35_ADD("m48t35")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED( qsound, cps1_12MHz )
+MACHINE_CONFIG_DERIVED(cps_state::qsound, cps1_12MHz)
/* basic machine hardware */
MCFG_CPU_REPLACE("maincpu", M68000, XTAL_12MHz ) /* verified on pcb */
@@ -3439,18 +3439,18 @@ static MACHINE_CONFIG_DERIVED( qsound, cps1_12MHz )
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED( wofhfh, cps1_12MHz )
+MACHINE_CONFIG_DERIVED(cps_state::wofhfh, cps1_12MHz)
/* basic machine hardware */
MCFG_EEPROM_SERIAL_93C46_8BIT_ADD("eeprom")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED( sf2m3, cps1_12MHz)
+MACHINE_CONFIG_DERIVED(cps_state::sf2m3, cps1_12MHz)
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(sf2m3_map)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED( sf2m10, cps1_12MHz)
+MACHINE_CONFIG_DERIVED(cps_state::sf2m10, cps1_12MHz)
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(sf2m10_map)
MACHINE_CONFIG_END