From 54d93e84edc5f6efa1a47e957c3b90d14863a902 Mon Sep 17 00:00:00 2001 From: AJR Date: Thu, 8 Mar 2018 13:28:51 -0500 Subject: [PATCH] apple2 (legacy), apple2gs: Remove first_screen (nw) --- src/mame/drivers/apple2gs.cpp | 1 - src/mame/includes/apple2.h | 4 ++++ src/mame/machine/apple2.cpp | 5 ++--- src/mame/machine/apple2gs.cpp | 19 +++++++++---------- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/mame/drivers/apple2gs.cpp b/src/mame/drivers/apple2gs.cpp index 9d1f6e32c09..a6488ac1324 100644 --- a/src/mame/drivers/apple2gs.cpp +++ b/src/mame/drivers/apple2gs.cpp @@ -74,7 +74,6 @@ //#include "bus/a2bus/a2udrive.h" #include "bus/a2bus/a2hsscsi.h" -#include "screen.h" #include "softlist.h" #include "speaker.h" diff --git a/src/mame/includes/apple2.h b/src/mame/includes/apple2.h index c43e1dae2a0..b88d02703ab 100644 --- a/src/mame/includes/apple2.h +++ b/src/mame/includes/apple2.h @@ -28,6 +28,8 @@ #include "bus/a2bus/a2eauxslot.h" #include "bus/rs232/rs232.h" +#include "screen.h" + #define AUXSLOT_TAG "auxbus" @@ -133,6 +135,7 @@ public: apple2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), + m_screen(*this, "screen"), m_ram(*this, RAM_TAG), m_ay3600(*this, "ay3600"), m_a2bus(*this, "a2bus"), @@ -155,6 +158,7 @@ public: { } required_device m_maincpu; + required_device m_screen; required_device m_ram; required_device m_ay3600; required_device m_a2bus; diff --git a/src/mame/machine/apple2.cpp b/src/mame/machine/apple2.cpp index 7704f5a9d32..a555b69d9f4 100644 --- a/src/mame/machine/apple2.cpp +++ b/src/mame/machine/apple2.cpp @@ -17,7 +17,6 @@ #include "machine/sonydriv.h" #include "debugger.h" -#include "screen.h" #ifdef MAME_DEBUG @@ -1229,7 +1228,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(apple2_state::apple2_interrupt) int scanline = param; if((scanline % 8) == 0) - machine().first_screen()->update_partial(machine().first_screen()->vpos()); + m_screen->update_partial(m_screen->vpos()); if ((m_kbspecial->read() & 0x80) && (a2_no_ctrl_reset() || (m_kbspecial->read() & 0x08))) { @@ -1723,7 +1722,7 @@ READ8_MEMBER( apple2_state::apple2_c01x_r ) case 0x06: result |= (m_flags & VAR_ALTZP) ? 0x80 : 0x00; break; case 0x07: result |= (m_flags & VAR_SLOTC3ROM) ? 0x80 : 0x00; break; case 0x08: result |= (m_flags & VAR_80STORE) ? 0x80 : 0x00; break; - case 0x09: result |= !machine().first_screen()->vblank() ? 0x80 : 0x00; break; + case 0x09: result |= !m_screen->vblank() ? 0x80 : 0x00; break; case 0x0A: result |= (m_flags & VAR_TEXT) ? 0x80 : 0x00; break; case 0x0B: result |= (m_flags & VAR_MIXED) ? 0x80 : 0x00; break; case 0x0C: result |= (m_flags & VAR_PAGE2) ? 0x80 : 0x00; break; diff --git a/src/mame/machine/apple2gs.cpp b/src/mame/machine/apple2gs.cpp index 6a53eb1d840..fa5dc420fbf 100644 --- a/src/mame/machine/apple2gs.cpp +++ b/src/mame/machine/apple2gs.cpp @@ -130,7 +130,6 @@ #include "machine/ram.h" #include "debugger.h" -#include "screen.h" #define LOG_C0XX 0 #define LOG_ADB 0 @@ -726,8 +725,8 @@ TIMER_CALLBACK_MEMBER(apple2gs_state::apple2gs_scanline_tick) { int scanline; - scanline = machine().first_screen()->vpos(); - machine().first_screen()->update_partial(scanline); + scanline = m_screen->vpos(); + m_screen->update_partial(scanline); /* check scanline interrupt bits if we're in super hi-res and the current scanline is within the active display area */ if ((m_newvideo & 0x80) && (scanline >= (BORDER_TOP-1)) && (scanline < (200+BORDER_TOP-1))) @@ -768,15 +767,15 @@ TIMER_CALLBACK_MEMBER(apple2gs_state::apple2gs_scanline_tick) #endif /* call Apple II interrupt handler */ - if ((machine().first_screen()->vpos() % 8) == 7) + if ((m_screen->vpos() % 8) == 7) { //apple2_interrupt(m_maincpu); /* TODO: check me! */ - machine().first_screen()->update_partial(machine().first_screen()->vpos()); + m_screen->update_partial(m_screen->vpos()); } } - m_scanline_timer->adjust(machine().first_screen()->time_until_pos((scanline+1)%262, 0)); + m_scanline_timer->adjust(m_screen->time_until_pos((scanline+1)%262, 0)); } @@ -881,7 +880,7 @@ int apple2gs_state::apple2gs_get_vpos() }; - scan = machine().first_screen()->vpos(); + scan = m_screen->vpos(); if (scan < BORDER_TOP) { @@ -919,7 +918,7 @@ READ8_MEMBER( apple2gs_state::apple2gs_c0xx_r ) #endif case 0x19: /* C019 - RDVBLBAR */ - result = (machine().first_screen()->vpos() >= (192+BORDER_TOP)) ? 0x80 : 0x00; + result = (m_screen->vpos() >= (192+BORDER_TOP)) ? 0x80 : 0x00; break; case 0x22: /* C022 - TBCOLOR */ @@ -1020,7 +1019,7 @@ READ8_MEMBER( apple2gs_state::apple2gs_c0xx_r ) break; case 0x2F: /* C02F - HORIZCNT */ - result = machine().first_screen()->hpos() / 11; + result = m_screen->hpos() / 11; if (result > 0) { result += 0x40; @@ -2046,7 +2045,7 @@ MACHINE_START_MEMBER(apple2gs_state,apple2gscommon) m_scanline_timer->adjust(attotime::never); // fire on scanline zero - m_scanline_timer->adjust(machine().first_screen()->time_until_pos(0, 0)); + m_scanline_timer->adjust(m_screen->time_until_pos(0, 0)); } MACHINE_START_MEMBER(apple2gs_state,apple2gs)