diff options
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 |
commit | f4df51e5223578e206574234c0b8d1af300c3324 (patch) | |
tree | fd5c680c45baee30304a31723132444fe7359dfb /src/mame/drivers/interpro.cpp | |
parent | 1bd974c2b4f1f8815065efd4f5fcc0443ae15d28 (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/interpro.cpp')
-rw-r--r-- | src/mame/drivers/interpro.cpp | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/src/mame/drivers/interpro.cpp b/src/mame/drivers/interpro.cpp index c0dd2e7f77b..dfcd73e612c 100644 --- a/src/mame/drivers/interpro.cpp +++ b/src/mame/drivers/interpro.cpp @@ -575,7 +575,8 @@ MACHINE_CONFIG_START(interpro_state::interpro) MCFG_DEFAULT_LAYOUT(layout_interpro) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(turquoise_state::turquoise, interpro) +MACHINE_CONFIG_START(turquoise_state::turquoise) + interpro(config); MCFG_CPU_ADD(INTERPRO_CPU_TAG, CLIPPER_C300, XTAL(12'500'000)) MCFG_CPU_PROGRAM_MAP(c300_insn_map) MCFG_CPU_DATA_MAP(c300_data_map) @@ -616,8 +617,8 @@ MACHINE_CONFIG_DERIVED(turquoise_state::turquoise, interpro) MCFG_FLOPPY_DRIVE_SOUND(false) // serial controllers and ports - MCFG_FRAGMENT_ADD(interpro_serial1) - MCFG_FRAGMENT_ADD(interpro_serial2) + interpro_serial1(config); + interpro_serial2(config); // scsi controller MCFG_NSCSI_ADD(INTERPRO_SCSI_TAG ":7", turquoise_scsi_devices, INTERPRO_SCSI_ADAPTER_TAG, true) @@ -631,13 +632,14 @@ MACHINE_CONFIG_DERIVED(turquoise_state::turquoise, interpro) // i/o gate array MCFG_DEVICE_ADD(INTERPRO_IOGA_TAG, TURQUOISE_IOGA, 0) MCFG_INTERPRO_IOGA_MEMORY(INTERPRO_MMU_TAG "_d", 0) - MCFG_FRAGMENT_ADD(ioga) + ioga(config); MCFG_DEVICE_MODIFY(INTERPRO_SRBUS_TAG) MCFG_SR_MEMORY(INTERPRO_MMU_TAG "_d", 0, 1) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(sapphire_state::sapphire, interpro) +MACHINE_CONFIG_START(sapphire_state::sapphire) + interpro(config); MCFG_CPU_ADD(INTERPRO_CPU_TAG, CLIPPER_C400, XTAL(12'500'000)) MCFG_CPU_PROGRAM_MAP(c400_insn_map) MCFG_CPU_DATA_MAP(c400_data_map) @@ -664,8 +666,8 @@ MACHINE_CONFIG_DERIVED(sapphire_state::sapphire, interpro) MCFG_FLOPPY_DRIVE_SOUND(false) // serial controllers and ports - MCFG_FRAGMENT_ADD(interpro_serial1) - MCFG_FRAGMENT_ADD(interpro_serial2) + interpro_serial1(config); + interpro_serial2(config); // scsi controller MCFG_NSCSI_ADD(INTERPRO_SCSI_TAG ":7", sapphire_scsi_devices, INTERPRO_SCSI_ADAPTER_TAG, true) @@ -679,7 +681,7 @@ MACHINE_CONFIG_DERIVED(sapphire_state::sapphire, interpro) // i/o gate array MCFG_DEVICE_ADD(INTERPRO_IOGA_TAG, SAPPHIRE_IOGA, 0) MCFG_INTERPRO_IOGA_MEMORY(INTERPRO_MMU_TAG, 0) - MCFG_FRAGMENT_ADD(ioga) + ioga(config); // flash memory MCFG_DEVICE_ADD(INTERPRO_FLASH_TAG "_lo", INTEL_28F010, 0) @@ -690,27 +692,32 @@ MACHINE_CONFIG_DERIVED(sapphire_state::sapphire, interpro) MCFG_SR_MEMORY(INTERPRO_MMU_TAG, 0, 1) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(turquoise_state::ip2000, turquoise) +MACHINE_CONFIG_START(turquoise_state::ip2000) + turquoise(config); //MCFG_DEVICE_MODIFY(INTERPRO_CPU_TAG) //MCFG_DEVICE_CLOCK(XTAL(40'000'000)) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(sapphire_state::ip2400, sapphire) +MACHINE_CONFIG_START(sapphire_state::ip2400) + sapphire(config); //MCFG_DEVICE_MODIFY(INTERPRO_CPU_TAG) //MCFG_DEVICE_CLOCK(XTAL(40'000'000)) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(sapphire_state::ip2500, sapphire) +MACHINE_CONFIG_START(sapphire_state::ip2500) + sapphire(config); //MCFG_DEVICE_MODIFY(INTERPRO_CPU_TAG) //MCFG_DEVICE_CLOCK(XTAL(50'000'000)) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(sapphire_state::ip2700, sapphire) +MACHINE_CONFIG_START(sapphire_state::ip2700) + sapphire(config); //MCFG_DEVICE_MODIFY(INTERPRO_CPU_TAG) //MCFG_DEVICE_CLOCK(XTAL_70MHz) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(sapphire_state::ip2800, sapphire) +MACHINE_CONFIG_START(sapphire_state::ip2800) + sapphire(config); //MCFG_DEVICE_MODIFY(INTERPRO_CPU_TAG) //MCFG_DEVICE_CLOCK(XTAL_80MHz) MACHINE_CONFIG_END |