summaryrefslogtreecommitdiffstatshomepage
path: root/src/mess/machine/apple2gs.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mess/machine/apple2gs.c')
-rw-r--r--src/mess/machine/apple2gs.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mess/machine/apple2gs.c b/src/mess/machine/apple2gs.c
index 423e0c50d0a..3d3eb5d5577 100644
--- a/src/mess/machine/apple2gs.c
+++ b/src/mess/machine/apple2gs.c
@@ -726,8 +726,8 @@ TIMER_CALLBACK_MEMBER(apple2gs_state::apple2gs_scanline_tick)
{
int scanline;
- scanline = machine().primary_screen->vpos();
- machine().primary_screen->update_partial(scanline);
+ scanline = machine().first_screen()->vpos();
+ machine().first_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 +768,15 @@ TIMER_CALLBACK_MEMBER(apple2gs_state::apple2gs_scanline_tick)
#endif
/* call Apple II interrupt handler */
- if ((machine().primary_screen->vpos() % 8) == 7)
+ if ((machine().first_screen()->vpos() % 8) == 7)
{
//apple2_interrupt(m_maincpu);
/* TODO: check me! */
- machine().primary_screen->update_partial(machine().primary_screen->vpos());
+ machine().first_screen()->update_partial(machine().first_screen()->vpos());
}
}
- m_scanline_timer->adjust(machine().primary_screen->time_until_pos((scanline+1)%262, 0));
+ m_scanline_timer->adjust(machine().first_screen()->time_until_pos((scanline+1)%262, 0));
}
@@ -881,7 +881,7 @@ int apple2gs_state::apple2gs_get_vpos()
};
- scan = machine().primary_screen->vpos();
+ scan = machine().first_screen()->vpos();
if (scan < BORDER_TOP)
{
@@ -920,7 +920,7 @@ READ8_MEMBER( apple2gs_state::apple2gs_c0xx_r )
#endif
case 0x19: /* C019 - RDVBLBAR */
- result = (space.machine().primary_screen->vpos() >= (192+BORDER_TOP)) ? 0x80 : 0x00;
+ result = (space.machine().first_screen()->vpos() >= (192+BORDER_TOP)) ? 0x80 : 0x00;
break;
case 0x22: /* C022 - TBCOLOR */
@@ -1021,7 +1021,7 @@ READ8_MEMBER( apple2gs_state::apple2gs_c0xx_r )
break;
case 0x2F: /* C02F - HORIZCNT */
- result = space.machine().primary_screen->hpos() / 11;
+ result = space.machine().first_screen()->hpos() / 11;
if (result > 0)
{
result += 0x40;
@@ -2068,7 +2068,7 @@ MACHINE_START_MEMBER(apple2gs_state,apple2gscommon)
m_scanline_timer->adjust(attotime::never);
// fire on scanline zero
- m_scanline_timer->adjust(machine().primary_screen->time_until_pos(0, 0));
+ m_scanline_timer->adjust(machine().first_screen()->time_until_pos(0, 0));
}
MACHINE_START_MEMBER(apple2gs_state,apple2gs)