Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-31 01:51:46 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

apple2 (legacy), apple2gs: Remove first_screen (nw)

Browse Source
This commit is contained in:
AJR 2018-03-08 13:28:51 -05:00
parent 544eb9e2bf
commit 54d93e84ed
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/mame/drivers/apple2gs.cpp
View File

@ -74,7 +74,6 @@
//#include "bus/a2bus/a2udrive.h" //#include "bus/a2bus/a2udrive.h"
#include "bus/a2bus/a2hsscsi.h" #include "bus/a2bus/a2hsscsi.h"
#include "screen.h"
#include "softlist.h" #include "softlist.h"
#include "speaker.h" #include "speaker.h"

4
src/mame/includes/apple2.h
View File

@ -28,6 +28,8 @@
#include "bus/a2bus/a2eauxslot.h" #include "bus/a2bus/a2eauxslot.h"
#include "bus/rs232/rs232.h" #include "bus/rs232/rs232.h"
#include "screen.h"
#define AUXSLOT_TAG "auxbus" #define AUXSLOT_TAG "auxbus"
@ -133,6 +135,7 @@ public:
apple2_state(const machine_config &mconfig, device_type type, const char *tag) apple2_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag), : driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"), m_maincpu(*this, "maincpu"),
m_screen(*this, "screen"),
m_ram(*this, RAM_TAG), m_ram(*this, RAM_TAG),
m_ay3600(*this, "ay3600"), m_ay3600(*this, "ay3600"),
m_a2bus(*this, "a2bus"), m_a2bus(*this, "a2bus"),
@ -155,6 +158,7 @@ public:
{ } { }
required_device<cpu_device> m_maincpu; required_device<cpu_device> m_maincpu;
required_device<screen_device> m_screen;
required_device<ram_device> m_ram; required_device<ram_device> m_ram;
required_device<ay3600_device> m_ay3600; required_device<ay3600_device> m_ay3600;
required_device<a2bus_device> m_a2bus; required_device<a2bus_device> m_a2bus;

5
src/mame/machine/apple2.cpp
View File

@ -17,7 +17,6 @@
#include "machine/sonydriv.h" #include "machine/sonydriv.h"
#include "debugger.h" #include "debugger.h"
#include "screen.h"
#ifdef MAME_DEBUG #ifdef MAME_DEBUG
@ -1229,7 +1228,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(apple2_state::apple2_interrupt)
int scanline = param; int scanline = param;
if((scanline % 8) == 0) 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) && if ((m_kbspecial->read() & 0x80) &&
(a2_no_ctrl_reset() || (m_kbspecial->read() & 0x08))) (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 0x06: result |= (m_flags & VAR_ALTZP) ? 0x80 : 0x00; break;
case 0x07: result |= (m_flags & VAR_SLOTC3ROM) ? 0x80 : 0x00; break; case 0x07: result |= (m_flags & VAR_SLOTC3ROM) ? 0x80 : 0x00; break;
case 0x08: result |= (m_flags & VAR_80STORE) ? 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 0x0A: result |= (m_flags & VAR_TEXT) ? 0x80 : 0x00; break;
case 0x0B: result |= (m_flags & VAR_MIXED) ? 0x80 : 0x00; break; case 0x0B: result |= (m_flags & VAR_MIXED) ? 0x80 : 0x00; break;
case 0x0C: result |= (m_flags & VAR_PAGE2) ? 0x80 : 0x00; break; case 0x0C: result |= (m_flags & VAR_PAGE2) ? 0x80 : 0x00; break;

19
src/mame/machine/apple2gs.cpp
View File

@ -130,7 +130,6 @@
#include "machine/ram.h" #include "machine/ram.h"
#include "debugger.h" #include "debugger.h"
#include "screen.h"
#define LOG_C0XX 0 #define LOG_C0XX 0
#define LOG_ADB 0 #define LOG_ADB 0
@ -726,8 +725,8 @@ TIMER_CALLBACK_MEMBER(apple2gs_state::apple2gs_scanline_tick)
{ {
int scanline; int scanline;
scanline = machine().first_screen()->vpos(); scanline = m_screen->vpos();
machine().first_screen()->update_partial(scanline); 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 */ /* 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))) 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 #endif
/* call Apple II interrupt handler */ /* call Apple II interrupt handler */
if ((machine().first_screen()->vpos() % 8) == 7) if ((m_screen->vpos() % 8) == 7)
{ {
//apple2_interrupt(m_maincpu); //apple2_interrupt(m_maincpu);
/* TODO: check me! */ /* 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) if (scan < BORDER_TOP)
{ {
@ -919,7 +918,7 @@ READ8_MEMBER( apple2gs_state::apple2gs_c0xx_r )
#endif #endif
case 0x19: /* C019 - RDVBLBAR */ case 0x19: /* C019 - RDVBLBAR */
result = (machine().first_screen()->vpos() >= (192+BORDER_TOP)) ? 0x80 : 0x00; result = (m_screen->vpos() >= (192+BORDER_TOP)) ? 0x80 : 0x00;
break; break;
case 0x22: /* C022 - TBCOLOR */ case 0x22: /* C022 - TBCOLOR */
@ -1020,7 +1019,7 @@ READ8_MEMBER( apple2gs_state::apple2gs_c0xx_r )
break; break;
case 0x2F: /* C02F - HORIZCNT */ case 0x2F: /* C02F - HORIZCNT */
result = machine().first_screen()->hpos() / 11; result = m_screen->hpos() / 11;
if (result > 0) if (result > 0)
{ {
result += 0x40; result += 0x40;
@ -2046,7 +2045,7 @@ MACHINE_START_MEMBER(apple2gs_state,apple2gscommon)
m_scanline_timer->adjust(attotime::never); m_scanline_timer->adjust(attotime::never);
// fire on scanline zero // 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) MACHINE_START_MEMBER(apple2gs_state,apple2gs)