summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/apollo.cpp
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2018-02-14 22:40:47 +1100
committer Vas Crabb <vas@vastheman.com>2018-02-14 23:46:17 +1100
commitf4df51e5223578e206574234c0b8d1af300c3324 (patch)
treefd5c680c45baee30304a31723132444fe7359dfb /src/mame/drivers/apollo.cpp
parent1bd974c2b4f1f8815065efd4f5fcc0443ae15d28 (diff)
(nw) screw you macros and the horse you rode in on
There's no voodoo involved in derived machine configurations and fragments any more. The macros were just obfuscating things at this point.
Diffstat (limited to 'src/mame/drivers/apollo.cpp')
-rw-r--r--src/mame/drivers/apollo.cpp32
1 files changed, 20 insertions, 12 deletions
diff --git a/src/mame/drivers/apollo.cpp b/src/mame/drivers/apollo.cpp
index f4aac203fbb..309cd82d6ff 100644
--- a/src/mame/drivers/apollo.cpp
+++ b/src/mame/drivers/apollo.cpp
@@ -1055,7 +1055,7 @@ MACHINE_CONFIG_START(apollo_state::dn3500)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
- MCFG_FRAGMENT_ADD( apollo )
+ apollo(config);
/* keyboard beeper */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -1079,7 +1079,7 @@ MACHINE_CONFIG_START(apollo_state::dsp3500)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
- MCFG_FRAGMENT_ADD( apollo_terminal )
+ apollo_terminal(config);
/* keyboard beeper */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -1095,7 +1095,8 @@ MACHINE_CONFIG_START(apollo_state::dsp3500)
MCFG_DEFAULT_LAYOUT( layout_apollo_dsp )
MACHINE_CONFIG_END
-MACHINE_CONFIG_DERIVED(apollo_state::dn3500_19i, dn3500)
+MACHINE_CONFIG_START(apollo_state::dn3500_19i)
+ dn3500(config);
/* video hardware 19" monochrome */
MCFG_APOLLO_MONO19I_ADD(APOLLO_SCREEN_TAG)
MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0)
@@ -1103,7 +1104,8 @@ MACHINE_CONFIG_DERIVED(apollo_state::dn3500_19i, dn3500)
MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german))
MACHINE_CONFIG_END
-MACHINE_CONFIG_DERIVED(apollo_state::dn3500_15i, dn3500)
+MACHINE_CONFIG_START(apollo_state::dn3500_15i)
+ dn3500(config);
/* video hardware is 15" monochrome or color */
MCFG_APOLLO_GRAPHICS_ADD(APOLLO_SCREEN_TAG)
MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0)
@@ -1111,7 +1113,8 @@ MACHINE_CONFIG_DERIVED(apollo_state::dn3500_15i, dn3500)
MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german))
MACHINE_CONFIG_END
-MACHINE_CONFIG_DERIVED(apollo_state::dn3000, dn3500)
+MACHINE_CONFIG_START(apollo_state::dn3000)
+ dn3500(config);
MCFG_CPU_REPLACE(MAINCPU, M68020PMMU, 12000000) /* 12 MHz */
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge)
MCFG_CPU_PROGRAM_MAP(dn3000_map)
@@ -1127,7 +1130,7 @@ MACHINE_CONFIG_START(apollo_state::dsp3000)
MCFG_CPU_PROGRAM_MAP(dsp3000_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
- MCFG_FRAGMENT_ADD( apollo_terminal )
+ apollo_terminal(config);
/* keyboard beeper */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -1146,7 +1149,8 @@ MACHINE_CONFIG_START(apollo_state::dsp3000)
MCFG_DEFAULT_LAYOUT( layout_apollo_dsp )
MACHINE_CONFIG_END
-MACHINE_CONFIG_DERIVED(apollo_state::dn3000_19i, dn3000)
+MACHINE_CONFIG_START(apollo_state::dn3000_19i)
+ dn3000(config);
/* video hardware 19" monochrome */
MCFG_APOLLO_MONO19I_ADD(APOLLO_SCREEN_TAG)
MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0)
@@ -1154,7 +1158,8 @@ MACHINE_CONFIG_DERIVED(apollo_state::dn3000_19i, dn3000)
MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german))
MACHINE_CONFIG_END
-MACHINE_CONFIG_DERIVED(apollo_state::dn3000_15i, dn3000)
+MACHINE_CONFIG_START(apollo_state::dn3000_15i)
+ dn3000(config);
/* video hardware 15" monochrome */
MCFG_APOLLO_GRAPHICS_ADD(APOLLO_SCREEN_TAG)
MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0)
@@ -1162,7 +1167,8 @@ MACHINE_CONFIG_DERIVED(apollo_state::dn3000_15i, dn3000)
MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german))
MACHINE_CONFIG_END
-MACHINE_CONFIG_DERIVED(apollo_state::dn5500, dn3500)
+MACHINE_CONFIG_START(apollo_state::dn5500)
+ dn3500(config);
MCFG_CPU_REPLACE(MAINCPU, M68040, 25000000) /* 25 MHz */
MCFG_CPU_PROGRAM_MAP(dn5500_map)
MACHINE_CONFIG_END
@@ -1173,7 +1179,7 @@ MACHINE_CONFIG_START(apollo_state::dsp5500)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
- MCFG_FRAGMENT_ADD(apollo_terminal)
+ apollo_terminal(config);
/* keyboard beeper */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -1184,7 +1190,8 @@ MACHINE_CONFIG_START(apollo_state::dsp5500)
MCFG_DEFAULT_LAYOUT( layout_apollo_dsp )
MACHINE_CONFIG_END
-MACHINE_CONFIG_DERIVED(apollo_state::dn5500_19i, dn5500)
+MACHINE_CONFIG_START(apollo_state::dn5500_19i)
+ dn5500(config);
/* video hardware 19" monochrome */
MCFG_APOLLO_MONO19I_ADD(APOLLO_SCREEN_TAG)
MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0)
@@ -1192,7 +1199,8 @@ MACHINE_CONFIG_DERIVED(apollo_state::dn5500_19i, dn5500)
MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german))
MACHINE_CONFIG_END
-MACHINE_CONFIG_DERIVED(apollo_state::dn5500_15i, dn5500)
+MACHINE_CONFIG_START(apollo_state::dn5500_15i)
+ dn5500(config);
/* video hardware 15" monochrome */
MCFG_APOLLO_GRAPHICS_ADD(APOLLO_SCREEN_TAG)
MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0)