summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/cps3.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/cps3.cpp')
-rw-r--r--src/mame/drivers/cps3.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/mame/drivers/cps3.cpp b/src/mame/drivers/cps3.cpp
index e96091e6a8a..d027b00af48 100644
--- a/src/mame/drivers/cps3.cpp
+++ b/src/mame/drivers/cps3.cpp
@@ -2456,21 +2456,21 @@ SH2_DMA_KLUDGE_CB(cps3_state::dma_callback)
}
-static MACHINE_CONFIG_START( simm1_64mbit )
+MACHINE_CONFIG_START(cps3_state::simm1_64mbit)
MCFG_FUJITSU_29F016A_ADD("simm1.0")
MCFG_FUJITSU_29F016A_ADD("simm1.1")
MCFG_FUJITSU_29F016A_ADD("simm1.2")
MCFG_FUJITSU_29F016A_ADD("simm1.3")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( simm2_64mbit )
+MACHINE_CONFIG_START(cps3_state::simm2_64mbit)
MCFG_FUJITSU_29F016A_ADD("simm2.0")
MCFG_FUJITSU_29F016A_ADD("simm2.1")
MCFG_FUJITSU_29F016A_ADD("simm2.2")
MCFG_FUJITSU_29F016A_ADD("simm2.3")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( simm3_128mbit )
+MACHINE_CONFIG_START(cps3_state::simm3_128mbit)
MCFG_FUJITSU_29F016A_ADD("simm3.0")
MCFG_FUJITSU_29F016A_ADD("simm3.1")
MCFG_FUJITSU_29F016A_ADD("simm3.2")
@@ -2481,7 +2481,7 @@ static MACHINE_CONFIG_START( simm3_128mbit )
MCFG_FUJITSU_29F016A_ADD("simm3.7")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( simm4_128mbit )
+MACHINE_CONFIG_START(cps3_state::simm4_128mbit)
MCFG_FUJITSU_29F016A_ADD("simm4.0")
MCFG_FUJITSU_29F016A_ADD("simm4.1")
MCFG_FUJITSU_29F016A_ADD("simm4.2")
@@ -2492,7 +2492,7 @@ static MACHINE_CONFIG_START( simm4_128mbit )
MCFG_FUJITSU_29F016A_ADD("simm4.7")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( simm5_128mbit )
+MACHINE_CONFIG_START(cps3_state::simm5_128mbit)
MCFG_FUJITSU_29F016A_ADD("simm5.0")
MCFG_FUJITSU_29F016A_ADD("simm5.1")
MCFG_FUJITSU_29F016A_ADD("simm5.2")
@@ -2503,12 +2503,12 @@ static MACHINE_CONFIG_START( simm5_128mbit )
MCFG_FUJITSU_29F016A_ADD("simm5.7")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( simm5_32mbit )
+MACHINE_CONFIG_START(cps3_state::simm5_32mbit)
MCFG_FUJITSU_29F016A_ADD("simm5.0")
MCFG_FUJITSU_29F016A_ADD("simm5.1")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( simm6_128mbit )
+MACHINE_CONFIG_START(cps3_state::simm6_128mbit)
MCFG_FUJITSU_29F016A_ADD("simm6.0")
MCFG_FUJITSU_29F016A_ADD("simm6.1")
MCFG_FUJITSU_29F016A_ADD("simm6.2")
@@ -2519,7 +2519,7 @@ static MACHINE_CONFIG_START( simm6_128mbit )
MCFG_FUJITSU_29F016A_ADD("simm6.7")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( cps3 )
+MACHINE_CONFIG_START(cps3_state::cps3)
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SH2, 6250000*4) // external clock is 6.25 Mhz, it sets the internal multiplier to 4x (this should probably be handled in the core..)
MCFG_CPU_PROGRAM_MAP(cps3_map)
@@ -2564,21 +2564,21 @@ MACHINE_CONFIG_END
/* individual configs for each machine, depending on the SIMMs installed */
-MACHINE_CONFIG_DERIVED( redearth, cps3 )
+MACHINE_CONFIG_DERIVED(cps3_state::redearth, cps3)
MCFG_FRAGMENT_ADD(simm1_64mbit)
MCFG_FRAGMENT_ADD(simm3_128mbit)
MCFG_FRAGMENT_ADD(simm4_128mbit)
MCFG_FRAGMENT_ADD(simm5_32mbit)
MACHINE_CONFIG_END
-MACHINE_CONFIG_DERIVED( sfiii, cps3 )
+MACHINE_CONFIG_DERIVED(cps3_state::sfiii, cps3)
MCFG_FRAGMENT_ADD(simm1_64mbit)
MCFG_FRAGMENT_ADD(simm3_128mbit)
MCFG_FRAGMENT_ADD(simm4_128mbit)
MCFG_FRAGMENT_ADD(simm5_32mbit)
MACHINE_CONFIG_END
-MACHINE_CONFIG_DERIVED( sfiii2, cps3 )
+MACHINE_CONFIG_DERIVED(cps3_state::sfiii2, cps3)
MCFG_FRAGMENT_ADD(simm1_64mbit)
MCFG_FRAGMENT_ADD(simm2_64mbit)
MCFG_FRAGMENT_ADD(simm3_128mbit)
@@ -2586,7 +2586,7 @@ MACHINE_CONFIG_DERIVED( sfiii2, cps3 )
MCFG_FRAGMENT_ADD(simm5_128mbit)
MACHINE_CONFIG_END
-MACHINE_CONFIG_DERIVED( jojo, cps3 )
+MACHINE_CONFIG_DERIVED(cps3_state::jojo, cps3)
MCFG_FRAGMENT_ADD(simm1_64mbit)
MCFG_FRAGMENT_ADD(simm2_64mbit)
MCFG_FRAGMENT_ADD(simm3_128mbit)
@@ -2594,7 +2594,7 @@ MACHINE_CONFIG_DERIVED( jojo, cps3 )
MCFG_FRAGMENT_ADD(simm5_32mbit)
MACHINE_CONFIG_END
-MACHINE_CONFIG_DERIVED( sfiii3, cps3 )
+MACHINE_CONFIG_DERIVED(cps3_state::sfiii3, cps3)
MCFG_FRAGMENT_ADD(simm1_64mbit)
MCFG_FRAGMENT_ADD(simm2_64mbit)
MCFG_FRAGMENT_ADD(simm3_128mbit)
@@ -2603,7 +2603,7 @@ MACHINE_CONFIG_DERIVED( sfiii3, cps3 )
MCFG_FRAGMENT_ADD(simm6_128mbit)
MACHINE_CONFIG_END
-MACHINE_CONFIG_DERIVED( jojoba, cps3 )
+MACHINE_CONFIG_DERIVED(cps3_state::jojoba, cps3)
MCFG_FRAGMENT_ADD(simm1_64mbit)
MCFG_FRAGMENT_ADD(simm2_64mbit)
MCFG_FRAGMENT_ADD(simm3_128mbit)