summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/video/voodoo_2.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/video/voodoo_2.cpp')
-rw-r--r--src/devices/video/voodoo_2.cpp21
1 files changed, 9 insertions, 12 deletions
diff --git a/src/devices/video/voodoo_2.cpp b/src/devices/video/voodoo_2.cpp
index 6cd34433bff..5529c035eef 100644
--- a/src/devices/video/voodoo_2.cpp
+++ b/src/devices/video/voodoo_2.cpp
@@ -930,7 +930,7 @@ u32 voodoo_2_device::reg_intrctrl_w(u32 chipmask, u32 regnum, u32 data)
m_reg.write(regnum, data);
// Setting bit 31 clears the PCI interrupts
- if (BIT(data, 31) && !m_pciint_cb.isnull())
+ if (BIT(data, 31))
m_pciint_cb(false);
}
return 0;
@@ -999,9 +999,8 @@ u32 voodoo_2_device::reg_userintr_w(u32 chipmask, u32 regnum, u32 data)
reg_intr_ctrl::EXTERNAL_PIN_ACTIVE | reg_intr_ctrl::USER_INTERRUPT_TAG_MASK,
((data << 10) & reg_intr_ctrl::USER_INTERRUPT_TAG_MASK) | reg_intr_ctrl::USER_INTERRUPT_GENERATED);
- // Signal pci interrupt handler
- if (!m_pciint_cb.isnull())
- m_pciint_cb(true);
+ // Signal PCI interrupt handler
+ m_pciint_cb(true);
}
return 0;
}
@@ -1149,16 +1148,15 @@ u32 voodoo_2_device::cmdfifo_2d_w(u32 offset, u32 data)
// of VBLANK
//-------------------------------------------------
-void voodoo_2_device::vblank_start(void *ptr, s32 param)
+void voodoo_2_device::vblank_start(s32 param)
{
- voodoo_1_device::vblank_start(ptr, param);
+ voodoo_1_device::vblank_start(param);
// signal PCI VBLANK rising IRQ on Voodoo-2 and later
if (m_reg.intr_ctrl().vsync_rising_enable())
{
m_reg.clear_set(voodoo_regs::reg_intrCtrl, reg_intr_ctrl::EXTERNAL_PIN_ACTIVE, reg_intr_ctrl::VSYNC_RISING_GENERATED);
- if (!m_pciint_cb.isnull())
- m_pciint_cb(true);
+ m_pciint_cb(true);
}
}
@@ -1168,16 +1166,15 @@ void voodoo_2_device::vblank_start(void *ptr, s32 param)
// VBLANK
//-------------------------------------------------
-void voodoo_2_device::vblank_stop(void *ptr, s32 param)
+void voodoo_2_device::vblank_stop(s32 param)
{
- voodoo_1_device::vblank_stop(ptr, param);
+ voodoo_1_device::vblank_stop(param);
// signal PCI VBLANK falling IRQ on Voodoo-2 and later
if (m_reg.intr_ctrl().vsync_falling_enable())
{
m_reg.clear_set(voodoo_regs::reg_intrCtrl, reg_intr_ctrl::EXTERNAL_PIN_ACTIVE, reg_intr_ctrl::VSYNC_FALLING_GENERATED);
- if (!m_pciint_cb.isnull())
- m_pciint_cb(true);
+ m_pciint_cb(true);
}
}