summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar AJR <ajrhacker@users.noreply.github.com>2018-03-08 13:34:06 -0500
committerGravatarGravatar AJR <ajrhacker@users.noreply.github.com>2018-03-08 13:34:06 -0500
commitd32afbf85ec76ce6c7298f3dc557742a2d76f69b (patch)
tree898ebedaf171661a608c335e791a4d519bb0a1ea
parent54d93e84edc5f6efa1a47e957c3b90d14863a902 (diff)
osborne1: Remove first_screen (nw)
-rw-r--r--src/mame/drivers/osborne1.cpp1
-rw-r--r--src/mame/includes/osborne1.h4
-rw-r--r--src/mame/machine/osborne1.cpp10
3 files changed, 8 insertions, 7 deletions
diff --git a/src/mame/drivers/osborne1.cpp b/src/mame/drivers/osborne1.cpp
index c4a5f45009e..d6b2b9dc593 100644
--- a/src/mame/drivers/osborne1.cpp
+++ b/src/mame/drivers/osborne1.cpp
@@ -92,7 +92,6 @@ TODO:
#include "includes/osborne1.h"
#include "bus/rs232/rs232.h"
-#include "screen.h"
#include "speaker.h"
#include "softlist.h"
diff --git a/src/mame/includes/osborne1.h b/src/mame/includes/osborne1.h
index a300f73df32..54a9dfd842b 100644
--- a/src/mame/includes/osborne1.h
+++ b/src/mame/includes/osborne1.h
@@ -24,6 +24,8 @@
#include "video/mc6845.h"
+#include "screen.h"
+
class osborne1_state : public driver_device
{
@@ -32,6 +34,7 @@ public:
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_gfxdecode(*this, "gfxdecode"),
+ m_screen(*this, "screen"),
m_speaker(*this, "speaker"),
m_pia0(*this, "pia_0"),
m_pia1(*this, "pia_1"),
@@ -85,6 +88,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
+ required_device<screen_device> m_screen;
required_device<speaker_sound_device> m_speaker;
required_device<pia6821_device> m_pia0;
required_device<pia6821_device> m_pia1;
diff --git a/src/mame/machine/osborne1.cpp b/src/mame/machine/osborne1.cpp
index 7c57ca4ca3b..e387bcfead7 100644
--- a/src/mame/machine/osborne1.cpp
+++ b/src/mame/machine/osborne1.cpp
@@ -12,8 +12,6 @@ There are three IRQ sources:
#include "emu.h"
#include "includes/osborne1.h"
-#include "screen.h"
-
WRITE8_MEMBER( osborne1_state::bank_0xxx_w )
{
@@ -344,8 +342,8 @@ void osborne1_state::machine_reset()
void osborne1_state::video_start()
{
- machine().first_screen()->register_screen_bitmap(m_bitmap);
- m_video_timer->adjust(machine().first_screen()->time_until_pos(1, 0));
+ m_screen->register_screen_bitmap(m_bitmap);
+ m_video_timer->adjust(m_screen->time_until_pos(1, 0));
}
uint32_t osborne1_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
@@ -357,7 +355,7 @@ uint32_t osborne1_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
TIMER_CALLBACK_MEMBER(osborne1_state::video_callback)
{
- int const y = machine().first_screen()->vpos();
+ int const y = m_screen->vpos();
uint8_t const ra = y % 10;
uint8_t const port_b = m_pia1->b_output();
@@ -430,7 +428,7 @@ TIMER_CALLBACK_MEMBER(osborne1_state::video_callback)
m_beep_state = (ra & 0x04) ? 1 : 0;
m_speaker->level_w((BIT(port_b, 5) && m_beep_state) ? 1 : 0);
- m_video_timer->adjust(machine().first_screen()->time_until_pos(y + 1, 0));
+ m_video_timer->adjust(m_screen->time_until_pos(y + 1, 0));
}
TIMER_CALLBACK_MEMBER(osborne1_state::acia_rxc_txc_callback)