From 8f77e560bb3a8c2b05947876d3ace2769074e36b Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Tue, 29 Jan 2019 20:02:14 +0100 Subject: nscsi_bus: removed MCFG macros (nw) --- src/devices/machine/nscsi_bus.h | 7 ------ src/mame/drivers/decstation.cpp | 19 ++++++++-------- src/mame/drivers/lb186.cpp | 30 ++++++++++++------------- src/mame/drivers/next.cpp | 19 ++++++++-------- src/mame/drivers/sun3.cpp | 38 +++++++++++++++---------------- src/mame/drivers/sun4.cpp | 50 ++++++++++++++++++++--------------------- 6 files changed, 76 insertions(+), 87 deletions(-) diff --git a/src/devices/machine/nscsi_bus.h b/src/devices/machine/nscsi_bus.h index 2180e2f67b7..f3404ceb526 100644 --- a/src/devices/machine/nscsi_bus.h +++ b/src/devices/machine/nscsi_bus.h @@ -6,13 +6,6 @@ #pragma once -#define MCFG_NSCSI_BUS_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, NSCSI_BUS, 0) - -#define MCFG_NSCSI_ADD(_tag, _slot_intf, _def_slot, _fixed) \ - MCFG_DEVICE_ADD(_tag, NSCSI_CONNECTOR, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _fixed) - class nscsi_device; class nscsi_bus_device : public device_t diff --git a/src/mame/drivers/decstation.cpp b/src/mame/drivers/decstation.cpp index a9a1f3f5db7..322f94cd352 100644 --- a/src/mame/drivers/decstation.cpp +++ b/src/mame/drivers/decstation.cpp @@ -617,16 +617,15 @@ MACHINE_CONFIG_START(decstation_state::kn02ba) rs232b.dcd_handler().set(m_scc0, FUNC(z80scc_device::dcdb_w)); rs232b.cts_handler().set(m_scc0, FUNC(z80scc_device::ctsb_w)); - MCFG_NSCSI_BUS_ADD("scsibus") - MCFG_NSCSI_ADD("scsibus:0", dec_scsi_devices, "harddisk", false) - MCFG_NSCSI_ADD("scsibus:1", dec_scsi_devices, "cdrom", false) - MCFG_NSCSI_ADD("scsibus:2", dec_scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:3", dec_scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:4", dec_scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:5", dec_scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:6", dec_scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:7", dec_scsi_devices, "asc", true) - MCFG_SLOT_OPTION_MACHINE_CONFIG("asc", [this] (device_t *device) { ncr5394(device); }) + NSCSI_BUS(config, "scsibus"); + NSCSI_CONNECTOR(config, "scsibus:0", dec_scsi_devices, "harddisk"); + NSCSI_CONNECTOR(config, "scsibus:1", dec_scsi_devices, "cdrom"); + NSCSI_CONNECTOR(config, "scsibus:2", dec_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:3", dec_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:4", dec_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:5", dec_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:6", dec_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:7", dec_scsi_devices, "asc", true).set_option_machine_config("asc", [this] (device_t *device) { ncr5394(device); }); MACHINE_CONFIG_END static INPUT_PORTS_START( decstation ) diff --git a/src/mame/drivers/lb186.cpp b/src/mame/drivers/lb186.cpp index 3453298a2a5..b66fb20d84c 100644 --- a/src/mame/drivers/lb186.cpp +++ b/src/mame/drivers/lb186.cpp @@ -132,10 +132,11 @@ FLOPPY_FORMATS_MEMBER( lb186_state::floppy_formats ) FLOPPY_NASLITE_FORMAT FLOPPY_FORMATS_END -MACHINE_CONFIG_START(lb186_state::lb186) - MCFG_DEVICE_ADD("maincpu", I80186, 16_MHz_XTAL / 2) - MCFG_DEVICE_PROGRAM_MAP(lb186_map) - MCFG_DEVICE_IO_MAP(lb186_io) +void lb186_state::lb186(machine_config &config) +{ + I80186(config, m_maincpu, 16_MHz_XTAL / 2); + m_maincpu->set_addrmap(AS_PROGRAM, &lb186_state::lb186_map); + m_maincpu->set_addrmap(AS_IO, &lb186_state::lb186_io); scn2681_device &duart(SCN2681(config, "duart", 3.6864_MHz_XTAL)); duart.irq_cb().set(m_maincpu, FUNC(i80186_cpu_device::int0_w)); @@ -156,17 +157,16 @@ MACHINE_CONFIG_START(lb186_state::lb186) FLOPPY_CONNECTOR(config, "fdc:2", lb186_floppies, nullptr, lb186_state::floppy_formats); FLOPPY_CONNECTOR(config, "fdc:3", lb186_floppies, nullptr, lb186_state::floppy_formats); - MCFG_NSCSI_BUS_ADD("scsibus") - MCFG_NSCSI_ADD("scsibus:0", scsi_devices, "harddisk", false) - MCFG_NSCSI_ADD("scsibus:1", scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:2", scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:3", scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:4", scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:5", scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:6", scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:7", scsi_devices, "ncr5380", true) - MCFG_SLOT_OPTION_MACHINE_CONFIG("ncr5380", lb186_state::ncr5380) -MACHINE_CONFIG_END + NSCSI_BUS(config, "scsibus"); + NSCSI_CONNECTOR(config, "scsibus:0", scsi_devices, "harddisk"); + NSCSI_CONNECTOR(config, "scsibus:1", scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:2", scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:3", scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:4", scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:5", scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:6", scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:7", scsi_devices, "ncr5380", true).set_option_machine_config("ncr5380", lb186_state::ncr5380); +} ROM_START( lb186 ) ROM_REGION(0x4000, "bios", 0) diff --git a/src/mame/drivers/next.cpp b/src/mame/drivers/next.cpp index a7888881b11..d6db4505aef 100644 --- a/src/mame/drivers/next.cpp +++ b/src/mame/drivers/next.cpp @@ -1014,7 +1014,7 @@ MACHINE_CONFIG_START(next_state::next_base) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, next_state, vblank_w)) // devices - MCFG_NSCSI_BUS_ADD("scsibus") + NSCSI_BUS(config, "scsibus"); MCCS1850(config, rtc, XTAL(32'768)); @@ -1026,15 +1026,14 @@ MACHINE_CONFIG_START(next_state::next_base) keyboard->int_power_wr_callback().set(FUNC(next_state::power_irq)); keyboard->int_nmi_wr_callback().set(FUNC(next_state::nmi_irq)); - MCFG_NSCSI_ADD("scsibus:0", next_scsi_devices, "harddisk", false) - MCFG_NSCSI_ADD("scsibus:1", next_scsi_devices, "cdrom", false) - MCFG_NSCSI_ADD("scsibus:2", next_scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:3", next_scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:4", next_scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:5", next_scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:6", next_scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:7", next_scsi_devices, "ncr5390", true) - MCFG_SLOT_OPTION_MACHINE_CONFIG("ncr5390", [this] (device_t *device) { ncr5390(device); }) + NSCSI_CONNECTOR(config, "scsibus:0", next_scsi_devices, "harddisk"); + NSCSI_CONNECTOR(config, "scsibus:1", next_scsi_devices, "cdrom"); + NSCSI_CONNECTOR(config, "scsibus:2", next_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:3", next_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:4", next_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:5", next_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:6", next_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:7", next_scsi_devices, "ncr5390", true).set_option_machine_config("ncr5390", [this] (device_t *device) { ncr5390(device); }); MB8795(config, net, 0); net->tx_irq().set(FUNC(next_state::net_tx_irq)); diff --git a/src/mame/drivers/sun3.cpp b/src/mame/drivers/sun3.cpp index ac049db4c90..be69e42cab7 100644 --- a/src/mame/drivers/sun3.cpp +++ b/src/mame/drivers/sun3.cpp @@ -1061,16 +1061,15 @@ MACHINE_CONFIG_START(sun3_state::sun3) AM79C90(config, m_lance, 10'000'000); // clock is a guess - MCFG_NSCSI_BUS_ADD("scsibus") - MCFG_NSCSI_ADD("scsibus:0", scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:1", scsi_devices, "harddisk", false) - MCFG_NSCSI_ADD("scsibus:2", scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:3", scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:4", scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:5", scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:6", scsi_devices, "cdrom", false) - MCFG_NSCSI_ADD("scsibus:7", scsi_devices, "ncr5380", true) - MCFG_SLOT_OPTION_MACHINE_CONFIG("ncr5380", [this] (device_t *device) { ncr5380(device); }) + NSCSI_BUS(config, "scsibus"); + NSCSI_CONNECTOR(config, "scsibus:0", scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:1", scsi_devices, "harddisk"); + NSCSI_CONNECTOR(config, "scsibus:2", scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:3", scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:4", scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:5", scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:6", scsi_devices, "cdrom"); + NSCSI_CONNECTOR(config, "scsibus:7", scsi_devices, "ncr5380", true).set_option_machine_config("ncr5380", [this] (device_t *device) { ncr5380(device); }); MACHINE_CONFIG_END // Sun 3/60 @@ -1162,16 +1161,15 @@ MACHINE_CONFIG_START(sun3_state::sun3_50) rs232b.dcd_handler().set(m_scc2, FUNC(z80scc_device::dcdb_w)); rs232b.cts_handler().set(m_scc2, FUNC(z80scc_device::ctsb_w)); - MCFG_NSCSI_BUS_ADD("scsibus") - MCFG_NSCSI_ADD("scsibus:0", scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:1", scsi_devices, "harddisk", false) - MCFG_NSCSI_ADD("scsibus:2", scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:3", scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:4", scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:5", scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:6", scsi_devices, "cdrom", false) - MCFG_NSCSI_ADD("scsibus:7", scsi_devices, "ncr5380", true) - MCFG_SLOT_OPTION_MACHINE_CONFIG("ncr5380", [this] (device_t *device) { ncr5380(device); }) + NSCSI_BUS(config, "scsibus"); + NSCSI_CONNECTOR(config, "scsibus:0", scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:1", scsi_devices, "harddisk"); + NSCSI_CONNECTOR(config, "scsibus:2", scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:3", scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:4", scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:5", scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:6", scsi_devices, "cdrom"); + NSCSI_CONNECTOR(config, "scsibus:7", scsi_devices, "ncr5380", true).set_option_machine_config("ncr5380", [this] (device_t *device) { ncr5380(device); }); MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mame/drivers/sun4.cpp b/src/mame/drivers/sun4.cpp index 7b5d7d93c83..3abcd70906b 100644 --- a/src/mame/drivers/sun4.cpp +++ b/src/mame/drivers/sun4.cpp @@ -1846,7 +1846,8 @@ void sun4_state::ncr53c90a(device_t *device) adapter.drq_handler_cb().set(*this, FUNC(sun4_state::scsi_drq)); } -MACHINE_CONFIG_START(sun4_state::sun4) +void sun4_state::sun4(machine_config &config) +{ /* basic machine hardware */ MB86901(config, m_maincpu, 16'670'000); m_maincpu->add_asi_desc([](sparc_disassembler *dasm) { dasm->add_asi_desc(sun4_asi_desc); }); @@ -1920,19 +1921,19 @@ MACHINE_CONFIG_START(sun4_state::sun4) rs232b.dcd_handler().set(m_scc2, FUNC(z80scc_device::dcdb_w)); rs232b.cts_handler().set(m_scc2, FUNC(z80scc_device::ctsb_w)); - MCFG_NSCSI_BUS_ADD("scsibus") - MCFG_NSCSI_ADD("scsibus:0", sun_scsi_devices, "harddisk", false) - MCFG_NSCSI_ADD("scsibus:1", sun_scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:2", sun_scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:3", sun_scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:4", sun_scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:5", sun_scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:6", sun_scsi_devices, "cdrom", false) - MCFG_NSCSI_ADD("scsibus:7", sun_scsi_devices, "ncr53c90a", true) - MCFG_SLOT_OPTION_MACHINE_CONFIG("ncr53c90a", [this] (device_t *device) { ncr53c90a(device); }) -MACHINE_CONFIG_END - -MACHINE_CONFIG_START(sun4_state::sun4c) + NSCSI_BUS(config, "scsibus"); + NSCSI_CONNECTOR(config, "scsibus:0", sun_scsi_devices, "harddisk"); + NSCSI_CONNECTOR(config, "scsibus:1", sun_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:2", sun_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:3", sun_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:4", sun_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:5", sun_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:6", sun_scsi_devices, "cdrom"); + NSCSI_CONNECTOR(config, "scsibus:7", sun_scsi_devices, "ncr53c90a", true).set_option_machine_config("ncr53c90a", [this] (device_t *device) { ncr53c90a(device); }); +} + +void sun4_state::sun4c(machine_config &config) +{ /* basic machine hardware */ MB86901(config, m_maincpu, 20'000'000); m_maincpu->add_asi_desc([](sparc_disassembler *dasm) { dasm->add_asi_desc(sun4c_asi_desc); }); @@ -2004,23 +2005,22 @@ MACHINE_CONFIG_START(sun4_state::sun4c) rs232b.dcd_handler().set(m_scc2, FUNC(z80scc_device::dcdb_w)); rs232b.cts_handler().set(m_scc2, FUNC(z80scc_device::ctsb_w)); - MCFG_NSCSI_BUS_ADD("scsibus") - MCFG_NSCSI_ADD("scsibus:0", sun_scsi_devices, "harddisk", false) - MCFG_NSCSI_ADD("scsibus:1", sun_scsi_devices, "cdrom", false) - MCFG_NSCSI_ADD("scsibus:2", sun_scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:3", sun_scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:4", sun_scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:5", sun_scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:6", sun_scsi_devices, nullptr, false) - MCFG_NSCSI_ADD("scsibus:7", sun_scsi_devices, "ncr53c90a", true) - MCFG_SLOT_OPTION_MACHINE_CONFIG("ncr53c90a", [this] (device_t *device) { ncr53c90a(device); }) + NSCSI_BUS(config, "scsibus"); + NSCSI_CONNECTOR(config, "scsibus:0", sun_scsi_devices, "harddisk"); + NSCSI_CONNECTOR(config, "scsibus:1", sun_scsi_devices, "cdrom"); + NSCSI_CONNECTOR(config, "scsibus:2", sun_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:3", sun_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:4", sun_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:5", sun_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:6", sun_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsibus:7", sun_scsi_devices, "ncr53c90a", true).set_option_machine_config("ncr53c90a", [this] (device_t *device) { ncr53c90a(device); }); // SBus SBUS(config, m_sbus, 20'000'000, "maincpu", "type1"); SBUS_SLOT(config, m_sbus_slot[0], 20'000'000, m_sbus, sbus_cards, nullptr); SBUS_SLOT(config, m_sbus_slot[1], 20'000'000, m_sbus, sbus_cards, nullptr); SBUS_SLOT(config, m_sbus_slot[2], 20'000'000, m_sbus, sbus_cards, nullptr); -MACHINE_CONFIG_END +} void sun4_state::sun4_20(machine_config &config) { -- cgit v1.2.3