summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
author Roberto Fresca <robbie@robertofresca.com>2019-07-11 23:42:15 +0200
committer Roberto Fresca <robbie@robertofresca.com>2019-07-11 23:42:15 +0200
commit9214a78d705f3b83c3ea45534cf1d8355c1cb9c5 (patch)
tree5b73fda7b339c0c1dcb111850fb66930602ae5d7 /src
parent4faa4fb12f04143f2a7ad6d17a3489c69da2960b (diff)
parentcc5d4b93059522122cb534e599b92f8e8f51225c (diff)
Merge branch 'master' of https://github.com/mamedev/mame
Diffstat (limited to 'src')
-rw-r--r--src/devices/bus/gamegear/ggext.cpp2
-rw-r--r--src/devices/bus/gamegear/ggext.h5
-rw-r--r--src/devices/bus/gamegear/smsctrladp.cpp1
-rw-r--r--src/devices/bus/nes_ctrl/ctrl.cpp2
-rw-r--r--src/devices/bus/nes_ctrl/ctrl.h6
-rw-r--r--src/devices/bus/nes_ctrl/hori.cpp18
-rw-r--r--src/devices/bus/nes_ctrl/hori.h4
-rw-r--r--src/devices/bus/nes_ctrl/joypad.cpp3
-rw-r--r--src/devices/bus/nes_ctrl/zapper.cpp13
-rw-r--r--src/devices/bus/nes_ctrl/zapper.h1
-rw-r--r--src/devices/bus/sms_ctrl/lphaser.cpp23
-rw-r--r--src/devices/bus/sms_ctrl/lphaser.h1
-rw-r--r--src/devices/bus/sms_ctrl/multitap.cpp4
-rw-r--r--src/devices/bus/sms_ctrl/rfu.cpp1
-rw-r--r--src/devices/bus/sms_ctrl/smsctrl.cpp2
-rw-r--r--src/devices/bus/sms_ctrl/smsctrl.h5
-rw-r--r--src/mame/drivers/nes.cpp8
-rw-r--r--src/mame/drivers/nes_vt.cpp4
-rw-r--r--src/mame/drivers/playch10.cpp12
-rw-r--r--src/mame/drivers/sms.cpp3
-rw-r--r--src/mame/video/playch10.cpp12
21 files changed, 85 insertions, 45 deletions
diff --git a/src/devices/bus/gamegear/ggext.cpp b/src/devices/bus/gamegear/ggext.cpp
index a886abe67f2..99d464e87b7 100644
--- a/src/devices/bus/gamegear/ggext.cpp
+++ b/src/devices/bus/gamegear/ggext.cpp
@@ -8,6 +8,7 @@
**********************************************************************/
#include "emu.h"
+#include "screen.h"
#include "ggext.h"
// slot devices
#include "smsctrladp.h"
@@ -58,6 +59,7 @@ device_gg_ext_port_interface::~device_gg_ext_port_interface()
gg_ext_port_device::gg_ext_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, GG_EXT_PORT, tag, owner, clock),
device_slot_interface(mconfig, *this),
+ m_screen(*this, finder_base::DUMMY_TAG),
m_device(nullptr),
m_th_pin_handler(*this)
{
diff --git a/src/devices/bus/gamegear/ggext.h b/src/devices/bus/gamegear/ggext.h
index 89dd235a9b0..f2145e694fd 100644
--- a/src/devices/bus/gamegear/ggext.h
+++ b/src/devices/bus/gamegear/ggext.h
@@ -65,6 +65,11 @@ public:
void th_pin_w(int state);
+ template <typename T> void set_screen_tag(T &&tag) { m_screen.set_tag(std::forward<T>(tag)); }
+
+ // for peripherals that interact with the machine's screen
+ required_device<screen_device> m_screen;
+
//protected:
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/gamegear/smsctrladp.cpp b/src/devices/bus/gamegear/smsctrladp.cpp
index 7260894e8f7..8308c55d81a 100644
--- a/src/devices/bus/gamegear/smsctrladp.cpp
+++ b/src/devices/bus/gamegear/smsctrladp.cpp
@@ -77,6 +77,7 @@ WRITE_LINE_MEMBER( sms_ctrl_adaptor_device::th_pin_w )
void sms_ctrl_adaptor_device::device_add_mconfig(machine_config &config)
{
SMS_CONTROL_PORT(config, m_subctrl_port, sms_control_port_devices, "joypad");
+ m_subctrl_port->set_screen_tag(m_port->m_screen);
m_subctrl_port->th_input_handler().set(FUNC(sms_ctrl_adaptor_device::th_pin_w));
}
diff --git a/src/devices/bus/nes_ctrl/ctrl.cpp b/src/devices/bus/nes_ctrl/ctrl.cpp
index bacbd952c8a..a946eeb80fb 100644
--- a/src/devices/bus/nes_ctrl/ctrl.cpp
+++ b/src/devices/bus/nes_ctrl/ctrl.cpp
@@ -41,6 +41,7 @@
**********************************************************************/
#include "emu.h"
+#include "screen.h"
#include "ctrl.h"
// slot devices
#include "4score.h"
@@ -104,6 +105,7 @@ device_nes_control_port_interface::~device_nes_control_port_interface()
nes_control_port_device::nes_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NES_CONTROL_PORT, tag, owner, clock),
device_slot_interface(mconfig, *this),
+ m_screen(*this, finder_base::DUMMY_TAG),
m_device(nullptr)
{
}
diff --git a/src/devices/bus/nes_ctrl/ctrl.h b/src/devices/bus/nes_ctrl/ctrl.h
index 27579717878..0acefbf4654 100644
--- a/src/devices/bus/nes_ctrl/ctrl.h
+++ b/src/devices/bus/nes_ctrl/ctrl.h
@@ -67,10 +67,16 @@ public:
uint8_t read_bit34();
uint8_t read_exp(offs_t offset);
void write(uint8_t data);
+ template <typename T> void set_screen_tag(T &&tag) { m_screen.set_tag(std::forward<T>(tag)); }
+
+ // for peripherals that interact with the machine's screen
+ required_device<screen_device> m_screen;
protected:
// device-level overrides
virtual void device_start() override;
+
+ // devices
device_nes_control_port_interface *m_device;
};
diff --git a/src/devices/bus/nes_ctrl/hori.cpp b/src/devices/bus/nes_ctrl/hori.cpp
index 1515277abb6..394ebcc9239 100644
--- a/src/devices/bus/nes_ctrl/hori.cpp
+++ b/src/devices/bus/nes_ctrl/hori.cpp
@@ -61,16 +61,22 @@ static void hori_adapter(device_slot_interface &device)
void nes_horitwin_device::device_add_mconfig(machine_config &config)
{
- NES_CONTROL_PORT(config, "port1", hori_adapter, "joypad");
- NES_CONTROL_PORT(config, "port2", hori_adapter, "joypad");
+ NES_CONTROL_PORT(config, m_port1, hori_adapter, "joypad");
+ NES_CONTROL_PORT(config, m_port2, hori_adapter, "joypad");
+ m_port1->set_screen_tag(m_port->m_screen);
+ m_port2->set_screen_tag(m_port->m_screen);
}
void nes_hori4p_device::device_add_mconfig(machine_config &config)
{
- NES_CONTROL_PORT(config, "port1", hori_adapter, "joypad");
- NES_CONTROL_PORT(config, "port2", hori_adapter, "joypad");
- NES_CONTROL_PORT(config, "port3", hori_adapter, "joypad");
- NES_CONTROL_PORT(config, "port4", hori_adapter, "joypad");
+ NES_CONTROL_PORT(config, m_port1, hori_adapter, "joypad");
+ NES_CONTROL_PORT(config, m_port2, hori_adapter, "joypad");
+ NES_CONTROL_PORT(config, m_port3, hori_adapter, "joypad");
+ NES_CONTROL_PORT(config, m_port4, hori_adapter, "joypad");
+ m_port1->set_screen_tag(m_port->m_screen);
+ m_port2->set_screen_tag(m_port->m_screen);
+ m_port3->set_screen_tag(m_port->m_screen);
+ m_port4->set_screen_tag(m_port->m_screen);
}
diff --git a/src/devices/bus/nes_ctrl/hori.h b/src/devices/bus/nes_ctrl/hori.h
index 287384c6ca5..c5ba00ffbeb 100644
--- a/src/devices/bus/nes_ctrl/hori.h
+++ b/src/devices/bus/nes_ctrl/hori.h
@@ -30,7 +30,6 @@ public:
protected:
// device-level overrides
virtual void device_start() override { }
-
virtual void device_add_mconfig(machine_config &config) override;
virtual uint8_t read_exp(offs_t offset) override;
@@ -53,9 +52,8 @@ public:
protected:
// device-level overrides
virtual void device_start() override { }
-
- virtual ioport_constructor device_input_ports() const override;
virtual void device_add_mconfig(machine_config &config) override;
+ virtual ioport_constructor device_input_ports() const override;
virtual uint8_t read_exp(offs_t offset) override;
virtual void write(uint8_t data) override;
diff --git a/src/devices/bus/nes_ctrl/joypad.cpp b/src/devices/bus/nes_ctrl/joypad.cpp
index f8ae2c30e95..0605eea2d9a 100644
--- a/src/devices/bus/nes_ctrl/joypad.cpp
+++ b/src/devices/bus/nes_ctrl/joypad.cpp
@@ -174,7 +174,8 @@ static void arcstick_daisy(device_slot_interface &device)
void nes_arcstick_device::device_add_mconfig(machine_config &config)
{
// expansion port to allow daisy chaining
- NES_CONTROL_PORT(config, "subexp", arcstick_daisy, nullptr);
+ NES_CONTROL_PORT(config, m_daisychain, arcstick_daisy, nullptr);
+ m_daisychain->set_screen_tag(m_port->m_screen);
}
diff --git a/src/devices/bus/nes_ctrl/zapper.cpp b/src/devices/bus/nes_ctrl/zapper.cpp
index 746246a8c76..da3df413a40 100644
--- a/src/devices/bus/nes_ctrl/zapper.cpp
+++ b/src/devices/bus/nes_ctrl/zapper.cpp
@@ -7,8 +7,8 @@
**********************************************************************/
#include "emu.h"
-#include "zapper.h"
#include "screen.h"
+#include "zapper.h"
//**************************************************************************
// DEVICE DEFINITIONS
@@ -48,7 +48,6 @@ ioport_constructor nes_zapper_device::device_input_ports() const
nes_zapper_device::nes_zapper_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NES_ZAPPER, tag, owner, clock),
- device_video_interface(mconfig, *this),
device_nes_control_port_interface(mconfig, *this),
m_lightx(*this, "ZAPPER_X"),
m_lighty(*this, "ZAPPER_Y"),
@@ -86,17 +85,17 @@ uint8_t nes_zapper_device::read_bit34()
int y = m_lighty->read();
// update the screen if necessary
- if (!screen().vblank())
+ if (!m_port->m_screen->vblank())
{
- int vpos = screen().vpos();
- int hpos = screen().hpos();
+ int vpos = m_port->m_screen->vpos();
+ int hpos = m_port->m_screen->hpos();
if (vpos > y || (vpos == y && hpos >= x))
- screen().update_now();
+ m_port->m_screen->update_now();
}
// get the pixel at the gun position
- rgb_t pix = screen().pixel(x, y);
+ rgb_t pix = m_port->m_screen->pixel(x, y);
// check if the cursor is over a bright pixel
// FIXME: still a gross hack
diff --git a/src/devices/bus/nes_ctrl/zapper.h b/src/devices/bus/nes_ctrl/zapper.h
index 5c5c60c9386..5ae68fd0a6e 100644
--- a/src/devices/bus/nes_ctrl/zapper.h
+++ b/src/devices/bus/nes_ctrl/zapper.h
@@ -21,7 +21,6 @@
// ======================> nes_zapper_device
class nes_zapper_device : public device_t,
- public device_video_interface,
public device_nes_control_port_interface
{
public:
diff --git a/src/devices/bus/sms_ctrl/lphaser.cpp b/src/devices/bus/sms_ctrl/lphaser.cpp
index 261f6b13504..72d155c2225 100644
--- a/src/devices/bus/sms_ctrl/lphaser.cpp
+++ b/src/devices/bus/sms_ctrl/lphaser.cpp
@@ -19,9 +19,8 @@ Notes:
**********************************************************************/
#include "emu.h"
-#include "lphaser.h"
-
#include "screen.h"
+#include "lphaser.h"
@@ -85,15 +84,11 @@ ioport_constructor sms_light_phaser_device::device_input_ports() const
sms_light_phaser_device::sms_light_phaser_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SMS_LIGHT_PHASER, tag, owner, clock),
- device_video_interface(mconfig, *this),
device_sms_control_port_interface(mconfig, *this),
m_lphaser_pins(*this, "CTRL_PORT"),
m_lphaser_x(*this, "LPHASER_X"),
m_lphaser_y(*this, "LPHASER_Y"), m_sensor_last_state(0), m_lphaser_timer(nullptr)
{
- // Workaround for failed validation that occurs when running on a driver
- // with Sega Scope emulation, which adds 2 screens (left/right lenses).
- set_screen(*this, ":screen");
}
@@ -150,10 +145,10 @@ uint8_t sms_light_phaser_device::peripheral_r()
int sms_light_phaser_device::bright_aim_area( emu_timer *timer, int lgun_x, int lgun_y )
{
const int r_x_r = LGUN_RADIUS * LGUN_RADIUS;
- const rectangle &visarea = screen().visible_area();
+ const rectangle &visarea = m_port->m_screen->visible_area();
rectangle aim_area;
- int beam_x = screen().hpos();
- int beam_y = screen().vpos();
+ int beam_x = m_port->m_screen->hpos();
+ int beam_y = m_port->m_screen->vpos();
int beam_x_orig = beam_x;
int beam_y_orig = beam_y;
int dy, result = 1;
@@ -231,8 +226,8 @@ int sms_light_phaser_device::bright_aim_area( emu_timer *timer, int lgun_x, int
/* brightness of the lightgray color in the frame drawn by Light Phaser games */
const uint8_t sensor_min_brightness = 0x7f;
- screen().update_now();
- color = screen().pixel(beam_x, beam_y);
+ m_port->m_screen->update_now();
+ color = m_port->m_screen->pixel(beam_x, beam_y);
/* reference: http://www.w3.org/TR/AERT#color-contrast */
brightness = (color.r() * 0.299) + (color.g() * 0.587) + (color.b() * 0.114);
@@ -257,14 +252,14 @@ int sms_light_phaser_device::bright_aim_area( emu_timer *timer, int lgun_x, int
}
}
- timer->adjust(screen().time_until_pos(beam_y, beam_x));
+ timer->adjust(m_port->m_screen->time_until_pos(beam_y, beam_x));
return result;
}
uint16_t sms_light_phaser_device::screen_hpos_nonscaled(int scaled_hpos)
{
- const rectangle &visarea = screen().visible_area();
+ const rectangle &visarea = m_port->m_screen->visible_area();
int offset_x = (scaled_hpos * (visarea.max_x - visarea.min_x)) / 255;
return visarea.min_x + offset_x;
}
@@ -272,7 +267,7 @@ uint16_t sms_light_phaser_device::screen_hpos_nonscaled(int scaled_hpos)
uint16_t sms_light_phaser_device::screen_vpos_nonscaled(int scaled_vpos)
{
- const rectangle &visarea = screen().visible_area();
+ const rectangle &visarea = m_port->m_screen->visible_area();
int offset_y = (scaled_vpos * (visarea.max_y - visarea.min_y)) / 255;
return visarea.min_y + offset_y;
}
diff --git a/src/devices/bus/sms_ctrl/lphaser.h b/src/devices/bus/sms_ctrl/lphaser.h
index c9d145f861b..123241e2663 100644
--- a/src/devices/bus/sms_ctrl/lphaser.h
+++ b/src/devices/bus/sms_ctrl/lphaser.h
@@ -23,7 +23,6 @@
// ======================> sms_light_phaser_device
class sms_light_phaser_device : public device_t,
- public device_video_interface,
public device_sms_control_port_interface
{
public:
diff --git a/src/devices/bus/sms_ctrl/multitap.cpp b/src/devices/bus/sms_ctrl/multitap.cpp
index c892f6022d0..2e5c0e0701a 100644
--- a/src/devices/bus/sms_ctrl/multitap.cpp
+++ b/src/devices/bus/sms_ctrl/multitap.cpp
@@ -131,4 +131,8 @@ void sms_multitap_device::device_add_mconfig(machine_config &config)
SMS_CONTROL_PORT(config, m_subctrl2_port, sms_control_port_devices, "joypad");
SMS_CONTROL_PORT(config, m_subctrl3_port, sms_control_port_devices, "joypad");
SMS_CONTROL_PORT(config, m_subctrl4_port, sms_control_port_devices, "joypad");
+ m_subctrl1_port->set_screen_tag(m_port->m_screen);
+ m_subctrl2_port->set_screen_tag(m_port->m_screen);
+ m_subctrl3_port->set_screen_tag(m_port->m_screen);
+ m_subctrl4_port->set_screen_tag(m_port->m_screen);
}
diff --git a/src/devices/bus/sms_ctrl/rfu.cpp b/src/devices/bus/sms_ctrl/rfu.cpp
index 1b13fc3e921..b8e991e71d3 100644
--- a/src/devices/bus/sms_ctrl/rfu.cpp
+++ b/src/devices/bus/sms_ctrl/rfu.cpp
@@ -135,5 +135,6 @@ WRITE_LINE_MEMBER( sms_rapid_fire_device::th_pin_w )
void sms_rapid_fire_device::device_add_mconfig(machine_config &config)
{
SMS_CONTROL_PORT(config, m_subctrl_port, sms_control_port_devices, "joypad");
+ m_subctrl_port->set_screen_tag(m_port->m_screen);
m_subctrl_port->th_input_handler().set(FUNC(sms_rapid_fire_device::th_pin_w));
}
diff --git a/src/devices/bus/sms_ctrl/smsctrl.cpp b/src/devices/bus/sms_ctrl/smsctrl.cpp
index acb14593b47..a2c117dcb74 100644
--- a/src/devices/bus/sms_ctrl/smsctrl.cpp
+++ b/src/devices/bus/sms_ctrl/smsctrl.cpp
@@ -7,6 +7,7 @@
**********************************************************************/
#include "emu.h"
+#include "screen.h"
#include "smsctrl.h"
// slot devices
@@ -65,6 +66,7 @@ device_sms_control_port_interface::~device_sms_control_port_interface()
sms_control_port_device::sms_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SMS_CONTROL_PORT, tag, owner, clock),
device_slot_interface(mconfig, *this),
+ m_screen(*this, finder_base::DUMMY_TAG),
m_device(nullptr),
m_th_pin_handler(*this)
{
diff --git a/src/devices/bus/sms_ctrl/smsctrl.h b/src/devices/bus/sms_ctrl/smsctrl.h
index af475a68a66..ced9176efb0 100644
--- a/src/devices/bus/sms_ctrl/smsctrl.h
+++ b/src/devices/bus/sms_ctrl/smsctrl.h
@@ -62,6 +62,11 @@ public:
void th_pin_w(int state);
+ template <typename T> void set_screen_tag(T &&tag) { m_screen.set_tag(std::forward<T>(tag)); }
+
+ // for peripherals that interact with the machine's screen
+ required_device<screen_device> m_screen;
+
protected:
// device-level overrides
virtual void device_start() override;
diff --git a/src/mame/drivers/nes.cpp b/src/mame/drivers/nes.cpp
index 5631a9a21fc..b2aacb90e2a 100644
--- a/src/mame/drivers/nes.cpp
+++ b/src/mame/drivers/nes.cpp
@@ -77,6 +77,8 @@ void nes_state::nes(machine_config &config)
NES_CONTROL_PORT(config, m_ctrl1, nes_control_port1_devices, "joypad");
NES_CONTROL_PORT(config, m_ctrl2, nes_control_port2_devices, "joypad");
+ m_ctrl1->set_screen_tag(m_screen);
+ m_ctrl2->set_screen_tag(m_screen);
NES_CART_SLOT(config, m_cartslot, NTSC_APU_CLOCK, nes_cart, nullptr);
SOFTWARE_LIST(config, "cart_list").set_original("nes");
@@ -112,6 +114,9 @@ void nes_state::famicom(machine_config &config)
NES_CONTROL_PORT(config.replace(), m_ctrl1, fc_control_port1_devices, "joypad");
NES_CONTROL_PORT(config.replace(), m_ctrl2, fc_control_port2_devices, "joypad");
NES_CONTROL_PORT(config, m_exp, fc_expansion_devices, nullptr);
+ m_ctrl1->set_screen_tag(m_screen);
+ m_ctrl2->set_screen_tag(m_screen);
+ m_exp->set_screen_tag(m_screen);
SOFTWARE_LIST(config, "flop_list").set_original("famicom_flop");
SOFTWARE_LIST(config, "cass_list").set_original("famicom_cass");
@@ -142,6 +147,9 @@ void nes_state::famipalc(machine_config &config)
NES_CONTROL_PORT(config.replace(), m_ctrl1, fc_control_port1_devices, "joypad");
NES_CONTROL_PORT(config.replace(), m_ctrl2, fc_control_port2_devices, "joypad");
NES_CONTROL_PORT(config, m_exp, fc_expansion_devices, nullptr);
+ m_ctrl1->set_screen_tag(m_screen);
+ m_ctrl2->set_screen_tag(m_screen);
+ m_exp->set_screen_tag(m_screen);
SOFTWARE_LIST(config, "cass_list").set_original("famicom_cass");
}
diff --git a/src/mame/drivers/nes_vt.cpp b/src/mame/drivers/nes_vt.cpp
index 8c9e241d5e3..7f18938c98e 100644
--- a/src/mame/drivers/nes_vt.cpp
+++ b/src/mame/drivers/nes_vt.cpp
@@ -1395,6 +1395,8 @@ void nes_vt_state::nes_vt(machine_config &config)
NES_CONTROL_PORT(config, m_ctrl1, nes_control_port1_devices, "joypad");
NES_CONTROL_PORT(config, m_ctrl2, nes_control_port2_devices, "joypad");
+ m_ctrl1->set_screen_tag(m_screen);
+ m_ctrl2->set_screen_tag(m_screen);
}
void nes_vt_state::nes_vt_ddr(machine_config &config)
@@ -1403,6 +1405,8 @@ void nes_vt_state::nes_vt_ddr(machine_config &config)
NES_CONTROL_PORT(config, m_ctrl1, majesco_control_port1_devices, "ddr");
NES_CONTROL_PORT(config, m_ctrl2, majesco_control_port2_devices, nullptr);
+ m_ctrl1->set_screen_tag(m_screen);
+ m_ctrl2->set_screen_tag(m_screen);
}
void nes_vt_state::nes_vt_hum(machine_config &config)
diff --git a/src/mame/drivers/playch10.cpp b/src/mame/drivers/playch10.cpp
index 51786fb2abc..f0d17da7fda 100644
--- a/src/mame/drivers/playch10.cpp
+++ b/src/mame/drivers/playch10.cpp
@@ -673,6 +673,12 @@ void playch10_state::playch10(machine_config &config)
PALETTE(config, "palette", FUNC(playch10_state::playch10_palette), 256);
config.set_default_layout(layout_playch10);
+ screen_device &bottom(SCREEN(config, "bottom", SCREEN_TYPE_RASTER));
+ bottom.set_refresh_hz(60);
+ bottom.set_size(32*8, 262);
+ bottom.set_visarea(0*8, 32*8-1, 0*8, 30*8-1);
+ bottom.set_screen_update(FUNC(playch10_state::screen_update_playch10_bottom));
+
screen_device &top(SCREEN(config, "top", SCREEN_TYPE_RASTER));
top.set_refresh_hz(60);
top.set_size(32*8, 262);
@@ -680,12 +686,6 @@ void playch10_state::playch10(machine_config &config)
top.set_screen_update(FUNC(playch10_state::screen_update_playch10_top));
top.screen_vblank().set(FUNC(playch10_state::vblank_irq));
- screen_device &bottom(SCREEN(config, "bottom", SCREEN_TYPE_RASTER));
- bottom.set_refresh_hz(60);
- bottom.set_size(32*8, 262);
- bottom.set_visarea(0*8, 32*8-1, 0*8, 30*8-1);
- bottom.set_screen_update(FUNC(playch10_state::screen_update_playch10_bottom));
-
PPU_2C03B(config, m_ppu, 0);
m_ppu->set_screen("bottom");
m_ppu->set_cpu_tag("cart");
diff --git a/src/mame/drivers/sms.cpp b/src/mame/drivers/sms.cpp
index 849fb122164..9bee323b0ab 100644
--- a/src/mame/drivers/sms.cpp
+++ b/src/mame/drivers/sms.cpp
@@ -502,9 +502,11 @@ void sms_state::sms_base(machine_config &config)
SOFTWARE_LIST(config, "cart_list").set_original("sms");
SMS_CONTROL_PORT(config, m_port_ctrl1, sms_control_port_devices, "joypad");
+ m_port_ctrl1->set_screen_tag(m_main_scr);
m_port_ctrl1->th_input_handler().set(FUNC(sms_state::sms_ctrl1_th_input));
SMS_CONTROL_PORT(config, m_port_ctrl2, sms_control_port_devices, "joypad");
+ m_port_ctrl2->set_screen_tag(m_main_scr);
m_port_ctrl2->th_input_handler().set(FUNC(sms_state::sms_ctrl2_th_input));
}
@@ -991,6 +993,7 @@ void sms_state::gamegear(machine_config &config)
SOFTWARE_LIST(config, "cart_list").set_original("gamegear");
GG_EXT_PORT(config, m_port_gg_ext, gg_ext_port_devices, nullptr);
+ m_port_gg_ext->set_screen_tag(m_main_scr);
m_port_gg_ext->th_input_handler().set(FUNC(sms_state::gg_ext_th_input));
m_is_gamegear = true;
diff --git a/src/mame/video/playch10.cpp b/src/mame/video/playch10.cpp
index c2e212b45a1..935af106c14 100644
--- a/src/mame/video/playch10.cpp
+++ b/src/mame/video/playch10.cpp
@@ -127,9 +127,9 @@ uint32_t playch10_state::screen_update_playch10_top(screen_device &screen, bitma
if (m_pc10_bios != 1)
return screen_update_playch10_single(screen, bitmap, cliprect);
- if (!m_pc10_dispmask)
- /* render the ppu */
- m_ppu->render(bitmap, 0, 0, 0, 0, cliprect);
+ /* When the bios is accessing vram, the video circuitry can't access it */
+ if (!m_pc10_sdcs)
+ m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0);
else
bitmap.fill(0, cliprect);
@@ -142,9 +142,9 @@ uint32_t playch10_state::screen_update_playch10_bottom(screen_device &screen, bi
if (m_pc10_bios != 1)
return screen_update_playch10_single(screen, bitmap, cliprect);
- /* When the bios is accessing vram, the video circuitry can't access it */
- if (!m_pc10_sdcs)
- m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0);
+ if (!m_pc10_dispmask)
+ /* render the ppu */
+ m_ppu->render(bitmap, 0, 0, 0, 0, cliprect);
else
bitmap.fill(0, cliprect);