diff options
author | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
---|---|---|
committer | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/mame/drivers/fccpu30.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/mame/drivers/fccpu30.cpp')
-rw-r--r-- | src/mame/drivers/fccpu30.cpp | 77 |
1 files changed, 38 insertions, 39 deletions
diff --git a/src/mame/drivers/fccpu30.cpp b/src/mame/drivers/fccpu30.cpp index 9b11636e296..5c56648e275 100644 --- a/src/mame/drivers/fccpu30.cpp +++ b/src/mame/drivers/fccpu30.cpp @@ -658,16 +658,15 @@ static void fccpu30_vme_cards(device_slot_interface &device) /* * Machine configuration */ -void cpu30_state::cpu30(machine_config &config) -{ +MACHINE_CONFIG_START(cpu30_state::cpu30) /* basic machine hardware */ - M68030(config, m_maincpu, XTAL(25'000'000)); - m_maincpu->set_addrmap(AS_PROGRAM, &cpu30_state::cpu30_mem); - m_maincpu->set_irq_acknowledge_callback("fga002", FUNC(fga002_device::iack)); + MCFG_DEVICE_ADD("maincpu", M68030, XTAL(25'000'000)) + MCFG_DEVICE_PROGRAM_MAP(cpu30_mem) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("fga002", fga002_device, iack) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); - VME(config, "vme", 0); - VME_SLOT(config, "slot1", fccpu30_vme_cards, nullptr, 1, "vme"); + MCFG_VME_DEVICE_ADD("vme") + MCFG_VME_SLOT_ADD("vme", 1, fccpu30_vme_cards, nullptr) /* Terminal Port config */ /* Force CPU30 series of boards has up to four serial ports, p1-p4, the FGA boot uses p4 as console and subsequent firmware uses p1 as console and in an operating system environment there may be user login shells on the other. @@ -750,67 +749,67 @@ void cpu30_state::cpu30(machine_config &config) // m_pit2->timer_irq_callback().set(m_fga002, FUNC(fga002_device::lirq3_w)); // The timer interrupt seems to silence the terminal interrupt, needs invectigation /* FGA-002, Force Gate Array */ - FGA002(config, m_fga002, 0); - m_fga002->out_int().set(FUNC(cpu30_state::fga_irq_callback)); - m_fga002->liack4().set("duscc", FUNC(duscc_device::iack)); - m_fga002->liack5().set("duscc2", FUNC(duscc_device::iack)); + fga002_device &fga002(FGA002(config, m_fga002, 0)); + fga002.out_int().set(FUNC(cpu30_state::fga_irq_callback)); + fga002.liack4().set("duscc", FUNC(duscc_device::iack)); + fga002.liack5().set("duscc2", FUNC(duscc_device::iack)); // RTC - RTC72423(config, m_rtc, XTAL(32'768)); // Fake crystal value, the 72423 uses it own internal crystal - m_rtc->out_int_handler().set(m_fga002, FUNC(fga002_device::lirq0_w)); + MCFG_DEVICE_ADD("rtc", RTC72423, XTAL(32'768)) // Fake crystal value, the 72423 uses it own internal crystal + MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE("fga002", fga002_device, lirq0_w)) // dual ported ram RAM(config, m_ram).set_default_size("4M").set_extra_options("8M, 16M, 32M"); -} +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. */ -void cpu30_state::cpu30x(machine_config &config) -{ +MACHINE_CONFIG_START(cpu30_state::cpu30x) cpu30(config); - m_maincpu->set_clock(XTAL(16'777'216)); /* 16.7 MHz from description, crystal needs verification */ + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_CLOCK(XTAL(16'777'216)) /* 16.7 MHz from description, crystal needs verification */ -// config.device_remove(""); +// MCFG_DEVICE_REMOVE("") // dual ported ram m_ram->set_default_size("1M").set_extra_options("1M, 2M, 4M"); -} +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.*/ -void cpu30_state::cpu30xa(machine_config &config) -{ +MACHINE_CONFIG_START(cpu30_state::cpu30xa) cpu30x(config); - m_maincpu->set_clock(XTAL(20'000'000)); /* 20.0 MHz from description, crystal needs verification */ -} + 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.*/ -void cpu30_state::cpu30za(machine_config &config) -{ +MACHINE_CONFIG_START(cpu30_state::cpu30za) cpu30xa(config); - m_maincpu->set_clock(XTAL(20'000'000)); /* 20.0 MHz from description, crystal needs verification */ + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_CLOCK(XTAL(20'000'000)) /* 20.0 MHz from description, crystal needs verification */ // dual ported ram m_ram->set_default_size("4M").set_extra_options("1M, 2M, 4M"); -} +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 */ -void cpu30_state::cpu30zbe(machine_config &config) -{ +MACHINE_CONFIG_START(cpu30_state::cpu30zbe) cpu30za(config); - m_maincpu->set_clock(XTAL(25'000'000)); /* 25.0 MHz from description, crystal needs verification */ + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_CLOCK(XTAL(25'000'000)) /* 25.0 MHz from description, crystal needs verification */ // dual ported ram m_ram->set_default_size("4M").set_extra_options("256K, 512K, 1M, 2M, 4M, 8M, 16M, 32M"); -} +MACHINE_CONFIG_END /* SYS68K/CPU-33 */ -void cpu30_state::cpu33(machine_config &config) -{ +MACHINE_CONFIG_START(cpu30_state::cpu33) cpu30zbe(config); - m_maincpu->set_clock(XTAL(25'000'000)); /* 25.0 MHz from description, crystal needs verification */ + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_CLOCK(XTAL(25'000'000)) /* 25.0 MHz from description, crystal needs verification */ // dual ported ram m_ram->set_default_size("4M").set_extra_options("256K, 512K, 1M, 2M, 4M, 8M, 16M, 32M"); -} +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*/ void cpu30_state::cpu30be8(machine_config &config) @@ -833,10 +832,10 @@ void cpu30_state::cpu30lite4(machine_config &config) { cpu30zbe(config); // Enable these when added to main config -// config.device_remove("fpu"); -// config.device_remove("scsi"); -// config.device_remove("eth"); -// config.device_remove("fdc"); +// MCFG_DEVICE_REMOVE("fpu") +// MCFG_DEVICE_REMOVE("scsi") +// MCFG_DEVICE_REMOVE("eth") +// MCFG_DEVICE_REMOVE("fdc") // dual ported ram m_ram->set_default_size("4M").set_extra_options("256K, 512K, 1M, 2M, 4M, 8M, 16M, 32M"); } |