From c7a2cda2e13ef6d518807140428ad27a7d22d37a Mon Sep 17 00:00:00 2001 From: mamehaze Date: Fri, 21 Nov 2014 16:27:57 +0000 Subject: remove leftover test code that was accidentally committed (nw) --- src/emu/video/315_5124.c | 4 +--- src/emu/video/315_5124.h | 12 +----------- src/mame/drivers/megaplay.c | 4 +--- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/emu/video/315_5124.c b/src/emu/video/315_5124.c index 32294e53c8f..48aa0b670b9 100644 --- a/src/emu/video/315_5124.c +++ b/src/emu/video/315_5124.c @@ -160,7 +160,6 @@ sega315_5124_device::sega315_5124_device(const machine_config &mconfig, const ch , m_int_cb(*this) , m_pause_cb(*this) , m_space_config("videoram", ENDIANNESS_LITTLE, 8, 14, 0, NULL, *ADDRESS_MAP_NAME(sega315_5124)) - , m_draws_bitmap(1) , m_palette(*this, "palette") , m_xscroll_hpos(X_SCROLL_HPOS_5124) { @@ -178,7 +177,6 @@ sega315_5124_device::sega315_5124_device(const machine_config &mconfig, device_t , m_int_cb(*this) , m_pause_cb(*this) , m_space_config("videoram", ENDIANNESS_LITTLE, 8, 14, 0, NULL, *ADDRESS_MAP_NAME(sega315_5124)) - , m_draws_bitmap(1) , m_palette(*this, "palette") , m_xscroll_hpos(xscroll_hpos) { @@ -1755,7 +1753,7 @@ void sega315_5378_device::cram_write(UINT8 data) UINT32 sega315_5124_device::screen_update( screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect ) { - if (m_draws_bitmap) copybitmap(bitmap, m_tmpbitmap, 0, 0, 0, 0, cliprect); + copybitmap(bitmap, m_tmpbitmap, 0, 0, 0, 0, cliprect); return 0; } diff --git a/src/emu/video/315_5124.h b/src/emu/video/315_5124.h index 08d47ece4ed..8c852db7b9f 100644 --- a/src/emu/video/315_5124.h +++ b/src/emu/video/315_5124.h @@ -42,9 +42,6 @@ #define VRAM_SIZE 0x4000 -#define MCFG_SEGA315_5124_SET_MANUAL_MIX \ - sega315_5124_device::set_draws_bitmap(*device, 0); - /*************************************************************************** TYPE DEFINITIONS @@ -66,12 +63,7 @@ public: static void set_signal_type(device_t &device, bool is_pal) { downcast(device).m_is_pal = is_pal; } - // allow manual mixing - static void set_draws_bitmap(device_t &device, int draws_bitmap) - { - sega315_5124_device &dev = downcast(device); - dev.m_draws_bitmap = draws_bitmap; - } + template static devcb_base &set_int_callback(device_t &device, _Object object) { return downcast(device).m_int_cb.set_callback(object); } template static devcb_base &set_pause_callback(device_t &device, _Object object) { return downcast(device).m_pause_cb.set_callback(object); } @@ -190,8 +182,6 @@ protected: static const device_timer_id TIMER_NMI = 6; static const device_timer_id TIMER_FLAGS = 7; - int m_draws_bitmap; - required_device m_palette; const int m_xscroll_hpos; }; diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c index d9127cc6b31..86dae7f694d 100644 --- a/src/mame/drivers/megaplay.c +++ b/src/mame/drivers/megaplay.c @@ -617,7 +617,7 @@ UINT32 mplay_state::screen_update_megplay(screen_device &screen, bitmap_rgb32 &b { //printf("megplay vu\n"); screen_update_megadriv(screen, bitmap, cliprect); - m_vdp1->screen_update(screen, bitmap, cliprect); + //m_vdp1->screen_update(screen, bitmap, cliprect); // i'm not sure if the overlay (256 pixels wide) is meant to be stretched over the 320 resolution genesis output, or centered. // if it's meant to be stretched we'll have to multiply the entire outut x4 for the Genesis VDP and x5 for the SMS VDP to get a common 1280 pixel wide image @@ -685,8 +685,6 @@ static MACHINE_CONFIG_START( megaplay, mplay_state ) MCFG_SEGA315_5246_SET_SCREEN("megadriv") MCFG_SEGA315_5246_IS_PAL(false) MCFG_SEGA315_5246_INT_CB(WRITELINE(mplay_state, bios_int_callback)) - MCFG_SEGA315_5124_SET_MANUAL_MIX - MACHINE_CONFIG_END -- cgit v1.2.3