summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2018-05-25 22:28:49 +1000
committer Vas Crabb <vas@vastheman.com>2018-05-25 22:28:49 +1000
commit106e27478414a80e0959be52e55b23742855646c (patch)
treebaff6778e3449f8f9f7fb33a6935eaeb0bc5f255 /src/mame/drivers
parentfada3dfc8b58b1209c6dcd4cf7837b4d23c88d82 (diff)
remove many mainly PCI-related MCFG macros in favour of constructor
overloads, remove some absolute device lookups, remove some absolute device tags, and generally clean up stuff fix incorrect device class for PCI APIC (nw) xbox machine config looks ugly now - the devices should expose proper constructor overloads that accept the parts of the PCI ID that are in system PROM or customisable by the OEM and hard-code the parts inherent to the device
Diffstat (limited to 'src/mame/drivers')
-rw-r--r--src/mame/drivers/atlantis.cpp46
-rw-r--r--src/mame/drivers/atpci.cpp2
-rw-r--r--src/mame/drivers/iteagle.cpp24
-rw-r--r--src/mame/drivers/lindbergh.cpp48
-rw-r--r--src/mame/drivers/pcipc.cpp20
-rw-r--r--src/mame/drivers/seattle.cpp6
-rw-r--r--src/mame/drivers/vegas.cpp6
7 files changed, 76 insertions, 76 deletions
diff --git a/src/mame/drivers/atlantis.cpp b/src/mame/drivers/atlantis.cpp
index 0fb54abbdfa..1ccea3e97a4 100644
--- a/src/mame/drivers/atlantis.cpp
+++ b/src/mame/drivers/atlantis.cpp
@@ -806,15 +806,15 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(atlantis_state::mwskins)
/* basic machine hardware */
- MCFG_DEVICE_ADD("maincpu", VR4310LE, 166666666) // clock is TRUSTED
+ MCFG_DEVICE_ADD(m_maincpu, VR4310LE, 166666666) // clock is TRUSTED
MCFG_MIPS3_ICACHE_SIZE(16384)
MCFG_MIPS3_DCACHE_SIZE(16384)
MCFG_MIPS3_SYSTEM_CLOCK(66666666)
- MCFG_PCI_ROOT_ADD( ":pci")
- MCFG_VRC4373_ADD( PCI_ID_NILE, ":maincpu")
+ MCFG_DEVICE_ADD(":pci", PCI_ROOT, 0)
+ MCFG_DEVICE_ADD(PCI_ID_NILE, VRC4373, 0, m_maincpu)
MCFG_VRC4373_SET_RAM(0x00800000)
- MCFG_PCI9050_ADD( PCI_ID_9050)
+ MCFG_DEVICE_ADD(PCI_ID_9050, PCI9050, 0)
MCFG_PCI9050_SET_MAP(0, atlantis_state::map0)
MCFG_PCI9050_SET_MAP(1, atlantis_state::map1)
MCFG_PCI9050_SET_MAP(2, atlantis_state::map2)
@@ -822,11 +822,11 @@ MACHINE_CONFIG_START(atlantis_state::mwskins)
MCFG_PCI9050_USER_OUTPUT_CALLBACK(WRITE32(*this, atlantis_state, user_io_output))
MCFG_PCI9050_USER_INPUT_CALLBACK(READ32(*this, atlantis_state, user_io_input))
- MCFG_M48T37_ADD("rtc")
+ MCFG_M48T37_ADD(m_rtc)
MCFG_M48T37_RESET_HANDLER(WRITELINE(*this, atlantis_state, watchdog_reset))
MCFG_M48T37_IRQ_HANDLER(WRITELINE(*this, atlantis_state, watchdog_irq))
- MCFG_IDE_PCI_ADD(PCI_ID_IDE, 0x10950646, 0x07, 0x0)
+ MCFG_DEVICE_ADD(m_ide, IDE_PCI, 0, 0x10950646, 0x07, 0x0)
MCFG_IDE_PCI_IRQ_HANDLER(WRITELINE(*this, atlantis_state, ide_irq))
// The pci-ide by default expects the system controller to be pci:00.0 so need to fix here
MCFG_DEVICE_MODIFY(PCI_ID_IDE":ide")
@@ -835,7 +835,7 @@ MACHINE_CONFIG_START(atlantis_state::mwskins)
MCFG_BUS_MASTER_IDE_CONTROLLER_SPACE(PCI_ID_NILE, AS_DATA)
/* video hardware */
- MCFG_DEVICE_ADD("zeus2", ZEUS2, ZEUS2_VIDEO_CLOCK)
+ MCFG_DEVICE_ADD(m_zeus, ZEUS2, ZEUS2_VIDEO_CLOCK)
MCFG_ZEUS2_FLOAT_MODE(1)
MCFG_ZEUS2_IRQ_CB(WRITELINE(*this, atlantis_state, zeus_irq))
MCFG_ZEUS2_VBLANK_CB(WRITELINE(*this, atlantis_state, vblank_irq))
@@ -846,49 +846,49 @@ MACHINE_CONFIG_START(atlantis_state::mwskins)
MCFG_SCREEN_UPDATE_DEVICE("zeus2", zeus2_device, screen_update)
/* sound hardware */
- MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_DENVER, 0)
+ MCFG_DEVICE_ADD(m_dcs, DCS2_AUDIO_DENVER, 0)
MCFG_DCS2_AUDIO_DRAM_IN_MB(4)
MCFG_DCS2_AUDIO_POLLING_OFFSET(0xe33)
- MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0)
+ MCFG_DEVICE_ADD(m_ioasic, MIDWAY_IOASIC, 0)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_STANDARD)
MCFG_MIDWAY_SERIAL_PIC2_YEAR_OFFS(80)
MCFG_MIDWAY_IOASIC_UPPER(342) // 325
MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, atlantis_state, ioasic_irq))
MCFG_MIDWAY_IOASIC_AUTO_ACK(1)
if DEBUG_CONSOLE {
- MCFG_MIDWAY_IOASIC_OUT_TX_CB(WRITE8("uart0", generic_terminal_device, write))
- MCFG_DEVICE_ADD("uart0", GENERIC_TERMINAL, 0)
+ MCFG_MIDWAY_IOASIC_OUT_TX_CB(WRITE8(m_uart0, generic_terminal_device, write))
+ MCFG_DEVICE_ADD(m_uart0, GENERIC_TERMINAL, 0)
MCFG_GENERIC_TERMINAL_KEYBOARD_CB(DEVPUT("ioasic", midway_ioasic_device, serial_rx_w))
}
// TL16C552 UART
- MCFG_DEVICE_ADD("uart1", NS16550, XTAL(24'000'000))
+ MCFG_DEVICE_ADD(m_uart1, NS16550, XTAL(24'000'000))
MCFG_INS8250_OUT_TX_CB(WRITELINE("com1", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(WRITELINE("com1", rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(WRITELINE("com1", rs232_port_device, write_rts))
MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, atlantis_state, duart_irq_callback))
- MCFG_DEVICE_ADD("uart2", NS16550, XTAL(24'000'000))
+ MCFG_DEVICE_ADD(m_uart2, NS16550, XTAL(24'000'000))
MCFG_INS8250_OUT_TX_CB(WRITELINE("com2", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(WRITELINE("com2", rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(WRITELINE("com2", rs232_port_device, write_rts))
MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, atlantis_state, duart_irq_callback))
MCFG_DEVICE_ADD("com1", RS232_PORT, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(WRITELINE("uart1", ins8250_uart_device, rx_w))
- MCFG_RS232_DCD_HANDLER(WRITELINE("uart1", ins8250_uart_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(WRITELINE("uart1", ins8250_uart_device, dsr_w))
- MCFG_RS232_RI_HANDLER(WRITELINE("uart1", ins8250_uart_device, ri_w))
- MCFG_RS232_CTS_HANDLER(WRITELINE("uart1", ins8250_uart_device, cts_w))
+ MCFG_RS232_RXD_HANDLER(WRITELINE(m_uart1, ins8250_uart_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(m_uart1, ins8250_uart_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(m_uart1, ins8250_uart_device, dsr_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE(m_uart1, ins8250_uart_device, ri_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(m_uart1, ins8250_uart_device, cts_w))
//MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("com1", mwskins_comm)
MCFG_DEVICE_ADD("com2", RS232_PORT, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(WRITELINE("uart2", ins8250_uart_device, rx_w))
- MCFG_RS232_DCD_HANDLER(WRITELINE("uart2", ins8250_uart_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(WRITELINE("uart2", ins8250_uart_device, dsr_w))
- MCFG_RS232_RI_HANDLER(WRITELINE("uart2", ins8250_uart_device, ri_w))
- MCFG_RS232_CTS_HANDLER(WRITELINE("uart2", ins8250_uart_device, cts_w))
+ MCFG_RS232_RXD_HANDLER(WRITELINE(m_uart2, ins8250_uart_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(m_uart2, ins8250_uart_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(m_uart2, ins8250_uart_device, dsr_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE(m_uart2, ins8250_uart_device, ri_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(m_uart2, ins8250_uart_device, cts_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/atpci.cpp b/src/mame/drivers/atpci.cpp
index 4f6ee155674..393ca07ab06 100644
--- a/src/mame/drivers/atpci.cpp
+++ b/src/mame/drivers/atpci.cpp
@@ -79,7 +79,7 @@ static void isa_internal_devices(device_slot_interface &device)
static void pci_devices(device_slot_interface &device)
{
- device.option_add_internal("i82439tx", I82439TX);
+ device.option_add_internal("i82439tx", I82439TX_LEGACY);
device.option_add_internal("i82371ab", I82371AB);
device.option_add_internal("i82371sb", I82371SB);
}
diff --git a/src/mame/drivers/iteagle.cpp b/src/mame/drivers/iteagle.cpp
index 60b3729b5ec..d2c7b1df9ad 100644
--- a/src/mame/drivers/iteagle.cpp
+++ b/src/mame/drivers/iteagle.cpp
@@ -119,8 +119,8 @@ class iteagle_state : public driver_device
{
public:
iteagle_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu")
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
{}
required_device<mips3_device> m_maincpu;
@@ -164,31 +164,31 @@ void iteagle_state::machine_reset()
MACHINE_CONFIG_START(iteagle_state::iteagle)
/* basic machine hardware */
- MCFG_DEVICE_ADD("maincpu", VR4310LE, 166666666)
+ MCFG_DEVICE_ADD(m_maincpu, VR4310LE, 166666666)
MCFG_MIPS3_ICACHE_SIZE(16384)
MCFG_MIPS3_DCACHE_SIZE(8192)
MCFG_MIPS3_SYSTEM_CLOCK(66666667)
- MCFG_PCI_ROOT_ADD( ":pci")
- MCFG_VRC4373_ADD( PCI_ID_NILE, ":maincpu")
+ MCFG_DEVICE_ADD(":pci", PCI_ROOT, 0)
+ MCFG_DEVICE_ADD(PCI_ID_NILE, VRC4373, 0, m_maincpu)
MCFG_VRC4373_SET_RAM(0x00800000)
MCFG_VRC4373_SET_SIMM0(0x02000000)
- MCFG_ITEAGLE_PERIPH_ADD( PCI_ID_PERIPH)
- MCFG_IDE_PCI_ADD( PCI_ID_IDE, 0x1080C693, 0x00, 0x0)
- MCFG_IDE_PCI_IRQ_ADD( ":maincpu", MIPS3_IRQ2)
+ MCFG_DEVICE_ADD( PCI_ID_PERIPH, ITEAGLE_PERIPH, 0)
+ MCFG_DEVICE_ADD( PCI_ID_IDE, IDE_PCI, 0, 0x1080C693, 0x00, 0x0)
+ MCFG_IDE_PCI_IRQ_HANDLER( INPUTLINE(m_maincpu, MIPS3_IRQ2))
- MCFG_ITEAGLE_FPGA_ADD( PCI_ID_FPGA, ":maincpu", MIPS3_IRQ1, MIPS3_IRQ4)
- MCFG_ES1373_ADD( PCI_ID_SOUND)
+ MCFG_DEVICE_ADD( PCI_ID_FPGA, ITEAGLE_FPGA, 0, "screen", m_maincpu, MIPS3_IRQ1, MIPS3_IRQ4)
+ MCFG_DEVICE_ADD( PCI_ID_SOUND, ES1373, 0)
MCFG_SOUND_ROUTE(0, PCI_ID_SOUND":lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, PCI_ID_SOUND":rspeaker", 1.0)
- MCFG_ES1373_IRQ_ADD( ":maincpu", MIPS3_IRQ3)
+ MCFG_ES1373_IRQ_HANDLER( INPUTLINE(m_maincpu, MIPS3_IRQ3))
MCFG_DEVICE_ADD(PCI_ID_VIDEO, VOODOO_3_PCI, 0, m_maincpu, "screen")
MCFG_VOODOO_PCI_FBMEM(16)
MCFG_DEVICE_MODIFY(PCI_ID_VIDEO":voodoo")
MCFG_VOODOO_VBLANK_CB(WRITELINE(PCI_ID_FPGA, iteagle_fpga_device, vblank_update))
- MCFG_ITEAGLE_EEPROM_ADD( PCI_ID_EEPROM)
+ MCFG_DEVICE_ADD( PCI_ID_EEPROM, ITEAGLE_EEPROM, 0)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/lindbergh.cpp b/src/mame/drivers/lindbergh.cpp
index e7caf8a5592..20c39a07638 100644
--- a/src/mame/drivers/lindbergh.cpp
+++ b/src/mame/drivers/lindbergh.cpp
@@ -393,28 +393,28 @@ void lindbergh_state::machine_reset()
MACHINE_CONFIG_START(lindbergh_state::lindbergh)
MCFG_DEVICE_ADD("maincpu", PENTIUM4, 28000000U*5) /* Actually Celeron D at 2,8 GHz */
- MCFG_PCI_ROOT_ADD( ":pci")
- MCFG_I82875P_HOST_ADD( ":pci:00.0", 0x103382c0, ":maincpu", 512*1024*1024)
- MCFG_I82875P_AGP_ADD( ":pci:01.0")
- MCFG_GEFORCE_7600GS_ADD( ":pci:01.0:00.0", 0x10de02e1)
- MCFG_I82875P_OVERFLOW_ADD( ":pci:06.0", 0x103382c0)
- MCFG_PCI_BRIDGE_ADD( ":pci:1c.0", 0x808625ae, 0x02)
- MCFG_I82541PI_ADD( ":pci:1c.0:00.0", 0x103382c0)
- MCFG_USB_UHCI_ADD( ":pci:1d.0", 0x808625a9, 0x02, 0x103382c0)
- MCFG_USB_UHCI_ADD( ":pci:1d.1", 0x808625aa, 0x02, 0x103382c0)
- MCFG_I6300ESB_WATCHDOG_ADD( ":pci:1d.4", 0x103382c0)
- MCFG_APIC_ADD( ":pci:1d.5", 0x808625ac, 0x02, 0x103382c0)
- MCFG_USB_EHCI_ADD( ":pci:1d.7", 0x808625ad, 0x02, 0x103382c0)
- MCFG_PCI_BRIDGE_ADD( ":pci:1e.0", 0x8086244e, 0x0a)
- MCFG_SB0400_ADD( ":pci:1e.0:02.0", 0x11021101)
- MCFG_SEGA_LINDBERGH_BASEBOARD_ADD(":pci:1e.0:03.0")
- MCFG_I6300ESB_LPC_ADD( ":pci:1f.0")
- MCFG_LPC_ACPI_ADD( ":pci:1f.0:acpi")
- MCFG_LPC_RTC_ADD( ":pci:1f.0:rtc")
- MCFG_LPC_PIT_ADD( ":pci:1f.0:pit")
- MCFG_SATA_ADD( ":pci:1f.2", 0x808625a3, 0x02, 0x103382c0)
- MCFG_SMBUS_ADD( ":pci:1f.3", 0x808625a4, 0x02, 0x103382c0)
- MCFG_AC97_ADD( ":pci:1f.5", 0x808625a6, 0x02, 0x103382c0)
+ PCI_ROOT (config, ":pci", 0);
+ I82875P_HOST (config, ":pci:00.0", 0, 0x103382c0, "maincpu", 512*1024*1024);
+ I82875P_AGP (config, ":pci:01.0", 0);
+ GEFORCE_7600GS (config, ":pci:01.0:00.0", 0, 0x10de02e1);
+ I82875P_OVERFLOW (config, ":pci:06.0", 0, 0x103382c0);
+ PCI_BRIDGE (config, ":pci:1c.0", 0, 0x808625ae, 0x02);
+ I82541 (config, ":pci:1c.0:00.0", 0, 0x103382c0);
+ USB_UHCI (config, ":pci:1d.0", 0, 0x808625a9, 0x02, 0x103382c0);
+ USB_UHCI (config, ":pci:1d.1", 0, 0x808625aa, 0x02, 0x103382c0);
+ I6300ESB_WATCHDOG (config, ":pci:1d.4", 0, 0x103382c0);
+ APIC (config, ":pci:1d.5", 0, 0x808625ac, 0x02, 0x103382c0);
+ USB_EHCI (config, ":pci:1d.7", 0, 0x808625ad, 0x02, 0x103382c0);
+ PCI_BRIDGE (config, ":pci:1e.0", 0, 0x8086244e, 0x0a);
+ SB0400 (config, ":pci:1e.0:02.0", 0, 0x11021101);
+ SEGA_LINDBERGH_BASEBOARD(config, ":pci:1e.0:03.0", 0);
+ I6300ESB_LPC (config, ":pci:1f.0", 0);
+ LPC_ACPI (config, ":pci:1f.0:acpi", 0);
+ LPC_RTC (config, ":pci:1f.0:rtc", 0);
+ LPC_PIT (config, ":pci:1f.0:pit", 0);
+ SATA (config, ":pci:1f.2", 0, 0x808625a3, 0x02, 0x103382c0);
+ SMBUS (config, ":pci:1f.3", 0, 0x808625a4, 0x02, 0x103382c0);
+ AC97 (config, ":pci:1f.5", 0, 0x808625a6, 0x02, 0x103382c0);
MACHINE_CONFIG_END
#define LINDBERGH_BIOS \
@@ -425,10 +425,10 @@ MACHINE_CONFIG_END
ROMX_LOAD("6.0.0009.bin", 0x00000, 0x100000, CRC(5ffdfbf8) SHA1(605bc4967b749b4e6d13fc2ebb845ba956a259a7), ROM_BIOS(2) ) \
ROM_SYSTEM_BIOS(2, "bios2", "6.0.0010") \
ROMX_LOAD("6.0.0010.bin", 0x00000, 0x100000, CRC(ea2bf888) SHA1(c9c5b6f0d4f4f36620939b15dd2f128a74347e37), ROM_BIOS(3) ) \
-\
+ \
ROM_REGION(0x400000, ":pci:1e.0:03.0", 0) /* Baseboard MPC firmware */ \
ROM_LOAD("fpr-24370b.ic6", 0x000000, 0x400000, CRC(c3b021a4) SHA1(1b6938a50fe0e4ae813864649eb103838c399ac0)) \
-\
+ \
ROM_REGION32_LE(0x10000, ":pci:01.0:00.0", 0) /* Geforce bios extension (custom for the card) */ \
ROM_LOAD("vid_bios.u504", 0x00000, 0x10000, CRC(f78d14d7) SHA1(f129787e487984edd23bf344f2e9500c85052275)) \
DISK_REGION("cf") \
diff --git a/src/mame/drivers/pcipc.cpp b/src/mame/drivers/pcipc.cpp
index cd606f02b4c..a3d6314f588 100644
--- a/src/mame/drivers/pcipc.cpp
+++ b/src/mame/drivers/pcipc.cpp
@@ -488,13 +488,13 @@ MACHINE_CONFIG_START(pcipc_state::pcipc)
MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pci:07.0:pic8259_master", pic8259_device, inta_cb)
MCFG_I386_SMIACT(WRITELINE("pci:00.0", i82439hx_host_device, smi_act_w))
- MCFG_PCI_ROOT_ADD( ":pci")
- MCFG_I82439HX_ADD( ":pci:00.0", ":maincpu", 256*1024*1024)
- MCFG_I82371SB_ISA_ADD(":pci:07.0")
+ MCFG_DEVICE_ADD( ":pci", PCI_ROOT, 0)
+ MCFG_DEVICE_ADD( ":pci:00.0", I82439HX, 0, "maincpu", 256*1024*1024)
+ MCFG_DEVICE_ADD( ":pci:07.0", I82371SB_ISA, 0)
MCFG_I82371SB_BOOT_STATE_HOOK(WRITE8(*this, pcipc_state, boot_state_phoenix_ver40_rev6_w))
MCFG_I82371SB_SMI_CB(INPUTLINE(":maincpu", INPUT_LINE_SMI))
-// MCFG_IDE_PCI_ADD( ":pci:07.1", 0x80867010, 0x03, 0x00000000)
-// MCFG_MGA2064W_ADD( ":pci:12.0")
+// MCFG_DEVICE_ADD( ":pci:07.1", IDE_PCI, 0, 0x80867010, 0x03, 0x00000000)
+// MCFG_DEVICE_ADD( ":pci:12.0", MGA2064W, 0)
MCFG_DEVICE_ADD("board4", ISA16_SLOT, 0, "pci:07.0:isabus", isa_internal_devices, "fdc37c93x", true)
MCFG_SLOT_OPTION_MACHINE_CONFIG("fdc37c93x", superio_config)
@@ -509,12 +509,12 @@ MACHINE_CONFIG_START(pcipc_state::pcipctx)
MCFG_DEVICE_ADD("maincpu", PENTIUM, 60000000)
MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pci:07.0:pic8259_master", pic8259_device, inta_cb)
- MCFG_PCI_ROOT_ADD( ":pci")
- MCFG_I82439TX_ADD( ":pci:00.0", ":maincpu", 256*1024*1024)
- MCFG_I82371SB_ISA_ADD(":pci:07.0")
+ MCFG_DEVICE_ADD( ":pci", PCI_ROOT, 0)
+ MCFG_DEVICE_ADD( ":pci:00.0", I82439TX, 0, ":maincpu", 256*1024*1024)
+ MCFG_DEVICE_ADD( ":pci:07.0", I82371SB_ISA, 0)
MCFG_I82371SB_BOOT_STATE_HOOK(WRITE8(*this, pcipc_state, boot_state_award_w))
-// MCFG_IDE_PCI_ADD( ":pci:07.1", 0x80867010, 0x03, 0x00000000)
- MCFG_MGA2064W_ADD( ":pci:12.0")
+// MCFG_DEVICE_ADD( ":pci:07.1", IDE_PCI, 0, 0x80867010, 0x03, 0x00000000)
+ MCFG_DEVICE_ADD( ":pci:12.0", MGA2064W, 0)
MACHINE_CONFIG_END
ROM_START(pcipc)
diff --git a/src/mame/drivers/seattle.cpp b/src/mame/drivers/seattle.cpp
index 9b0d2be10bd..13d86545940 100644
--- a/src/mame/drivers/seattle.cpp
+++ b/src/mame/drivers/seattle.cpp
@@ -1879,7 +1879,7 @@ MACHINE_CONFIG_START(seattle_state::seattle_common)
MCFG_MIPS3_SYSTEM_CLOCK(SYSTEM_CLOCK)
// PCI Bus Devices
- MCFG_PCI_ROOT_ADD(":pci")
+ MCFG_DEVICE_ADD(":pci", PCI_ROOT, 0)
MCFG_GT64010_ADD(PCI_ID_GALILEO, ":maincpu", SYSTEM_CLOCK, GALILEO_IRQ_NUM)
MCFG_GT64XXX_SET_CS(0, seattle_state::seattle_cs0_map)
@@ -1888,8 +1888,8 @@ MACHINE_CONFIG_START(seattle_state::seattle_common)
MCFG_GT64XXX_SET_CS(3, seattle_state::seattle_cs3_map)
MCFG_GT64XX_SET_SIMM0(0x00800000)
- MCFG_IDE_PCI_ADD(PCI_ID_IDE, 0x100b0002, 0x01, 0x0)
- MCFG_IDE_PCI_IRQ_ADD(":maincpu", IDE_IRQ_NUM)
+ MCFG_DEVICE_ADD(PCI_ID_IDE, IDE_PCI, 0, 0x100b0002, 0x01, 0x0)
+ MCFG_IDE_PCI_IRQ_HANDLER(INPUTLINE(m_maincpu, IDE_IRQ_NUM))
MCFG_IDE_PCI_SET_LEGACY_TOP(0x0a0)
MCFG_DEVICE_ADD(PCI_ID_VIDEO, VOODOO_1_PCI, 0, m_maincpu, m_screen)
diff --git a/src/mame/drivers/vegas.cpp b/src/mame/drivers/vegas.cpp
index f7422d2d2fb..2363b4360ab 100644
--- a/src/mame/drivers/vegas.cpp
+++ b/src/mame/drivers/vegas.cpp
@@ -1723,9 +1723,9 @@ MACHINE_CONFIG_START(vegas_state::vegascore)
MCFG_MIPS3_SYSTEM_CLOCK(vegas_state::SYSTEM_CLOCK)
// PCI Bus Devices
- MCFG_PCI_ROOT_ADD(":pci")
+ MCFG_DEVICE_ADD(":pci", PCI_ROOT, 0)
- MCFG_VRC5074_ADD(PCI_ID_NILE, ":maincpu")
+ MCFG_DEVICE_ADD(PCI_ID_NILE, VRC5074, 0, m_maincpu)
MCFG_VRC5074_SET_SDRAM(0, 0x00800000)
MCFG_VRC5074_SET_CS(2, vegas_state::vegas_cs2_map)
MCFG_VRC5074_SET_CS(3, vegas_state::vegas_cs3_map)
@@ -1734,7 +1734,7 @@ MACHINE_CONFIG_START(vegas_state::vegascore)
MCFG_VRC5074_SET_CS(6, vegas_state::vegas_cs6_map)
MCFG_VRC5074_SET_CS(7, vegas_state::vegas_cs7_map)
- MCFG_IDE_PCI_ADD(PCI_ID_IDE, 0x10950646, 0x05, 0x0)
+ MCFG_DEVICE_ADD(PCI_ID_IDE, IDE_PCI, 0, 0x10950646, 0x05, 0x0)
MCFG_IDE_PCI_IRQ_HANDLER(WRITELINE(PCI_ID_NILE, vrc5074_device, pci_intr_d))
//MCFG_IDE_PCI_SET_PIF(0x8f)