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/fccpu30.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/fccpu30.cpp')
-rw-r--r-- | src/mame/drivers/fccpu30.cpp | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/src/mame/drivers/fccpu30.cpp b/src/mame/drivers/fccpu30.cpp index 52509f1b4f7..e62c2c74026 100644 --- a/src/mame/drivers/fccpu30.cpp +++ b/src/mame/drivers/fccpu30.cpp @@ -759,7 +759,8 @@ MACHINE_CONFIG_START(cpu30_state::cpu30) MACHINE_CONFIG_END /* SYS68K/CPU-30X Part No.1 01300: 16.7 MHz 68030 based CPU board with 68882 FPCP, DMAC, 1 Mbyte Dual Ported RAM capacity and VMEPROM. */ -MACHINE_CONFIG_DERIVED(cpu30_state::cpu30x, cpu30) +MACHINE_CONFIG_START(cpu30_state::cpu30x) + cpu30(config); MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(XTAL(16'777'216)) /* 16.7 MHz from description, crystal needs verification */ @@ -772,13 +773,15 @@ MACHINE_CONFIG_DERIVED(cpu30_state::cpu30x, cpu30) MACHINE_CONFIG_END /* SYS68K/CPU-30XA Part No.1 01301: 20.0 MHz 68030 based CPU board with 68882 FPCP, DMAC, 1 Mbyte Dual Ported RAM capacity and VMEPROM. Documentation included.*/ -MACHINE_CONFIG_DERIVED(cpu30_state::cpu30xa, cpu30x) +MACHINE_CONFIG_START(cpu30_state::cpu30xa) + cpu30x(config); MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(XTAL(20'000'000)) /* 20.0 MHz from description, crystal needs verification */ MACHINE_CONFIG_END /* SYS68K/CPU-30ZA Part No.1 01302: 20.0 MHz 68030 based CPU board with 68882 FPCP, DMAC, 4 Mbyte Dual Ported RAM capacity and VMEPROM. Documentation included.*/ -MACHINE_CONFIG_DERIVED(cpu30_state::cpu30za, cpu30xa) +MACHINE_CONFIG_START(cpu30_state::cpu30za) + cpu30xa(config); MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(XTAL(20'000'000)) /* 20.0 MHz from description, crystal needs verification */ @@ -789,7 +792,8 @@ MACHINE_CONFIG_DERIVED(cpu30_state::cpu30za, cpu30xa) MACHINE_CONFIG_END /* SYS68K/CPU-30ZBE 68030/68882 CPU, 25 MHz, 4 Mbyte shared DRAM, 4 Mbyte Flash, SCSI, Ethernet, Floppy disk, 4 serial I/O ports, 32-bit VMEbus interface */ -MACHINE_CONFIG_DERIVED(cpu30_state::cpu30zbe, cpu30za) +MACHINE_CONFIG_START(cpu30_state::cpu30zbe) + cpu30za(config); MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(XTAL(25'000'000)) /* 25.0 MHz from description, crystal needs verification */ @@ -800,7 +804,8 @@ MACHINE_CONFIG_DERIVED(cpu30_state::cpu30zbe, cpu30za) MACHINE_CONFIG_END /* SYS68K/CPU-33 */ -MACHINE_CONFIG_DERIVED(cpu30_state::cpu33, cpu30zbe) +MACHINE_CONFIG_START(cpu30_state::cpu33) + cpu30zbe(config); MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(XTAL(25'000'000)) /* 25.0 MHz from description, crystal needs verification */ @@ -811,7 +816,8 @@ MACHINE_CONFIG_DERIVED(cpu30_state::cpu33, cpu30zbe) MACHINE_CONFIG_END /* SYS68K/CPU-30BE/8 68030/68882 CPU, 25 MHz, 8 Mbyte shared DRAM, 4 Mbyte Flash, SCSI, Ethernet, Floppy disk, 4 serial I/O ports, 32-bit VMEbus interface, VMEPROM firmware*/ -MACHINE_CONFIG_DERIVED(cpu30_state::cpu30be8, cpu30zbe) +MACHINE_CONFIG_START(cpu30_state::cpu30be8) + cpu30zbe(config); // dual ported ram MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("8M") @@ -819,7 +825,8 @@ MACHINE_CONFIG_DERIVED(cpu30_state::cpu30be8, cpu30zbe) MACHINE_CONFIG_END /* SYS68K/CPU-30BE/16 68030/68882 CPU, 25 MHz, 16 Mbyte shared DRAM, 4 Mbyte Flash, SCSI, Ethernet, Floppy disk, 4 serial I/O ports, 32-bit VMEbus interface, VMEPROM firmware*/ -MACHINE_CONFIG_DERIVED(cpu30_state::cpu30be16, cpu30zbe) +MACHINE_CONFIG_START(cpu30_state::cpu30be16) + cpu30zbe(config); // dual ported ram MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("16M") @@ -827,7 +834,8 @@ MACHINE_CONFIG_DERIVED(cpu30_state::cpu30be16, cpu30zbe) MACHINE_CONFIG_END /* SYS68K/CPU-30Lite/4 68030 CPU, 25 MHz, 4 Mbyte shared DRAM, 4 Mbyte Flash, 4 serial ports, 32-bit VMEbus interface, VMEPROM firmware. */ -MACHINE_CONFIG_DERIVED(cpu30_state::cpu30lite4, cpu30zbe) +MACHINE_CONFIG_START(cpu30_state::cpu30lite4) + cpu30zbe(config); // Enable these when added to main config // MCFG_DEVICE_REMOVE("fpu") // MCFG_DEVICE_REMOVE("scsi") @@ -840,7 +848,8 @@ MACHINE_CONFIG_DERIVED(cpu30_state::cpu30lite4, cpu30zbe) MACHINE_CONFIG_END /* SYS68K/CPU-30Lite/8 68030 CPU, 25 MHz, 4 Mbyte shared DRAM, 8 Mbyte Flash, 4 serial ports, 32-bit VMEbus interface, VMEPROM firmware. */ -MACHINE_CONFIG_DERIVED(cpu30_state::cpu30lite8, cpu30lite4) +MACHINE_CONFIG_START(cpu30_state::cpu30lite8) + cpu30lite4(config); // dual ported ram MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("8M") |