diff options
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 |
commit | d469cc04bcace0f601802301caeddc5b473b75f2 (patch) | |
tree | a9d71540c9c69cee5ab3a533476b81833fa02f5f /src/mame/drivers/funworld.cpp | |
parent | 9f383f76ce6f00cc3320e5ba53dc323781e0077b (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/funworld.cpp')
-rw-r--r-- | src/mame/drivers/funworld.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/mame/drivers/funworld.cpp b/src/mame/drivers/funworld.cpp index aeb9a93439b..b7ed29568b9 100644 --- a/src/mame/drivers/funworld.cpp +++ b/src/mame/drivers/funworld.cpp @@ -3054,7 +3054,7 @@ MACHINE_RESET_MEMBER(funworld_state, lunapark) * Machine Drivers * **************************/ -static MACHINE_CONFIG_START( fw1stpal ) +MACHINE_CONFIG_START(funworld_state::fw1stpal) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M65SC02, CPU_CLOCK) /* 2MHz */ MCFG_CPU_PROGRAM_MAP(funworld_map) @@ -3101,7 +3101,7 @@ static MACHINE_CONFIG_START( fw1stpal ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fw2ndpal, fw1stpal ) +MACHINE_CONFIG_DERIVED(funworld_state::fw2ndpal, fw1stpal) MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_CPU_PROGRAM_MAP(funworld_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", funworld_state, nmi_line_pulse) @@ -3110,7 +3110,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( funquiz, fw1stpal ) +MACHINE_CONFIG_DERIVED(funworld_state::funquiz, fw1stpal) // MCFG_FRAGMENT_ADD(fw2ndpal) MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_CPU_PROGRAM_MAP(funquiz_map) @@ -3124,7 +3124,7 @@ static MACHINE_CONFIG_DERIVED( funquiz, fw1stpal ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( magicrd2, fw1stpal ) +MACHINE_CONFIG_DERIVED(funworld_state::magicrd2, fw1stpal) MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_CPU_PROGRAM_MAP(magicrd2_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", funworld_state, nmi_line_pulse) @@ -3143,42 +3143,42 @@ static MACHINE_CONFIG_DERIVED( magicrd2, fw1stpal ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( royalcd1, fw1stpal ) +MACHINE_CONFIG_DERIVED(funworld_state::royalcd1, fw1stpal) MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* (G65SC02P in pro version) 2MHz */ MCFG_CPU_PROGRAM_MAP(magicrd2_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", funworld_state, nmi_line_pulse) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( royalcd2, fw2ndpal ) +MACHINE_CONFIG_DERIVED(funworld_state::royalcd2, fw2ndpal) MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_CPU_PROGRAM_MAP(magicrd2_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", funworld_state, nmi_line_pulse) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cuoreuno, fw1stpal ) +MACHINE_CONFIG_DERIVED(funworld_state::cuoreuno, fw1stpal) MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_CPU_PROGRAM_MAP(cuoreuno_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", funworld_state, nmi_line_pulse) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( saloon, fw1stpal ) +MACHINE_CONFIG_DERIVED(funworld_state::saloon, fw1stpal) MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_CPU_PROGRAM_MAP(saloon_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", funworld_state, nmi_line_pulse) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( witchryl, fw1stpal ) +MACHINE_CONFIG_DERIVED(funworld_state::witchryl, fw1stpal) MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_CPU_PROGRAM_MAP(witchryl_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", funworld_state, nmi_line_pulse) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( lunapark, fw1stpal ) +MACHINE_CONFIG_DERIVED(funworld_state::lunapark, fw1stpal) MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_CPU_PROGRAM_MAP(lunapark_map) // mirrored video RAM (4000/5000 to 6000/7000). MCFG_CPU_VBLANK_INT_DRIVER("screen", funworld_state, nmi_line_pulse) @@ -3187,14 +3187,14 @@ static MACHINE_CONFIG_DERIVED( lunapark, fw1stpal ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( chinatow, fw2ndpal ) +MACHINE_CONFIG_DERIVED(funworld_state::chinatow, fw2ndpal) MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_CPU_PROGRAM_MAP(chinatow_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", funworld_state, nmi_line_pulse) MCFG_VIDEO_START_OVERRIDE(funworld_state, chinatow) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( rcdino4, fw1stpal ) +MACHINE_CONFIG_DERIVED(funworld_state::rcdino4, fw1stpal) MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_CPU_PROGRAM_MAP(chinatow_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", funworld_state, nmi_line_pulse) @@ -3202,7 +3202,7 @@ static MACHINE_CONFIG_DERIVED( rcdino4, fw1stpal ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( intrgmes, fw1stpal ) +MACHINE_CONFIG_DERIVED(funworld_state::intrgmes, fw1stpal) MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_CPU_PROGRAM_MAP(intergames_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", funworld_state, nmi_line_pulse) @@ -3210,7 +3210,7 @@ static MACHINE_CONFIG_DERIVED( intrgmes, fw1stpal ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fw_a7_11, fw1stpal ) +MACHINE_CONFIG_DERIVED(funworld_state::fw_a7_11, fw1stpal) MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_CPU_PROGRAM_MAP(fw_a7_11_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", funworld_state, nmi_line_pulse) |