diff options
author | 2018-01-05 10:47:21 -0500 | |
---|---|---|
committer | 2018-01-05 10:47:28 -0500 | |
commit | aa45e908bbf1c6ac8141b1990500817699888b59 (patch) | |
tree | 9fc8ca6cd091b585343f89a816f2a73460ae79fb /src/devices/video/cdp1861.cpp | |
parent | c25b98226d633149162fbf99ea06919646acb9b6 (diff) |
Privatize m_screen and other variables of device_video_interface (nw)
Diffstat (limited to 'src/devices/video/cdp1861.cpp')
-rw-r--r-- | src/devices/video/cdp1861.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/devices/video/cdp1861.cpp b/src/devices/video/cdp1861.cpp index 0b3101d8352..53d1b4fb658 100644 --- a/src/devices/video/cdp1861.cpp +++ b/src/devices/video/cdp1861.cpp @@ -69,7 +69,7 @@ void cdp1861_device::device_start() m_dma_timer = timer_alloc(TIMER_DMA); // find devices - m_screen->register_screen_bitmap(m_bitmap); + screen().register_screen_bitmap(m_bitmap); // register for state saving save_item(NAME(m_disp)); @@ -85,8 +85,8 @@ void cdp1861_device::device_start() void cdp1861_device::device_reset() { - m_int_timer->adjust(m_screen->time_until_pos(SCANLINE_INT_START, 0)); - m_efx_timer->adjust(m_screen->time_until_pos(SCANLINE_EFX_TOP_START, 0)); + m_int_timer->adjust(screen().time_until_pos(SCANLINE_INT_START, 0)); + m_efx_timer->adjust(screen().time_until_pos(SCANLINE_EFX_TOP_START, 0)); m_dma_timer->adjust(clocks_to_attotime(CDP1861_CYCLES_DMA_START)); m_disp = 0; @@ -105,7 +105,7 @@ void cdp1861_device::device_reset() void cdp1861_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) { - int scanline = m_screen->vpos(); + int scanline = screen().vpos(); switch (id) { @@ -117,7 +117,7 @@ void cdp1861_device::device_timer(emu_timer &timer, device_timer_id id, int para m_write_irq(ASSERT_LINE); } - m_int_timer->adjust(m_screen->time_until_pos( SCANLINE_INT_END, 0)); + m_int_timer->adjust(screen().time_until_pos( SCANLINE_INT_END, 0)); } else { @@ -126,7 +126,7 @@ void cdp1861_device::device_timer(emu_timer &timer, device_timer_id id, int para m_write_irq(CLEAR_LINE); } - m_int_timer->adjust(m_screen->time_until_pos(SCANLINE_INT_START, 0)); + m_int_timer->adjust(screen().time_until_pos(SCANLINE_INT_START, 0)); } break; @@ -135,22 +135,22 @@ void cdp1861_device::device_timer(emu_timer &timer, device_timer_id id, int para { case SCANLINE_EFX_TOP_START: m_write_efx(ASSERT_LINE); - m_efx_timer->adjust(m_screen->time_until_pos(SCANLINE_EFX_TOP_END, 0)); + m_efx_timer->adjust(screen().time_until_pos(SCANLINE_EFX_TOP_END, 0)); break; case SCANLINE_EFX_TOP_END: m_write_efx(CLEAR_LINE); - m_efx_timer->adjust(m_screen->time_until_pos(SCANLINE_EFX_BOTTOM_START, 0)); + m_efx_timer->adjust(screen().time_until_pos(SCANLINE_EFX_BOTTOM_START, 0)); break; case SCANLINE_EFX_BOTTOM_START: m_write_efx(ASSERT_LINE); - m_efx_timer->adjust(m_screen->time_until_pos(SCANLINE_EFX_BOTTOM_END, 0)); + m_efx_timer->adjust(screen().time_until_pos(SCANLINE_EFX_BOTTOM_END, 0)); break; case SCANLINE_EFX_BOTTOM_END: m_write_efx(CLEAR_LINE); - m_efx_timer->adjust(m_screen->time_until_pos(SCANLINE_EFX_TOP_START, 0)); + m_efx_timer->adjust(screen().time_until_pos(SCANLINE_EFX_TOP_START, 0)); break; } break; @@ -195,8 +195,8 @@ void cdp1861_device::device_timer(emu_timer &timer, device_timer_id id, int para WRITE8_MEMBER( cdp1861_device::dma_w ) { - int sx = m_screen->hpos() + 4; - int y = m_screen->vpos(); + int sx = screen().hpos() + 4; + int y = screen().vpos(); int x; for (x = 0; x < 8; x++) |