summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar smf- <smf-@users.noreply.github.com>2018-05-23 13:34:16 +0100
committerGravatarGravatar smf- <smf-@users.noreply.github.com>2018-05-23 13:34:16 +0100
commit9092d3791e50a624b8aefcee575c7eea1c47c698 (patch) (github)
tree82d6d032e612d0091de05addd06827bb8a2933a0
parente9a3570051d1b78f94704a3dd971ea604418ddc7 (diff)
downloadmame-9092d3791e50a624b8aefcee575c7eea1c47c698.zip
mame-9092d3791e50a624b8aefcee575c7eea1c47c698.tar.bz2
create devices for each of the voodoo pci cards (nw)
-rw-r--r--src/devices/video/voodoo_pci.cpp175
-rw-r--r--src/devices/video/voodoo_pci.h128
-rw-r--r--src/mame/drivers/iteagle.cpp4
-rw-r--r--src/mame/drivers/seattle.cpp2
-rw-r--r--src/mame/drivers/vegas.cpp8
5 files changed, 225 insertions, 92 deletions
diff --git a/src/devices/video/voodoo_pci.cpp b/src/devices/video/voodoo_pci.cpp
index 10d88b058e4..e8f7dad1031 100644
--- a/src/devices/video/voodoo_pci.cpp
+++ b/src/devices/video/voodoo_pci.cpp
@@ -6,31 +6,32 @@
#include "screen.h"
-MACHINE_CONFIG_START(voodoo_pci_device::device_add_mconfig)
- switch (m_type) {
- case TYPE_VOODOO_1:
- MCFG_DEVICE_ADD("voodoo", VOODOO_1, STD_VOODOO_1_CLOCK)
- MCFG_VOODOO_FBMEM(4)
- MCFG_VOODOO_TMUMEM(1, 0)
- break;
- case TYPE_VOODOO_2:
- MCFG_DEVICE_ADD("voodoo", VOODOO_2, STD_VOODOO_2_CLOCK)
- MCFG_VOODOO_FBMEM(4)
- MCFG_VOODOO_TMUMEM(1, 0)
- break;
- case TYPE_VOODOO_BANSHEE:
- MCFG_DEVICE_ADD("voodoo", VOODOO_BANSHEE, STD_VOODOO_BANSHEE_CLOCK)
- MCFG_VOODOO_FBMEM(16)
- break;
- //case TYPE_VOODOO_3
- default:
- MCFG_DEVICE_ADD("voodoo", VOODOO_3, STD_VOODOO_3_CLOCK)
- MCFG_VOODOO_FBMEM(16)
- break;}
+MACHINE_CONFIG_START(voodoo_1_pci_device::device_add_mconfig)
+ MCFG_DEVICE_ADD("voodoo", VOODOO_1, STD_VOODOO_1_CLOCK)
+ MCFG_VOODOO_FBMEM(4)
+ MCFG_VOODOO_TMUMEM(1, 0)
+MACHINE_CONFIG_END
+
+MACHINE_CONFIG_START(voodoo_2_pci_device::device_add_mconfig)
+ MCFG_DEVICE_ADD("voodoo", VOODOO_2, STD_VOODOO_2_CLOCK)
+ MCFG_VOODOO_FBMEM(4)
+ MCFG_VOODOO_TMUMEM(1, 0)
+MACHINE_CONFIG_END
+
+MACHINE_CONFIG_START(voodoo_banshee_pci_device::device_add_mconfig)
+ MCFG_DEVICE_ADD("voodoo", VOODOO_BANSHEE, STD_VOODOO_BANSHEE_CLOCK)
+ MCFG_VOODOO_FBMEM(16)
MACHINE_CONFIG_END
+MACHINE_CONFIG_START(voodoo_3_pci_device::device_add_mconfig)
+ MCFG_DEVICE_ADD("voodoo", VOODOO_3, STD_VOODOO_3_CLOCK)
+ MCFG_VOODOO_FBMEM(16)
+MACHINE_CONFIG_END
-DEFINE_DEVICE_TYPE(VOODOO_PCI, voodoo_pci_device, "voodoo_pci", "Voodoo PCI")
+DEFINE_DEVICE_TYPE(VOODOO_1_PCI, voodoo_1_pci_device, "voodoo_1_pci", "Voodoo 1 PCI")
+DEFINE_DEVICE_TYPE(VOODOO_2_PCI, voodoo_2_pci_device, "voodoo_2_pci", "Voodoo 2 PCI")
+DEFINE_DEVICE_TYPE(VOODOO_BANSHEE_PCI, voodoo_banshee_pci_device, "voodoo_banshee_pci", "Voodoo Banshee PCI")
+DEFINE_DEVICE_TYPE(VOODOO_3_PCI, voodoo_3_pci_device, "voodoo_3_pci", "Voodoo 3 PCI")
void voodoo_pci_device::config_map(address_map &map)
{
@@ -59,12 +60,32 @@ void voodoo_pci_device::io_map(address_map &map)
map(0x000, 0x0ff).rw("voodoo", FUNC(voodoo_banshee_device::banshee_io_r), FUNC(voodoo_banshee_device::banshee_io_w));
}
-voodoo_pci_device::voodoo_pci_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : pci_device(mconfig, VOODOO_PCI, tag, owner, clock),
+voodoo_pci_device::voodoo_pci_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : pci_device(mconfig, type, tag, owner, clock),
m_voodoo(*this, "voodoo"), m_cpu(*this, finder_base::DUMMY_TAG), m_screen(*this, finder_base::DUMMY_TAG), m_fbmem(2), m_tmumem0(0), m_tmumem1(0)
{
}
+voodoo_1_pci_device::voodoo_1_pci_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : voodoo_pci_device(mconfig, VOODOO_1_PCI, tag, owner, clock)
+{
+}
+
+voodoo_2_pci_device::voodoo_2_pci_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : voodoo_pci_device(mconfig, VOODOO_2_PCI, tag, owner, clock)
+{
+}
+
+voodoo_banshee_pci_device::voodoo_banshee_pci_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : voodoo_pci_device(mconfig, VOODOO_BANSHEE_PCI, tag, owner, clock)
+{
+}
+
+voodoo_3_pci_device::voodoo_3_pci_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : voodoo_pci_device(mconfig, VOODOO_3_PCI, tag, owner, clock)
+{
+}
+
void voodoo_pci_device::device_start()
{
if (m_cpu)
@@ -73,38 +94,60 @@ void voodoo_pci_device::device_start()
m_voodoo->set_screen(*m_screen);
m_voodoo->set_fbmem(m_fbmem);
m_voodoo->set_tmumem(m_tmumem0, m_tmumem1);
- switch (m_type) {
- //void set_ids(uint32_t main_id, uint8_t revision, uint32_t pclass, uint32_t subsystem_id);
- case TYPE_VOODOO_1:
- set_ids(0x121a0001, 0x02, 0x030000, 0x000000);
- break;
- case TYPE_VOODOO_2:
- set_ids(0x121a0002, 0x02, 0x038000, 0x000000);
- break;
- case TYPE_VOODOO_BANSHEE:
- set_ids(0x121a0003, 0x02, 0x030000, 0x000000);
- break;
- //case TYPE_VOODOO_3
- default:
- set_ids(0x121a0005, 0x02, 0x030000, 0x000000);
- break;
- }
pci_device::device_start();
- if (m_type<=TYPE_VOODOO_2) {
- add_map(16*1024*1024, M_MEM | M_PREF, FUNC(voodoo_pci_device::voodoo_reg_map));
- bank_infos[0].adr = 0xff000000;
- } else {
- add_map(32*1024*1024, M_MEM, FUNC(voodoo_pci_device::banshee_reg_map));
- add_map(32*1024*1024, M_MEM, FUNC(voodoo_pci_device::lfb_map));
- add_map(256, M_IO, FUNC(voodoo_pci_device::io_map));
- bank_infos[0].adr = 0xf8000000;
- bank_infos[1].adr = 0xf8000008;
- bank_infos[2].adr = 0xfffffff0;
- }
save_item(NAME(m_pcictrl_reg));
machine().save().register_postload(save_prepost_delegate(FUNC(voodoo_pci_device::postload), this));
}
+//void set_ids(uint32_t main_id, uint8_t revision, uint32_t pclass, uint32_t subsystem_id);
+void voodoo_1_pci_device::device_start()
+{
+ set_ids(0x121a0001, 0x02, 0x030000, 0x000000);
+
+ voodoo_pci_device::device_start();
+
+ add_map(16 * 1024 * 1024, M_MEM | M_PREF, FUNC(voodoo_pci_device::voodoo_reg_map));
+ bank_infos[0].adr = 0xff000000;
+}
+
+void voodoo_2_pci_device::device_start()
+{
+ set_ids(0x121a0002, 0x02, 0x038000, 0x000000);
+
+ voodoo_pci_device::device_start();
+
+ add_map(16 * 1024 * 1024, M_MEM | M_PREF, FUNC(voodoo_pci_device::voodoo_reg_map));
+ bank_infos[0].adr = 0xff000000;
+}
+
+void voodoo_banshee_pci_device::device_start()
+{
+ set_ids(0x121a0003, 0x02, 0x030000, 0x000000);
+
+ voodoo_pci_device::device_start();
+
+ add_map(32 * 1024 * 1024, M_MEM, FUNC(voodoo_pci_device::banshee_reg_map));
+ add_map(32 * 1024 * 1024, M_MEM, FUNC(voodoo_pci_device::lfb_map));
+ add_map(256, M_IO, FUNC(voodoo_pci_device::io_map));
+ bank_infos[0].adr = 0xf8000000;
+ bank_infos[1].adr = 0xf8000008;
+ bank_infos[2].adr = 0xfffffff0;
+}
+
+void voodoo_3_pci_device::device_start()
+{
+ set_ids(0x121a0005, 0x02, 0x030000, 0x000000);
+
+ voodoo_pci_device::device_start();
+
+ add_map(32 * 1024 * 1024, M_MEM, FUNC(voodoo_pci_device::banshee_reg_map));
+ add_map(32 * 1024 * 1024, M_MEM, FUNC(voodoo_pci_device::lfb_map));
+ add_map(256, M_IO, FUNC(voodoo_pci_device::io_map));
+ bank_infos[0].adr = 0xf8000000;
+ bank_infos[1].adr = 0xf8000008;
+ bank_infos[2].adr = 0xfffffff0;
+}
+
void voodoo_pci_device::postload()
{
remap_cb();
@@ -120,14 +163,32 @@ void voodoo_pci_device::map_extra(uint64_t memory_window_start, uint64_t memory_
uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space)
{
logerror("%s: map_extra\n", this->tag());
+}
+
+void voodoo_banshee_pci_device::map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space,
+ uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space)
+{
+ logerror("%s: map_extra\n", this->tag());
+
// Map VGA legacy access
// Should really be dependent on voodoo VGAINIT0 bit 8 and IO base + 0xc3 bit 0
- if (m_type>=TYPE_VOODOO_BANSHEE) {
- uint64_t start = io_offset + 0x3b0;
- uint64_t end = io_offset + 0x3df;
- io_space->install_readwrite_handler(start, end, read32_delegate(FUNC(voodoo_pci_device::vga_r), this), write32_delegate(FUNC(voodoo_pci_device::vga_w), this));
- logerror("%s: map %s at %0*x-%0*x\n", this->tag(), "vga_r/w", 4, uint32_t(start), 4, uint32_t(end));
- }
+ uint64_t start = io_offset + 0x3b0;
+ uint64_t end = io_offset + 0x3df;
+ io_space->install_readwrite_handler(start, end, read32_delegate(FUNC(voodoo_pci_device::vga_r), this), write32_delegate(FUNC(voodoo_pci_device::vga_w), this));
+ logerror("%s: map %s at %0*x-%0*x\n", this->tag(), "vga_r/w", 4, uint32_t(start), 4, uint32_t(end));
+}
+
+void voodoo_3_pci_device::map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space,
+ uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space)
+{
+ logerror("%s: map_extra\n", this->tag());
+
+ // Map VGA legacy access
+ // Should really be dependent on voodoo VGAINIT0 bit 8 and IO base + 0xc3 bit 0
+ uint64_t start = io_offset + 0x3b0;
+ uint64_t end = io_offset + 0x3df;
+ io_space->install_readwrite_handler(start, end, read32_delegate(FUNC(voodoo_pci_device::vga_r), this), write32_delegate(FUNC(voodoo_pci_device::vga_w), this));
+ logerror("%s: map %s at %0*x-%0*x\n", this->tag(), "vga_r/w", 4, uint32_t(start), 4, uint32_t(end));
}
uint32_t voodoo_pci_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
diff --git a/src/devices/video/voodoo_pci.h b/src/devices/video/voodoo_pci.h
index cf1fdbebb6d..3a67f241eeb 100644
--- a/src/devices/video/voodoo_pci.h
+++ b/src/devices/video/voodoo_pci.h
@@ -16,56 +16,128 @@
#define MCFG_VOODOO_PCI_TMUMEM(_value1, _value2) \
downcast<voodoo_pci_device &>(*device).set_tmumem(_value1, _value2);
-class voodoo_pci_device : public pci_device {
+class voodoo_pci_device : public pci_device
+{
public:
- template <typename T, typename U>
- voodoo_pci_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, int type, T &&cpu_tag, U &&screen_tag)
- : voodoo_pci_device(mconfig, tag, owner, clock)
- {
- set_type(type);
- set_cpu_tag(std::forward<T>(cpu_tag));
- set_screen_tag(std::forward<U>(screen_tag));
- }
+ template <typename T> void set_cpu_tag(T &&tag) { m_cpu.set_tag(std::forward<T>(tag)); }
+ template <typename T> void set_screen_tag(T &&tag) { m_screen.set_tag(std::forward<T>(tag)); }
+ void set_fbmem(int fbmem) { m_fbmem = fbmem; }
+ void set_tmumem(int tmumem0, int tmumem1) { m_tmumem0 = tmumem0; m_tmumem1 = tmumem1; }
+ uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+
+ DECLARE_READ32_MEMBER(vga_r);
+ DECLARE_WRITE32_MEMBER(vga_w);
+
+ void voodoo_reg_map(address_map &map);
+ void banshee_reg_map(address_map &map);
+ void lfb_map(address_map &map);
+ void io_map(address_map &map);
+
+protected:
+ voodoo_pci_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
- voodoo_pci_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space,
uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) override;
- uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
virtual void config_map(address_map &map) override;
void postload(void);
- template <typename T> void set_cpu_tag(T &&tag) { m_cpu.set_tag(std::forward<T>(tag)); }
- template <typename T> void set_screen_tag(T &&tag) { m_screen.set_tag(std::forward<T>(tag)); }
- void set_type(int type) {m_type = type;}
- void set_fbmem(int fbmem) {m_fbmem = fbmem;}
- void set_tmumem(int tmumem0, int tmumem1) {m_tmumem0 = tmumem0; m_tmumem1 = tmumem1;}
-
- DECLARE_READ32_MEMBER(vga_r);
- DECLARE_WRITE32_MEMBER(vga_w);
-protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual void device_add_mconfig(machine_config &config) override;
-private:
required_device<voodoo_device> m_voodoo;
optional_device<cpu_device> m_cpu;
optional_device<screen_device> m_screen;
- int m_type;
int m_fbmem, m_tmumem0, m_tmumem1;
uint32_t m_pcictrl_reg[0x20];
- void voodoo_reg_map(address_map &map);
- void banshee_reg_map(address_map &map);
- void lfb_map(address_map &map);
- void io_map(address_map &map);
DECLARE_READ32_MEMBER(pcictrl_r);
DECLARE_WRITE32_MEMBER(pcictrl_w);
};
-DECLARE_DEVICE_TYPE(VOODOO_PCI, voodoo_pci_device)
+class voodoo_1_pci_device : public voodoo_pci_device
+{
+public:
+ template <typename T, typename U>
+ voodoo_1_pci_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, T &&cpu_tag, U &&screen_tag)
+ : voodoo_1_pci_device(mconfig, tag, owner, clock)
+ {
+ set_cpu_tag(std::forward<T>(cpu_tag));
+ set_screen_tag(std::forward<U>(screen_tag));
+ }
+
+ voodoo_1_pci_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+ virtual void device_start() override;
+ virtual void device_add_mconfig(machine_config &config) override;
+};
+
+class voodoo_2_pci_device : public voodoo_pci_device
+{
+public:
+ template <typename T, typename U>
+ voodoo_2_pci_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, T &&cpu_tag, U &&screen_tag)
+ : voodoo_2_pci_device(mconfig, tag, owner, clock)
+ {
+ set_cpu_tag(std::forward<T>(cpu_tag));
+ set_screen_tag(std::forward<U>(screen_tag));
+ }
+
+ voodoo_2_pci_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+ virtual void device_start() override;
+ virtual void device_add_mconfig(machine_config &config) override;
+};
+
+class voodoo_banshee_pci_device : public voodoo_pci_device
+{
+public:
+ template <typename T, typename U>
+ voodoo_banshee_pci_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, T &&cpu_tag, U &&screen_tag)
+ : voodoo_banshee_pci_device(mconfig, tag, owner, clock)
+ {
+ set_cpu_tag(std::forward<T>(cpu_tag));
+ set_screen_tag(std::forward<U>(screen_tag));
+ }
+
+ voodoo_banshee_pci_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+ virtual void device_start() override;
+ virtual void device_add_mconfig(machine_config &config) override;
+
+ virtual void map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space,
+ uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) override;
+};
+
+class voodoo_3_pci_device : public voodoo_pci_device
+{
+public:
+ template <typename T, typename U>
+ voodoo_3_pci_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, T &&cpu_tag, U &&screen_tag)
+ : voodoo_3_pci_device(mconfig, tag, owner, clock)
+ {
+ set_cpu_tag(std::forward<T>(cpu_tag));
+ set_screen_tag(std::forward<U>(screen_tag));
+ }
+
+ voodoo_3_pci_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+ virtual void device_start() override;
+ virtual void device_add_mconfig(machine_config &config) override;
+
+ virtual void map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space,
+ uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) override;
+};
+
+DECLARE_DEVICE_TYPE(VOODOO_1_PCI, voodoo_1_pci_device)
+DECLARE_DEVICE_TYPE(VOODOO_2_PCI, voodoo_2_pci_device)
+DECLARE_DEVICE_TYPE(VOODOO_BANSHEE_PCI, voodoo_banshee_pci_device)
+DECLARE_DEVICE_TYPE(VOODOO_3_PCI, voodoo_3_pci_device)
#endif // MAME_VIDEO_VOODOO_PCI_H
diff --git a/src/mame/drivers/iteagle.cpp b/src/mame/drivers/iteagle.cpp
index eacb00aa0f3..60b3729b5ec 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_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))
@@ -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_1_PCI, 0, m_maincpu, "screen")
MCFG_VOODOO_PCI_FBMEM(4)
MCFG_VOODOO_PCI_TMUMEM(4, 4)
diff --git a/src/mame/drivers/seattle.cpp b/src/mame/drivers/seattle.cpp
index bdb49648154..9b0d2be10bd 100644
--- a/src/mame/drivers/seattle.cpp
+++ b/src/mame/drivers/seattle.cpp
@@ -1892,7 +1892,7 @@ MACHINE_CONFIG_START(seattle_state::seattle_common)
MCFG_IDE_PCI_IRQ_ADD(":maincpu", IDE_IRQ_NUM)
MCFG_IDE_PCI_SET_LEGACY_TOP(0x0a0)
- MCFG_DEVICE_ADD(PCI_ID_VIDEO, VOODOO_PCI, 0, TYPE_VOODOO_1, m_maincpu, m_screen)
+ MCFG_DEVICE_ADD(PCI_ID_VIDEO, VOODOO_1_PCI, 0, m_maincpu, m_screen)
MCFG_VOODOO_PCI_FBMEM(2)
MCFG_VOODOO_PCI_TMUMEM(4, 0)
MCFG_DEVICE_MODIFY(PCI_ID_VIDEO":voodoo")
diff --git a/src/mame/drivers/vegas.cpp b/src/mame/drivers/vegas.cpp
index f453f775ec4..f7422d2d2fb 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, m_maincpu, "screen")
+ MCFG_DEVICE_ADD(PCI_ID_VIDEO, VOODOO_2_PCI, 0, 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, m_maincpu, "screen")
+ MCFG_DEVICE_REPLACE(PCI_ID_VIDEO, VOODOO_BANSHEE_PCI, 0, 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, m_maincpu, "screen")
+ MCFG_DEVICE_REPLACE(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(*this, vegas_state, vblank_assert))
@@ -1816,7 +1816,7 @@ 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, m_maincpu, "screen")
+ MCFG_DEVICE_REPLACE(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(*this, vegas_state, vblank_assert))