diff options
Diffstat (limited to 'src/devices/video/voodoo_pci.cpp')
-rw-r--r-- | src/devices/video/voodoo_pci.cpp | 54 |
1 files changed, 29 insertions, 25 deletions
diff --git a/src/devices/video/voodoo_pci.cpp b/src/devices/video/voodoo_pci.cpp index 82fc89aaa9a..5a78099e01a 100644 --- a/src/devices/video/voodoo_pci.cpp +++ b/src/devices/video/voodoo_pci.cpp @@ -6,27 +6,31 @@ #include "screen.h" -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 +void voodoo_1_pci_device::device_add_mconfig(machine_config &config) +{ + VOODOO_1(config, m_voodoo, STD_VOODOO_1_CLOCK); + m_voodoo->set_fbmem(4); + m_voodoo->set_tmumem(1, 0); +} + +void voodoo_2_pci_device::device_add_mconfig(machine_config &config) +{ + VOODOO_2(config, m_voodoo, STD_VOODOO_2_CLOCK); + m_voodoo->set_fbmem(4); + m_voodoo->set_tmumem(1, 0); +} + +void voodoo_banshee_pci_device::device_add_mconfig(machine_config &config) +{ + VOODOO_BANSHEE(config, m_voodoo, STD_VOODOO_BANSHEE_CLOCK); + m_voodoo->set_fbmem(16); +} + +void voodoo_3_pci_device::device_add_mconfig(machine_config &config) +{ + VOODOO_3(config, m_voodoo, STD_VOODOO_3_CLOCK); + m_voodoo->set_fbmem(16); +} 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") @@ -42,22 +46,22 @@ void voodoo_pci_device::config_map(address_map &map) // VOODOO_1 & VOODOO_2 map void voodoo_pci_device::voodoo_reg_map(address_map &map) { - map(0x0, 0x00ffffff).rw("voodoo", FUNC(voodoo_device::voodoo_r), FUNC(voodoo_device::voodoo_w)); + map(0x0, 0x00ffffff).rw(m_voodoo, FUNC(voodoo_device::voodoo_r), FUNC(voodoo_device::voodoo_w)); } // VOODOO_BANSHEE and VOODOO_3 maps void voodoo_pci_device::banshee_reg_map(address_map &map) { - map(0x0, 0x01ffffff).rw("voodoo", FUNC(voodoo_banshee_device::banshee_r), FUNC(voodoo_banshee_device::banshee_w)); + map(0x0, 0x01ffffff).rw(m_voodoo, FUNC(voodoo_banshee_device::banshee_r), FUNC(voodoo_banshee_device::banshee_w)); } void voodoo_pci_device::lfb_map(address_map &map) { - map(0x0, 0x01ffffff).rw("voodoo", FUNC(voodoo_banshee_device::banshee_fb_r), FUNC(voodoo_banshee_device::banshee_fb_w)); + map(0x0, 0x01ffffff).rw(m_voodoo, FUNC(voodoo_banshee_device::banshee_fb_r), FUNC(voodoo_banshee_device::banshee_fb_w)); } 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)); + map(0x000, 0x0ff).rw(m_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, device_type type, const char *tag, device_t *owner, uint32_t clock) |