diff options
author | Aaron Giles <aaron@aarongiles.com> | 2013-08-05 06:00:20 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2013-08-05 06:00:20 +0000 |
commit | 539367c7d1d41b406579c10e67f30aa02500d52d (patch) | |
tree | 1da7471e17992b397494ff3bb92fddb02f43ef34 /src/mame/drivers/namconb1.c | |
parent | 46adb9df434d86e030963bda9a80ea9e60a60f4f (diff) |
Bulk removal of machine().primary_screen references from MAME drivers, in
favor of using the common m_screen. This is 98% reliable except for cases
where there were multiple screens or where the screens were not named
'screen' like everywhere else. Those cases will need to be revisited but
should reveal themselves in the next round of regression tests.
Eventual plan is primary_screen will go away. Devices that need to know the
screen should have a device_video_interface. Drivers should find the screen
device like any other, or use the pre-found m_screen for the common
single-screen case.
Diffstat (limited to 'src/mame/drivers/namconb1.c')
-rw-r--r-- | src/mame/drivers/namconb1.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mame/drivers/namconb1.c b/src/mame/drivers/namconb1.c index 83ba16049f7..ce1877bfcfb 100644 --- a/src/mame/drivers/namconb1.c +++ b/src/mame/drivers/namconb1.c @@ -302,7 +302,7 @@ TIMER_CALLBACK_MEMBER(namconb1_state::namconb1_TriggerPOSIRQ) if(m_pos_irq_active || !(m_namconb_cpureg[0x02] & 0xf0)) return; - machine().primary_screen->update_partial(param); + m_screen->update_partial(param); m_pos_irq_active = 1; m_maincpu->set_input_line(m_namconb_cpureg[0x02] & 0xf, ASSERT_LINE); } @@ -356,14 +356,14 @@ INTERRUPT_GEN_MEMBER(namconb1_state::namconb1_interrupt) } if( scanline < NAMCONB1_VBSTART ) { - machine().scheduler().timer_set( machine().primary_screen->time_until_pos(scanline), timer_expired_delegate(FUNC(namconb1_state::namconb1_TriggerPOSIRQ),this), scanline); + machine().scheduler().timer_set( m_screen->time_until_pos(scanline), timer_expired_delegate(FUNC(namconb1_state::namconb1_TriggerPOSIRQ),this), scanline); } } /* namconb1_interrupt */ TIMER_CALLBACK_MEMBER(namconb1_state::namconb2_TriggerPOSIRQ) { - machine().primary_screen->update_partial(param); + m_screen->update_partial(param); m_pos_irq_active = 1; m_maincpu->set_input_line(m_namconb_cpureg[0x02], ASSERT_LINE); } @@ -410,7 +410,7 @@ INTERRUPT_GEN_MEMBER(namconb1_state::namconb2_interrupt) scanline = 0; if( scanline < NAMCONB1_VBSTART ) - machine().scheduler().timer_set( machine().primary_screen->time_until_pos(scanline), timer_expired_delegate(FUNC(namconb1_state::namconb2_TriggerPOSIRQ),this), scanline); + machine().scheduler().timer_set( m_screen->time_until_pos(scanline), timer_expired_delegate(FUNC(namconb1_state::namconb2_TriggerPOSIRQ),this), scanline); } /* namconb2_interrupt */ static void namconb1_cpureg8_w(running_machine &machine, int reg, UINT8 data) |