diff --git a/src/mame/drivers/mz700.cpp b/src/mame/drivers/mz700.cpp index 0564bef88f7..6b3493873f3 100644 --- a/src/mame/drivers/mz700.cpp +++ b/src/mame/drivers/mz700.cpp @@ -87,7 +87,6 @@ #include "sound/sn76496.h" #include "sound/wave.h" -#include "screen.h" #include "softlist.h" #include "speaker.h" diff --git a/src/mame/includes/mz700.h b/src/mame/includes/mz700.h index ac0e51a8353..fc876e64783 100644 --- a/src/mame/includes/mz700.h +++ b/src/mame/includes/mz700.h @@ -19,6 +19,7 @@ #include "machine/timer.h" #include "machine/z80pio.h" #include "sound/spkrdev.h" +#include "screen.h" class mz_state : public driver_device { @@ -33,6 +34,7 @@ public: , m_centronics(*this, "centronics") , m_ram(*this, RAM_TAG) , m_palette(*this, "palette") + , m_screen(*this, "screen") , m_banke(*this, "banke") , m_bankf(*this, "bankf") { } @@ -129,6 +131,7 @@ private: optional_device m_centronics; required_device m_ram; required_device m_palette; + required_device m_screen; optional_device m_banke; optional_device m_bankf; }; diff --git a/src/mame/machine/mz700.cpp b/src/mame/machine/mz700.cpp index b05bb44ce8e..1d0c2972c4c 100644 --- a/src/mame/machine/mz700.cpp +++ b/src/mame/machine/mz700.cpp @@ -124,7 +124,7 @@ READ8_MEMBER(mz_state::mz700_e008_r) data |= m_other_timer; data |= ioport("JOY")->read(); - data |= machine().first_screen()->hblank() << 7; + data |= m_screen->hblank() << 7; LOG(1, "mz700_e008_r", ("%02X\n", data), machine()); @@ -504,7 +504,7 @@ READ8_MEMBER(mz_state::pio_port_c_r) data |= 0x20; /* set the RDATA status */ data |= m_cursor_timer << 6; - data |= machine().first_screen()->vblank() << 7; + data |= m_screen->vblank() << 7; LOG(2,"mz700_pio_port_c_r",("%02X\n", data),machine()); @@ -596,7 +596,7 @@ READ8_MEMBER(mz_state::mz800_z80pio_port_a_r) result |= m_centronics_busy; result |= m_centronics_perror << 1; - result |= machine().first_screen()->hblank() << 5; + result |= m_screen->hblank() << 5; return result; }