diff options
author | 2018-05-23 20:52:52 +1000 | |
---|---|---|
committer | 2018-05-23 20:52:52 +1000 | |
commit | 512f11a672b47739e7a3530edc10e2aec22fa39c (patch) | |
tree | 0edc2da58a0b966551910f44dce7984cebc6d864 | |
parent | c8d9786daf1bc6e7a9b189b6209b03c7e88ac253 (diff) | |
parent | e9a3570051d1b78f94704a3dd971ea604418ddc7 (diff) |
Merge remote-tracking branch 'upstream/master'
-rw-r--r-- | src/mame/drivers/iteagle.cpp | 4 | ||||
-rw-r--r-- | src/mame/drivers/vegas.cpp | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/mame/drivers/iteagle.cpp b/src/mame/drivers/iteagle.cpp index b01b9658129..eacb00aa0f3 100644 --- a/src/mame/drivers/iteagle.cpp +++ b/src/mame/drivers/iteagle.cpp @@ -183,7 +183,7 @@ MACHINE_CONFIG_START(iteagle_state::iteagle) MCFG_SOUND_ROUTE(1, PCI_ID_SOUND":rspeaker", 1.0) MCFG_ES1373_IRQ_ADD( ":maincpu", MIPS3_IRQ3) - MCFG_DEVICE_ADD(PCI_ID_VIDEO, VOODOO_PCI, 0, TYPE_VOODOO_3, m_maincpu, ":screen") + MCFG_DEVICE_ADD(PCI_ID_VIDEO, VOODOO_PCI, 0, TYPE_VOODOO_3, 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)) @@ -295,7 +295,7 @@ MACHINE_CONFIG_START(iteagle_state::virtpool) MCFG_DEVICE_CLOCK(99999999) MCFG_MIPS3_SYSTEM_CLOCK(33333333) - MCFG_DEVICE_REPLACE(PCI_ID_VIDEO, VOODOO_PCI, 0, TYPE_VOODOO_1, m_maincpu, ":screen") + MCFG_DEVICE_REPLACE(PCI_ID_VIDEO, VOODOO_PCI, 0, TYPE_VOODOO_1, m_maincpu, "screen") MCFG_VOODOO_PCI_FBMEM(4) MCFG_VOODOO_PCI_TMUMEM(4, 4) diff --git a/src/mame/drivers/vegas.cpp b/src/mame/drivers/vegas.cpp index 53abe8c1af3..f453f775ec4 100644 --- a/src/mame/drivers/vegas.cpp +++ b/src/mame/drivers/vegas.cpp @@ -1738,7 +1738,7 @@ MACHINE_CONFIG_START(vegas_state::vegascore) MCFG_IDE_PCI_IRQ_HANDLER(WRITELINE(PCI_ID_NILE, vrc5074_device, pci_intr_d)) //MCFG_IDE_PCI_SET_PIF(0x8f) - MCFG_DEVICE_ADD(PCI_ID_VIDEO, VOODOO_PCI, 0, TYPE_VOODOO_2, ":maincpu", ":screen") + MCFG_DEVICE_ADD(PCI_ID_VIDEO, VOODOO_PCI, 0, TYPE_VOODOO_2, m_maincpu, "screen") MCFG_VOODOO_PCI_FBMEM(2) MCFG_VOODOO_PCI_TMUMEM(4, 4) MCFG_DEVICE_MODIFY(PCI_ID_VIDEO":voodoo") @@ -1784,7 +1784,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(vegas_state::vegasban) vegas32m(config); - MCFG_DEVICE_REPLACE(PCI_ID_VIDEO, VOODOO_PCI, 0, TYPE_VOODOO_BANSHEE, ":maincpu", ":screen") + MCFG_DEVICE_REPLACE(PCI_ID_VIDEO, VOODOO_PCI, 0, TYPE_VOODOO_BANSHEE, m_maincpu, "screen") MCFG_VOODOO_PCI_FBMEM(16) MCFG_DEVICE_MODIFY(PCI_ID_VIDEO":voodoo") MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, vegas_state, vblank_assert)) @@ -1798,7 +1798,7 @@ MACHINE_CONFIG_START(vegas_state::vegasv3) MCFG_MIPS3_DCACHE_SIZE(16384) MCFG_MIPS3_SYSTEM_CLOCK(vegas_state::SYSTEM_CLOCK) - MCFG_DEVICE_REPLACE(PCI_ID_VIDEO, VOODOO_PCI, 0, TYPE_VOODOO_3, ":maincpu", ":screen") + MCFG_DEVICE_REPLACE(PCI_ID_VIDEO, VOODOO_PCI, 0, TYPE_VOODOO_3, m_maincpu, "screen") MCFG_VOODOO_PCI_FBMEM(16) MCFG_DEVICE_MODIFY(PCI_ID_VIDEO":voodoo") MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, vegas_state, vblank_assert)) @@ -1807,7 +1807,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(vegas_state::denver) vegascore(config); - MCFG_DEVICE_REPLACE("maincpu", RM7000LE, vegas_state::SYSTEM_CLOCK*2.5) + MCFG_DEVICE_REPLACE(m_maincpu, RM7000LE, vegas_state::SYSTEM_CLOCK*2.5) MCFG_MIPS3_ICACHE_SIZE(16384) MCFG_MIPS3_DCACHE_SIZE(16384) MCFG_MIPS3_SYSTEM_CLOCK(vegas_state::SYSTEM_CLOCK) @@ -1816,10 +1816,10 @@ MACHINE_CONFIG_START(vegas_state::denver) MCFG_VRC5074_SET_SDRAM(0, 0x02000000) MCFG_VRC5074_SET_CS(8, vegas_state::vegas_cs8_map) - MCFG_DEVICE_REPLACE(PCI_ID_VIDEO, VOODOO_PCI, 0, TYPE_VOODOO_3, ":maincpu", ":screen") + MCFG_DEVICE_REPLACE(PCI_ID_VIDEO, VOODOO_PCI, 0, TYPE_VOODOO_3, m_maincpu, "screen") MCFG_VOODOO_PCI_FBMEM(16) MCFG_DEVICE_MODIFY(PCI_ID_VIDEO":voodoo") - MCFG_VOODOO_VBLANK_CB(WRITELINE(":", vegas_state, vblank_assert)) + MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, vegas_state, vblank_assert)) // TL16C552 UART MCFG_DEVICE_ADD(m_uart1, NS16550, vegas_state::SYSTEM_CLOCK / 12) |