Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-01 12:16:56 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

osborne1: Remove first_screen (nw)

Browse Source
This commit is contained in:
AJR 2018-03-08 13:34:06 -05:00
parent 54d93e84ed
commit d32afbf85e
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,7 +92,6 @@ TODO:
#include "includes/osborne1.h" #include "includes/osborne1.h"
#include "bus/rs232/rs232.h" #include "bus/rs232/rs232.h"
#include "screen.h"
#include "speaker.h" #include "speaker.h"
#include "softlist.h" #include "softlist.h"

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

@ -24,6 +24,8 @@
#include "video/mc6845.h" #include "video/mc6845.h"
#include "screen.h"
class osborne1_state : public driver_device class osborne1_state : public driver_device
{ {
@ -32,6 +34,7 @@ public:
driver_device(mconfig, type, tag), driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"), m_maincpu(*this, "maincpu"),
m_gfxdecode(*this, "gfxdecode"), m_gfxdecode(*this, "gfxdecode"),
m_screen(*this, "screen"),
m_speaker(*this, "speaker"), m_speaker(*this, "speaker"),
m_pia0(*this, "pia_0"), m_pia0(*this, "pia_0"),
m_pia1(*this, "pia_1"), m_pia1(*this, "pia_1"),
@ -85,6 +88,7 @@ public:
required_device<cpu_device> m_maincpu; required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode; required_device<gfxdecode_device> m_gfxdecode;
required_device<screen_device> m_screen;
required_device<speaker_sound_device> m_speaker; required_device<speaker_sound_device> m_speaker;
required_device<pia6821_device> m_pia0; required_device<pia6821_device> m_pia0;
required_device<pia6821_device> m_pia1; required_device<pia6821_device> m_pia1;

10
src/mame/machine/osborne1.cpp
View File

@ -12,8 +12,6 @@ There are three IRQ sources:
#include "emu.h" #include "emu.h"
#include "includes/osborne1.h" #include "includes/osborne1.h"
#include "screen.h"
WRITE8_MEMBER( osborne1_state::bank_0xxx_w ) WRITE8_MEMBER( osborne1_state::bank_0xxx_w )
{ {
@ -344,8 +342,8 @@ void osborne1_state::machine_reset()
void osborne1_state::video_start() void osborne1_state::video_start()
{ {
machine().first_screen()->register_screen_bitmap(m_bitmap); m_screen->register_screen_bitmap(m_bitmap);
m_video_timer->adjust(machine().first_screen()->time_until_pos(1, 0)); 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) 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) 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 ra = y % 10;
uint8_t const port_b = m_pia1->b_output(); 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_beep_state = (ra & 0x04) ? 1 : 0;
m_speaker->level_w((BIT(port_b, 5) && m_beep_state) ? 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) TIMER_CALLBACK_MEMBER(osborne1_state::acia_rxc_txc_callback)