diff options
Diffstat (limited to 'src/mame/drivers/savquest.cpp')
-rw-r--r-- | src/mame/drivers/savquest.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/mame/drivers/savquest.cpp b/src/mame/drivers/savquest.cpp index 674ed351156..b09072e5bab 100644 --- a/src/mame/drivers/savquest.cpp +++ b/src/mame/drivers/savquest.cpp @@ -55,7 +55,7 @@ #include "machine/pckeybrd.h" #include "machine/idectrl.h" #include "video/pc_vga.h" -#include "video/voodoo.h" +#include "video/voodoo_2.h" #include "machine/ds128x.h" #include "bus/isa/sblaster.h" @@ -357,7 +357,7 @@ void savquest_state::vid_3dfx_init() m_pci_3dfx_regs[0x08 / 4] = 2; // revision ID m_pci_3dfx_regs[0x10 / 4] = 0xff000000; m_pci_3dfx_regs[0x40 / 4] = 0x4000; //INITEN_SECONDARY_REV_ID - m_voodoo->voodoo_set_init_enable(0x4000); //INITEN_SECONDARY_REV_ID + m_voodoo->set_init_enable(0x4000); //INITEN_SECONDARY_REV_ID } uint32_t savquest_state::pci_3dfx_r(int function, int reg, uint32_t mem_mask) @@ -376,7 +376,7 @@ osd_printf_warning("PCI write: %x %x\n", reg, data); } else if (reg == 0x40) { - m_voodoo->voodoo_set_init_enable(data); + m_voodoo->set_init_enable(data); } else if (reg == 0x54) { @@ -754,7 +754,7 @@ void savquest_state::savquest_map(address_map &map) map(0x000e8000, 0x000ebfff).bankr("bios_e8000").w(FUNC(savquest_state::bios_e8000_ram_w)); map(0x000ec000, 0x000effff).bankr("bios_ec000").w(FUNC(savquest_state::bios_ec000_ram_w)); map(0x00100000, 0x07ffffff).ram(); // 128MB RAM - map(0xe0000000, 0xe0fbffff).rw(m_voodoo, FUNC(voodoo_device::voodoo_r), FUNC(voodoo_device::voodoo_w)); + map(0xe0000000, 0xe0fbffff).rw(m_voodoo, FUNC(generic_voodoo_device::read), FUNC(generic_voodoo_device::write)); map(0xfffc0000, 0xffffffff).rom().region("bios", 0); /* System BIOS */ } @@ -852,11 +852,12 @@ void savquest_state::savquest(machine_config &config) /* video hardware */ pcvideo_s3_vga(config); - VOODOO_2(config, m_voodoo, STD_VOODOO_2_CLOCK); + VOODOO_2(config, m_voodoo, voodoo_2_device::NOMINAL_CLOCK); m_voodoo->set_fbmem(4); m_voodoo->set_tmumem(4, 4); /* this is the 12Mb card */ - m_voodoo->set_screen_tag("screen"); - m_voodoo->set_cpu_tag(m_maincpu); + m_voodoo->set_status_cycles(1000); // optimization to consume extra cycles when polling status + m_voodoo->set_screen("screen"); + m_voodoo->set_cpu(m_maincpu); m_voodoo->vblank_callback().set(FUNC(savquest_state::vblank_assert)); } |