dataeast/bwing.cpp: moved from bankdev to view, consolidated driver in single file

3 files changed, 393 insertions, 421 deletions

diff --git a/src/mame/dataeast/bwing.cpp b/src/mame/dataeast/bwing.cpp
index eb70b5b0247..f6f5d617a55 100644
--- a/src/mame/dataeast/bwing.cpp
+++ b/src/mame/dataeast/bwing.cpp
@@ -1,5 +1,6 @@
 // license:BSD-3-Clause
-// copyright-holders:Acho A. Tang, Alex W. Jackson
+// copyright-holders: Acho A. Tang, Alex W. Jackson
+
 /*****************************************************************************
 
 B-Wings  (c) 1984 Data East Corporation
@@ -22,48 +23,360 @@ Known issues:
 - "RGB dip-switch" looks kludgy at best;
 
 *****************************************************************************/
-// Directives
+
 
 #include "emu.h"
-#include "bwing.h"
 
 #include "cpu/m6502/deco16.h"
 #include "cpu/m6809/m6809.h"
+#include "machine/gen_latch.h"
 #include "sound/ay8910.h"
 #include "sound/dac.h"
+
+#include "emupal.h"
 #include "screen.h"
 #include "speaker.h"
+#include "tilemap.h"
+
+
+namespace {
+
+class bwing_state : public driver_device
+{
+public:
+	bwing_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag),
+		m_maincpu(*this, "maincpu"),
+		m_subcpu(*this, "subcpu"),
+		m_audiocpu(*this, "audiocpu"),
+		m_gfxdecode(*this, "gfxdecode"),
+		m_palette(*this, "palette"),
+		m_soundlatch(*this, "soundlatch"),
+		m_videoram(*this, "videoram"),
+		m_spriteram(*this, "spriteram"),
+		m_paletteram(*this, "paletteram"),
+		m_fgscrollram(*this, "fgscrollram"),
+		m_bgscrollram(*this, "bgscrollram"),
+		m_gfxram(*this, "gfxram", 0x6000, ENDIANNESS_BIG),
+		m_vramview(*this, "vramview") { }
+
+	void init_bwing();
+	void bwing(machine_config &config);
+	DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
+	DECLARE_INPUT_CHANGED_MEMBER(tilt_pressed);
+
+protected:
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
+	virtual void video_start() override;
+	virtual void device_post_load() override;
+
+private:
+	required_device<cpu_device> m_maincpu;
+	required_device<cpu_device> m_subcpu;
+	required_device<cpu_device> m_audiocpu;
+	required_device<gfxdecode_device> m_gfxdecode;
+	required_device<palette_device> m_palette;
+	required_device<generic_latch_8_device> m_soundlatch;
+
+	required_shared_ptr<uint8_t> m_videoram;
+	required_shared_ptr<uint8_t> m_spriteram;
+	required_shared_ptr<uint8_t> m_paletteram;
+	required_shared_ptr<uint8_t> m_fgscrollram;
+	required_shared_ptr<uint8_t> m_bgscrollram;
+	memory_share_creator<uint8_t> m_gfxram;
+	memory_view m_vramview;
+
+	// video-related
+	tilemap_t *m_charmap = nullptr;
+	tilemap_t *m_fgmap = nullptr;
+	tilemap_t *m_bgmap = nullptr;
+	uint8_t m_sreg[8]{};
+	uint8_t m_palatch = 0U;
+	uint8_t m_mapmask = 0U;
+
+	// sound-related
+	uint8_t m_p3_nmimask = 0U;
+	uint8_t m_p3_u8f_d = 0;
+
+	void p3_u8f_w(uint8_t data);
+	void p3_nmimask_w(uint8_t data);
+	void p3_nmiack_w(uint8_t data);
+	void p1_ctrl_w(offs_t offset, uint8_t data);
+	void p2_ctrl_w(offs_t offset, uint8_t data);
+	void videoram_w(offs_t offset, uint8_t data);
+	void fgscrollram_w(offs_t offset, uint8_t data);
+	void bgscrollram_w(offs_t offset, uint8_t data);
+	template <uint8_t Which> void gfxram_w(offs_t offset, uint8_t data);
+	void scrollreg_w(offs_t offset, uint8_t data);
+	void paletteram_w(offs_t offset, uint8_t data);
+
+	TILE_GET_INFO_MEMBER(get_fgtileinfo);
+	TILE_GET_INFO_MEMBER(get_bgtileinfo);
+	TILE_GET_INFO_MEMBER(get_charinfo);
+	TILEMAP_MAPPER_MEMBER(scan_cols);
+
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	void draw_sprites(bitmap_ind16 &bmp, const rectangle &clip, uint8_t *ram, int pri);
+
+	INTERRUPT_GEN_MEMBER(p3_interrupt);
+	void bank_map(address_map &map);
+	void p1_map(address_map &map);
+	void p2_map(address_map &map);
+	void p3_io_map(address_map &map);
+	void p3_map(address_map &map);
+};
+
+
+// video
+
+void bwing_state::videoram_w(offs_t offset, uint8_t data)
+{
+	m_videoram[offset] = data;
+	m_charmap->mark_tile_dirty(offset);
+}
+
+
+void bwing_state::fgscrollram_w(offs_t offset, uint8_t data)
+{
+	m_fgscrollram[offset] = data;
+	m_fgmap->mark_tile_dirty(offset);
+}
+
+
+void bwing_state::bgscrollram_w(offs_t offset, uint8_t data)
+{
+	m_bgscrollram[offset] = data;
+	m_bgmap->mark_tile_dirty(offset);
+}
+
+
+template <uint8_t Which>
+void bwing_state::gfxram_w(offs_t offset, uint8_t data)
+{
+	offset += (Which * 0x2000);
+	m_gfxram[offset] = data;
+	int whichgfx = (offset & 0x1000) ? 3 : 2;
+	m_gfxdecode->gfx(whichgfx)->mark_dirty((offset & 0xfff) / 32);
+}
+
 
+void bwing_state::scrollreg_w(offs_t offset, uint8_t data)
+{
+	m_sreg[offset] = data;
+
+	switch (offset)
+	{
+		case 6: m_palatch = data; break; // one of the palette components is latched through I/O(yike)
+
+		case 7:
+			m_mapmask = data;
+			m_vramview.select(data >> 6);
+		break;
+	}
+}
+
+
+void bwing_state::paletteram_w(offs_t offset, uint8_t data)
+{
+	static const float rgb[4][3] = {
+		{0.85f, 0.95f, 1.00f},
+		{0.90f, 1.00f, 1.00f},
+		{0.80f, 1.00f, 1.00f},
+		{0.75f, 0.90f, 1.10f}
+	};
+
+	m_paletteram[offset] = data;
+
+	int r = ~data & 7;
+	int g = ~(data >> 4) & 7;
+	int b = ~m_palatch & 7;
+
+	r = ((r << 5) + (r << 2) + (r >> 1));
+	g = ((g << 5) + (g << 2) + (g >> 1));
+	b = ((b << 5) + (b << 2) + (b >> 1));
+
+	int i;
+
+	if ((i = ioport("EXTRA")->read()) < 4)
+	{
+		r = (float)r * rgb[i][0];
+		g = (float)g * rgb[i][1];
+		b = (float)b * rgb[i][2];
+		if (r > 0xff) r = 0xff;
+		if (g > 0xff) g = 0xff;
+		if (b > 0xff) b = 0xff;
+	}
+
+	m_palette->set_pen_color(offset, rgb_t(r, g, b));
+}
+
+//****************************************************************************
+// Initializations
+
+TILE_GET_INFO_MEMBER(bwing_state::get_fgtileinfo)
+{
+	tileinfo.set(2, m_fgscrollram[tile_index] & 0x7f, m_fgscrollram[tile_index] >> 7, 0);
+}
+
+TILE_GET_INFO_MEMBER(bwing_state::get_bgtileinfo)
+{
+	tileinfo.set(3, m_bgscrollram[tile_index] & 0x7f, m_bgscrollram[tile_index] >> 7, 0);
+}
+
+TILE_GET_INFO_MEMBER(bwing_state::get_charinfo)
+{
+	tileinfo.set(0, m_videoram[tile_index], 0, 0);
+}
+
+TILEMAP_MAPPER_MEMBER(bwing_state::scan_cols)
+{
+	return (row & 0xf) | ((col & 0xf) << 4) | ((row & 0x30) << 4) | ((col & 0x30) << 6);
+}
+
+
+void bwing_state::video_start()
+{
+	m_charmap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(bwing_state::get_charinfo)), TILEMAP_SCAN_COLS, 8, 8, 32, 32);
+	m_fgmap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(bwing_state::get_fgtileinfo)), tilemap_mapper_delegate(*this, FUNC(bwing_state::scan_cols)), 16, 16, 64, 64);
+	m_bgmap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(bwing_state::get_bgtileinfo)), tilemap_mapper_delegate(*this, FUNC(bwing_state::scan_cols)), 16, 16, 64, 64);
+
+	m_charmap->set_transparent_pen(0);
+	m_fgmap->set_transparent_pen(0);
+
+	for (int i = 0; i < 8; i++)
+		m_sreg[i] = 0;
+}
+
+//****************************************************************************
+// Realtime
+
+void bwing_state::draw_sprites(bitmap_ind16 &bmp, const rectangle &clip, uint8_t *ram, int pri)
+{
+	gfx_element *gfx = m_gfxdecode->gfx(1);
+
+	for (int i = 0; i < 0x200; i += 4)
+	{
+		int const attrib = ram[i];
+		int code = ram[i + 1];
+		int y = ram[i + 2];
+		int x = ram[i + 3];
+		int const color  = (attrib >> 3) & 1;
+
+		if (!(attrib & 1) || color != pri)
+			continue;
+
+		code += (attrib << 3) & 0x100;
+		y -= (attrib << 1) & 0x100;
+		x -= (attrib << 2) & 0x100;
+
+		int fx = attrib & 0x04;
+		int fy = ~attrib & 0x02;
+
+		// normal/cocktail
+		if (m_mapmask & 0x20)
+		{
+			fx = !fx;
+			fy = !fy;
+			x = 240 - x;
+			y = 240 - y;
+		}
+
+		// single/double
+		if (!(attrib & 0x10))
+				gfx->transpen(bmp, clip, code, color, fx, fy, x, y, 0);
+		else
+				gfx->zoom_transpen(bmp, clip, code, color, fx, fy, x, y, 1 << 16, 2 << 16, 0);
+	}
+}
+
+
+uint32_t bwing_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+	unsigned flip, x, y, shiftx;
+
+	if (m_mapmask & 0x20)
+	{
+		flip = TILEMAP_FLIPX;
+		shiftx = -8;
+	}
+	else
+	{
+		flip = TILEMAP_FLIPY;
+		shiftx = 8;
+	}
+
+	// draw background
+	if (!(m_mapmask & 1))
+	{
+		m_bgmap->set_flip(flip);
+		x = ((m_sreg[1] << 2 & 0x300) + m_sreg[2] + shiftx) & 0x3ff;
+		m_bgmap->set_scrollx(0, x);
+		y = (m_sreg[1] << 4 & 0x300) + m_sreg[3];
+		m_bgmap->set_scrolly(0, y);
+		m_bgmap->draw(screen, bitmap, cliprect, 0, 0);
+	}
+	else
+		bitmap.fill(m_palette->black_pen(), cliprect);
+
+	// draw low priority sprites
+	draw_sprites(bitmap, cliprect, m_spriteram, 0);
+
+	// draw foreground
+	if (!(m_mapmask & 2))
+	{
+		m_fgmap->set_flip(flip);
+		x = ((m_sreg[1] << 6 & 0x300) + m_sreg[4] + shiftx) & 0x3ff;
+		m_fgmap->set_scrollx(0, x);
+		y = (m_sreg[1] << 8 & 0x300) + m_sreg[5];
+		m_fgmap->set_scrolly(0, y);
+		m_fgmap->draw(screen, bitmap, cliprect, 0, 0);
+	}
+
+	// draw high priority sprites
+	draw_sprites(bitmap, cliprect, m_spriteram, 1);
+
+	// draw text layer
+//  if (m_mapmask & 4)
+	{
+		m_charmap->set_flip(flip);
+		m_charmap->draw(screen, bitmap, cliprect, 0, 0);
+	}
+	return 0;
+}
+
+
+// machine
 
 //****************************************************************************
 // Interrupt Handlers
 
-INTERRUPT_GEN_MEMBER(bwing_state::bwp3_interrupt)
+INTERRUPT_GEN_MEMBER(bwing_state::p3_interrupt)
 {
-	if (!m_bwp3_nmimask)
+	if (!m_p3_nmimask)
 		device.execute().set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
 }
 
 //****************************************************************************
 // Memory and I/O Handlers
 
-void bwing_state::bwp3_u8F_w(uint8_t data)
+void bwing_state::p3_u8f_w(uint8_t data)
 {
-	m_bwp3_u8F_d = data;  // prepares custom chip for various operations
+	m_p3_u8f_d = data;  // prepares custom chip for various operations
 }
 
-void bwing_state::bwp3_nmimask_w(uint8_t data)
+void bwing_state::p3_nmimask_w(uint8_t data)
 {
-	m_bwp3_nmimask = data & 0x80;
+	m_p3_nmimask = data & 0x80;
 }
 
-void bwing_state::bwp3_nmiack_w(uint8_t data)
+void bwing_state::p3_nmiack_w(uint8_t data)
 {
 	m_audiocpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE);
 }
 
 
-void bwing_state::bwp1_ctrl_w(offs_t offset, uint8_t data)
+void bwing_state::p1_ctrl_w(offs_t offset, uint8_t data)
 {
 	switch (offset)
 	{
@@ -102,7 +415,7 @@ void bwing_state::bwp1_ctrl_w(offs_t offset, uint8_t data)
 }
 
 
-void bwing_state::bwp2_ctrl_w(offs_t offset, uint8_t data)
+void bwing_state::p2_ctrl_w(offs_t offset, uint8_t data)
 {
 	switch (offset)
 	{
@@ -120,13 +433,13 @@ void bwing_state::bwp2_ctrl_w(offs_t offset, uint8_t data)
 // CPU Memory Maps
 
 // Main CPU
-void bwing_state::bwp1_map(address_map &map)
+void bwing_state::p1_map(address_map &map)
 {
 	map(0x0000, 0x07ff).ram().share("sharedram");
 	map(0x0800, 0x0fff).ram();
-	map(0x1000, 0x13ff).ram().w(FUNC(bwing_state::videoram_w)).share("videoram");
+	map(0x1000, 0x13ff).ram().w(FUNC(bwing_state::videoram_w)).share(m_videoram);
 	map(0x1400, 0x17ff).ram();
-	map(0x1800, 0x19ff).ram().share("spriteram");
+	map(0x1800, 0x19ff).ram().share(m_spriteram);
 	map(0x1a00, 0x1aff).ram().w(FUNC(bwing_state::paletteram_w)).share("paletteram");
 	map(0x1b00, 0x1b00).portr("DSW0");
 	map(0x1b01, 0x1b01).portr("DSW1");
@@ -134,48 +447,45 @@ void bwing_state::bwp1_map(address_map &map)
 	map(0x1b03, 0x1b03).portr("IN1");
 	map(0x1b04, 0x1b04).portr("IN2");
 	map(0x1b00, 0x1b07).w(FUNC(bwing_state::scrollreg_w));
-	map(0x1c00, 0x1c07).ram().w(FUNC(bwing_state::bwp1_ctrl_w));
-	map(0x2000, 0x3fff).m(m_vrambank, FUNC(address_map_bank_device::amap8));
+	map(0x1c00, 0x1c07).ram().w(FUNC(bwing_state::p1_ctrl_w));
+	map(0x2000, 0x3fff).view(m_vramview);
+	m_vramview[0](0x2000, 0x2fff).ram().w(FUNC(bwing_state::fgscrollram_w)).share(m_fgscrollram);
+	m_vramview[0](0x3000, 0x3fff).ram().w(FUNC(bwing_state::bgscrollram_w)).share(m_bgscrollram);
+	m_vramview[1](0x2000, 0x3fff).ram().w(FUNC(bwing_state::gfxram_w<0>));
+	m_vramview[2](0x2000, 0x3fff).ram().w(FUNC(bwing_state::gfxram_w<1>));
+	m_vramview[3](0x2000, 0x3fff).ram().w(FUNC(bwing_state::gfxram_w<2>));
 	map(0x4000, 0xffff).rom(); // "B-Wings US" writes to 9631-9632(debug?)
 }
 
-// Banked video RAM
-void bwing_state::bank_map(address_map &map)
-{
-	map(0x0000, 0x0fff).ram().w(FUNC(bwing_state::fgscrollram_w)).share("fgscrollram");
-	map(0x1000, 0x1fff).ram().w(FUNC(bwing_state::bgscrollram_w)).share("bgscrollram");
-	map(0x2000, 0x7fff).ram().w(FUNC(bwing_state::gfxram_w)).share("gfxram");
-}
-
 // Sub CPU
-void bwing_state::bwp2_map(address_map &map)
+void bwing_state::p2_map(address_map &map)
 {
 	map(0x0000, 0x07ff).ram().share("sharedram");
 	map(0x0800, 0x0fff).ram();
-	map(0x1800, 0x1803).w(FUNC(bwing_state::bwp2_ctrl_w));
+	map(0x1800, 0x1803).w(FUNC(bwing_state::p2_ctrl_w));
 	map(0xa000, 0xffff).rom();
 }
 
 
 // Sound CPU
-void bwing_state::bwp3_map(address_map &map)
+void bwing_state::p3_map(address_map &map)
 {
 	map(0x0000, 0x01ff).ram();
 	map(0x0200, 0x0200).w("dac", FUNC(dac_byte_interface::data_w));
-	map(0x1000, 0x1000).w(FUNC(bwing_state::bwp3_nmiack_w));
+	map(0x1000, 0x1000).w(FUNC(bwing_state::p3_nmiack_w));
 	map(0x2000, 0x2000).w("ay1", FUNC(ay8912_device::data_w));
 	map(0x4000, 0x4000).w("ay1", FUNC(ay8912_device::address_w));
 	map(0x6000, 0x6000).w("ay2", FUNC(ay8912_device::data_w));
 	map(0x8000, 0x8000).w("ay2", FUNC(ay8912_device::address_w));
 	map(0xa000, 0xa000).r(m_soundlatch, FUNC(generic_latch_8_device::read));
-	map(0xd000, 0xd000).w(FUNC(bwing_state::bwp3_nmimask_w));
+	map(0xd000, 0xd000).w(FUNC(bwing_state::p3_nmimask_w));
 	map(0xe000, 0xffff).rom().region("audiocpu", 0);
 }
 
 
-void bwing_state::bwp3_io_map(address_map &map)
+void bwing_state::p3_io_map(address_map &map)
 {
-	map(0x00, 0x00).portr("VBLANK").w(FUNC(bwing_state::bwp3_u8F_w));
+	map(0x00, 0x00).portr("VBLANK").w(FUNC(bwing_state::p3_u8f_w));
 }
 
 //****************************************************************************
@@ -220,7 +530,7 @@ static INPUT_PORTS_START( bwing )
 	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )        PORT_DIPLOCATION("SW2:1")
 	PORT_DIPSETTING(    0x00, "5" )
 	PORT_DIPSETTING(    0x01, "3" )
-	PORT_DIPNAME( 0x06, 0x06, DEF_STR( Bonus_Life ) )   PORT_DIPLOCATION("SW2:2,3") /* Listed as "Not Used" in the manual */
+	PORT_DIPNAME( 0x06, 0x06, DEF_STR( Bonus_Life ) )   PORT_DIPLOCATION("SW2:2,3") // Listed as "Not Used" in the manual
 	PORT_DIPSETTING(    0x00, "40000" )
 	PORT_DIPSETTING(    0x02, "20000 80000" )
 	PORT_DIPSETTING(    0x04, "20000 60000" )
@@ -231,13 +541,13 @@ static INPUT_PORTS_START( bwing )
 	PORT_DIPNAME( 0x10, 0x10, "Enemy Missiles" )        PORT_DIPLOCATION("SW2:5")
 	PORT_DIPSETTING(    0x00, DEF_STR( Hard ) )
 	PORT_DIPSETTING(    0x10, DEF_STR( Normal ) )
-	PORT_DIPNAME( 0x20, 0x20, "Freeze" )            PORT_DIPLOCATION("SW2:6") /* Listed as "Not Used" in the manual */
+	PORT_DIPNAME( 0x20, 0x20, "Freeze" )            PORT_DIPLOCATION("SW2:6") // Listed as "Not Used" in the manual
 	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x40, 0x00, "Country" )           PORT_DIPLOCATION("SW2:7") /* Listed as "Not Used" in the manual */
+	PORT_DIPNAME( 0x40, 0x00, "Country" )           PORT_DIPLOCATION("SW2:7") // Listed as "Not Used" in the manual
 	PORT_DIPSETTING(    0x00, "Japan/US" )
 	PORT_DIPSETTING(    0x40, "Japan Only" )
-	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )      PORT_DIPLOCATION("SW2:8") /* Listed as "Not Used" in the manual */
+	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )      PORT_DIPLOCATION("SW2:8") // Listed as "Not Used" in the manual
 	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 
@@ -325,8 +635,8 @@ static const gfx_layout ram_tilelayout =
 };
 
 static GFXDECODE_START( gfx_bwing )
-	GFXDECODE_ENTRY( "gfx1",      0, charlayout,     0x00, 1 ) // chars
-	GFXDECODE_ENTRY( "gfx2",      0, spritelayout,   0x20, 2 ) // sprites
+	GFXDECODE_ENTRY( "chars",     0, charlayout,     0x00, 1 )
+	GFXDECODE_ENTRY( "sprites",   0, spritelayout,   0x20, 2 )
 	GFXDECODE_RAM( "gfxram",      0, ram_tilelayout, 0x10, 2 ) // foreground tiles
 	GFXDECODE_RAM( "gfxram", 0x1000, ram_tilelayout, 0x30, 2 ) // background tiles
 GFXDECODE_END
@@ -338,12 +648,10 @@ void bwing_state::machine_start()
 {
 	save_item(NAME(m_palatch));
 	save_item(NAME(m_mapmask));
-	save_item(NAME(m_bwp3_nmimask));
-	save_item(NAME(m_bwp3_u8F_d));
+	save_item(NAME(m_p3_nmimask));
+	save_item(NAME(m_p3_u8f_d));
 
 	save_item(NAME(m_sreg));
-
-	machine().save().register_postload(save_prepost_delegate(FUNC(bwing_state::bwing_postload), this));
 }
 
 void bwing_state::machine_reset()
@@ -351,11 +659,11 @@ void bwing_state::machine_reset()
 	m_palatch = 0;
 	m_mapmask = 0;
 
-	m_bwp3_nmimask = 0;
-	m_bwp3_u8F_d = 0;
+	m_p3_nmimask = 0;
+	m_p3_u8f_d = 0;
 }
 
-void bwing_state::bwing_postload()
+void bwing_state::device_post_load()
 {
 	m_gfxdecode->gfx(2)->mark_all_dirty();
 	m_gfxdecode->gfx(3)->mark_all_dirty();
@@ -365,20 +673,18 @@ void bwing_state::bwing_postload()
 void bwing_state::bwing(machine_config &config)
 {
 	// basic machine hardware
-	MC6809E(config, m_maincpu, 2000000);
-	m_maincpu->set_addrmap(AS_PROGRAM, &bwing_state::bwp1_map);
-
-	MC6809E(config, m_subcpu, 2000000);
-	m_subcpu->set_addrmap(AS_PROGRAM, &bwing_state::bwp2_map);
+	MC6809E(config, m_maincpu, 2'000'000);
+	m_maincpu->set_addrmap(AS_PROGRAM, &bwing_state::p1_map);
 
-	DECO16(config, m_audiocpu, 2000000);
-	m_audiocpu->set_addrmap(AS_PROGRAM, &bwing_state::bwp3_map);
-	m_audiocpu->set_addrmap(AS_IO, &bwing_state::bwp3_io_map);
-	m_audiocpu->set_periodic_int(FUNC(bwing_state::bwp3_interrupt), attotime::from_hz(1000));
+	MC6809E(config, m_subcpu, 2'000'000);
+	m_subcpu->set_addrmap(AS_PROGRAM, &bwing_state::p2_map);
 
-	config.set_maximum_quantum(attotime::from_hz(18000));     // high enough?
+	DECO16(config, m_audiocpu, 2'000'000);
+	m_audiocpu->set_addrmap(AS_PROGRAM, &bwing_state::p3_map);
+	m_audiocpu->set_addrmap(AS_IO, &bwing_state::p3_io_map);
+	m_audiocpu->set_periodic_int(FUNC(bwing_state::p3_interrupt), attotime::from_hz(1'000));
 
-	ADDRESS_MAP_BANK(config, "vrambank").set_map(&bwing_state::bank_map).set_options(ENDIANNESS_BIG, 8, 15, 0x2000);
+	config.set_maximum_quantum(attotime::from_hz(18'000));     // high enough?
 
 	// video hardware
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
@@ -411,25 +717,25 @@ void bwing_state::bwing(machine_config &config)
 
 ROM_START( bwings )
 	// Top Board(SCU-01)
-	ROM_REGION( 0x10000, "maincpu", 0 ) // main CPU
+	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "bw_bv-02-.10a",0x04000, 0x04000, CRC(6074a86b) SHA1(0ce1bd74450144fd3c6556787d6c5c5d4531d830) )  // different
 	ROM_LOAD( "bw_bv-01.7a",  0x08000, 0x04000, CRC(b960c707) SHA1(086cb0f22fb59922bf0369bf6b382a241d979ec3) )
 	ROM_LOAD( "bw_bv-00-.4a", 0x0c000, 0x04000, CRC(1f83804c) SHA1(afd5eb0822db4fd982062945ca27e66ed9680645) )  // different
 
-	ROM_REGION( 0x10000, "sub", 0 ) // sub CPU
+	ROM_REGION( 0x10000, "subcpu", 0 )
 	ROM_LOAD( "bw_bv-06-.10d",0x0a000, 0x02000, CRC(eca00fcb) SHA1(c7affbb900e3940257f8cebc91266328a4a5dca3) )  // different
 	ROM_LOAD( "bw_bv-05-.9d", 0x0c000, 0x02000, CRC(1e393300) SHA1(8d847256eb5dbccf5f524ec3aa836073d70b4edc) )  // different
 	ROM_LOAD( "bw_bv-04-.7d", 0x0e000, 0x02000, CRC(6548c5bb) SHA1(d12cc8d0d5692c3de766f5c42c818dd8f685760a) )  // different
 
-	ROM_REGION( 0x2000, "audiocpu", 0 ) // sound CPU(encrypted)
+	ROM_REGION( 0x2000, "audiocpu", 0 ) // encrypted
 	ROM_LOAD( "bw_bv-03.13a", 0x00000, 0x02000, CRC(e8ac9379) SHA1(aaf5c20aa33ed05747a8a27739e9d09e094a518d) )
 
 	// Bottom Board(CCU-01)
-	ROM_REGION( 0x01000, "gfx1", 0 ) // chars
+	ROM_REGION( 0x01000, "chars", 0 )
 	ROM_LOAD( "bw_bv-10.5c",  0x00000, 0x01000, CRC(edca6901) SHA1(402c80e7519cf3a43b9fef52c9923961220a48b6) )
 
 	// Middle Board(MCU-01)
-	ROM_REGION( 0x0c000, "gfx2", 0 ) // sprites
+	ROM_REGION( 0x0c000, "sprites", 0 )
 	ROM_LOAD( "bw_bv-07.1l",  0x00000, 0x04000, CRC(3d5ab2be) SHA1(2b3a039914ebfcc3993da74853a67546fc22c191) )
 	ROM_LOAD( "bw_bv-08.1k",  0x04000, 0x04000, CRC(7a585f1e) SHA1(99e5d947b6b1fa96b90c676a282376d67fc377f0) )
 	ROM_LOAD( "bw_bv-09.1h",  0x08000, 0x04000, CRC(a14c0b57) SHA1(5033354793d77922f5ef7f268cbe212e551efadf) )
@@ -438,25 +744,25 @@ ROM_END
 
 ROM_START( bwingso )
 	// Top Board(SCU-01)
-	ROM_REGION( 0x10000, "maincpu", 0 ) // main CPU
+	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "bw_bv-02.10a", 0x04000, 0x04000, CRC(5ce74ab5) SHA1(b414f0bbe1c4c5b4c810bb4b9fba16aaf86520ff) )
 	ROM_LOAD( "bw_bv-01.7a",  0x08000, 0x04000, CRC(b960c707) SHA1(086cb0f22fb59922bf0369bf6b382a241d979ec3) )
 	ROM_LOAD( "bw_bv-00.4a",  0x0c000, 0x04000, CRC(926bef63) SHA1(d4bd2e91fa0abc5e9472d4b684c076bdc3c29f5b) )
 
-	ROM_REGION( 0x10000, "sub", 0 ) // sub CPU
+	ROM_REGION( 0x10000, "subcpu", 0 )
 	ROM_LOAD( "bw_bv-06.10d", 0x0a000, 0x02000, CRC(91a21a4c) SHA1(042eed60119a861f6b3ccfbe68d880f182a8a8e1) )
 	ROM_LOAD( "bw_bv-05.9d",  0x0c000, 0x02000, CRC(f283f39a) SHA1(9f7f4c39d49f4dfff73fe74cd457480e8a43a3c5) )
 	ROM_LOAD( "bw_bv-04.7d",  0x0e000, 0x02000, CRC(29ae75b6) SHA1(48c94e996857f2ac995bcd25f0e67b9f7c17d807) )
 
-	ROM_REGION( 0x2000, "audiocpu", 0 ) // sound CPU(encrypted)
+	ROM_REGION( 0x2000, "audiocpu", 0 ) // encrypted
 	ROM_LOAD( "bw_bv-03.13a", 0x00000, 0x02000, CRC(e8ac9379) SHA1(aaf5c20aa33ed05747a8a27739e9d09e094a518d) )
 
 	// Bottom Board(CCU-01)
-	ROM_REGION( 0x01000, "gfx1", 0 ) // chars
+	ROM_REGION( 0x01000, "chars", 0 )
 	ROM_LOAD( "bw_bv-10.5c",  0x00000, 0x01000, CRC(edca6901) SHA1(402c80e7519cf3a43b9fef52c9923961220a48b6) )
 
 	// Middle Board(MCU-01)
-	ROM_REGION( 0x0c000, "gfx2", 0 ) // sprites
+	ROM_REGION( 0x0c000, "sprites", 0 )
 	ROM_LOAD( "bw_bv-07.1l",  0x00000, 0x04000, CRC(3d5ab2be) SHA1(2b3a039914ebfcc3993da74853a67546fc22c191) )
 	ROM_LOAD( "bw_bv-08.1k",  0x04000, 0x04000, CRC(7a585f1e) SHA1(99e5d947b6b1fa96b90c676a282376d67fc377f0) )
 	ROM_LOAD( "bw_bv-09.1h",  0x08000, 0x04000, CRC(a14c0b57) SHA1(5033354793d77922f5ef7f268cbe212e551efadf) )
@@ -465,26 +771,26 @@ ROM_END
 
 ROM_START( bwingsa )
 	// Top Board(SCU-01)
-	ROM_REGION( 0x10000, "maincpu", 0 ) // main CPU
+	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "bw_bv-02.10a", 0x04000, 0x04000, CRC(5ce74ab5) SHA1(b414f0bbe1c4c5b4c810bb4b9fba16aaf86520ff) )
 	ROM_LOAD( "bv02.bin",     0x06000, 0x02000, CRC(2f84654e) SHA1(11b5343219b46d03f686ea348181c509121b9e3c) ) // only the lower 8k is different
 	ROM_LOAD( "bw_bv-01.7a",  0x08000, 0x04000, CRC(b960c707) SHA1(086cb0f22fb59922bf0369bf6b382a241d979ec3) )
 	ROM_LOAD( "bv00.bin",     0x0c000, 0x04000, CRC(0bbc1222) SHA1(cfdf621a423a5ce4ba44a980e683d2abf044d6b9) ) // different
 
-	ROM_REGION( 0x10000, "sub", 0 ) // sub CPU
+	ROM_REGION( 0x10000, "subcpu", 0 )
 	ROM_LOAD( "bw_bv-06.10d", 0x0a000, 0x02000, CRC(91a21a4c) SHA1(042eed60119a861f6b3ccfbe68d880f182a8a8e1) )
 	ROM_LOAD( "bw_bv-05.9d",  0x0c000, 0x02000, CRC(f283f39a) SHA1(9f7f4c39d49f4dfff73fe74cd457480e8a43a3c5) )
 	ROM_LOAD( "bw_bv-04.7d",  0x0e000, 0x02000, CRC(29ae75b6) SHA1(48c94e996857f2ac995bcd25f0e67b9f7c17d807) )
 
-	ROM_REGION( 0x2000, "audiocpu", 0 ) // sound CPU(encrypted)
+	ROM_REGION( 0x2000, "audiocpu", 0 ) // encrypted
 	ROM_LOAD( "bw_bv-03.13a", 0x00000, 0x02000, CRC(e8ac9379) SHA1(aaf5c20aa33ed05747a8a27739e9d09e094a518d) )
 
 	// Bottom Board(CCU-01)
-	ROM_REGION( 0x01000, "gfx1", 0 ) // chars
+	ROM_REGION( 0x01000, "chars", 0 )
 	ROM_LOAD( "bw_bv-10.5c",  0x00000, 0x01000, CRC(edca6901) SHA1(402c80e7519cf3a43b9fef52c9923961220a48b6) )
 
 	// Middle Board(MCU-01)
-	ROM_REGION( 0x0c000, "gfx2", 0 ) // sprites
+	ROM_REGION( 0x0c000, "sprites", 0 )
 	ROM_LOAD( "bw_bv-07.1l",  0x00000, 0x04000, CRC(3d5ab2be) SHA1(2b3a039914ebfcc3993da74853a67546fc22c191) )
 	ROM_LOAD( "bw_bv-08.1k",  0x04000, 0x04000, CRC(7a585f1e) SHA1(99e5d947b6b1fa96b90c676a282376d67fc377f0) )
 	ROM_LOAD( "bw_bv-09.1h",  0x08000, 0x04000, CRC(a14c0b57) SHA1(5033354793d77922f5ef7f268cbe212e551efadf) )
@@ -492,25 +798,25 @@ ROM_END
 
 ROM_START( zaviga )
 	// Top Board(DE-0169-0)
-	ROM_REGION( 0x10000, "maincpu", 0 ) // main CPU
+	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "as04.10a", 0x04000, 0x04000, CRC(b79f5da2) SHA1(b39748666d3f7fb1ac46d282cce09fe9531df6b1) )
 	ROM_LOAD( "as02.7a", 0x08000, 0x04000, CRC(6addd16a) SHA1(940637c49bf9f38c77176ed2ae212048e9e7fd8f) )
 	ROM_LOAD( "as00.4a", 0x0c000, 0x04000, CRC(c6ae4af0) SHA1(6f6f14385b20f9c9c312f816036c608fe8514b00) )
 
-	ROM_REGION( 0x10000, "sub", 0 ) // sub CPU
+	ROM_REGION( 0x10000, "subcpu", 0 )
 	ROM_LOAD( "as08.10d", 0x0a000, 0x02000, CRC(b6187b3a) SHA1(d2d7c5b185f59986f45d8ec3ddf9b95364e57d96) )
 	ROM_LOAD( "as07.9d", 0x0c000, 0x02000, CRC(dc1170e3) SHA1(c8e4d1564fd272d726d0e4ffd4f33f67f1b37cd7) )
 	ROM_LOAD( "as06.7d", 0x0e000, 0x02000, CRC(ba888f84) SHA1(f94de8553cd4704d9b3349ded881a7cc62fa9b57) )
 
-	ROM_REGION( 0x2000, "audiocpu", 0 ) // sound CPU(encrypted)
+	ROM_REGION( 0x2000, "audiocpu", 0 ) // encrypted
 	ROM_LOAD( "as05.13a", 0x00000, 0x02000, CRC(afe9b0ac) SHA1(3c653cd4fff7f4e00971249900b5a810b6e74dfe) )
 
 	// Bottom Board(DE-0170-0)
-	ROM_REGION( 0x01000, "gfx1", 0 ) // chars
+	ROM_REGION( 0x01000, "chars", 0 )
 	ROM_LOAD( "as14.5c", 0x00000, 0x01000, CRC(62132c1d) SHA1(6b101e220a440488da17de8446f4e2c8ec7c7de9) )
 
 	// Middle Board(DE-0171-0)
-	ROM_REGION( 0x0c000, "gfx2", 0 ) // sprites
+	ROM_REGION( 0x0c000, "sprites", 0 )
 	ROM_LOAD( "as11.1l", 0x00000, 0x04000, CRC(aa84af24) SHA1(af4ff085dc44b3d1493ec1c8b4a8d18dccecc872) )
 	ROM_LOAD( "as12.1k", 0x04000, 0x04000, CRC(84af9041) SHA1(8fbd5995ca8e708cd7fb9cdfcdb174e12084f526) )
 	ROM_LOAD( "as13.1h", 0x08000, 0x04000, CRC(15d0922b) SHA1(b8d715a9e610531472d516c19f6035adbce93c84) )
@@ -519,25 +825,25 @@ ROM_END
 
 ROM_START( zavigaj )
 	// Top Board(DE-0169-0)
-	ROM_REGION( 0x10000, "maincpu", 0 ) // main CPU
+	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "as04.10a", 0x04000, 0x04000, CRC(b79f5da2) SHA1(b39748666d3f7fb1ac46d282cce09fe9531df6b1) )
 	ROM_LOAD( "as02.7a",  0x08000, 0x04000, CRC(6addd16a) SHA1(940637c49bf9f38c77176ed2ae212048e9e7fd8f) )
 	ROM_LOAD( "as00.4a",  0x0c000, 0x04000, CRC(c6ae4af0) SHA1(6f6f14385b20f9c9c312f816036c608fe8514b00) )
 
-	ROM_REGION( 0x10000, "sub", 0 ) // sub CPU
+	ROM_REGION( 0x10000, "subcpu", 0 )
 	ROM_LOAD( "as08.10d", 0x0a000, 0x02000, CRC(b6187b3a) SHA1(d2d7c5b185f59986f45d8ec3ddf9b95364e57d96) )
 	ROM_LOAD( "as07.9d",  0x0c000, 0x02000, CRC(dc1170e3) SHA1(c8e4d1564fd272d726d0e4ffd4f33f67f1b37cd7) )
 	ROM_LOAD( "as06-.7d", 0x0e000, 0x02000, CRC(b02d270c) SHA1(beea3d44d367543b5b5075c5892580e690691e75) )  // different
 
-	ROM_REGION( 0x2000, "audiocpu", 0 ) // sound CPU(encrypted)
+	ROM_REGION( 0x2000, "audiocpu", 0 ) // encrypted
 	ROM_LOAD( "as05.13a", 0x00000, 0x02000, CRC(afe9b0ac) SHA1(3c653cd4fff7f4e00971249900b5a810b6e74dfe) )
 
 	// Bottom Board(DE-0170-0)
-	ROM_REGION( 0x01000, "gfx1", 0 ) // chars
+	ROM_REGION( 0x01000, "chars", 0 )
 	ROM_LOAD( "as14.5c", 0x00000, 0x01000, CRC(62132c1d) SHA1(6b101e220a440488da17de8446f4e2c8ec7c7de9) )
 
 	// Middle Board(DE-0171-0)
-	ROM_REGION( 0x0c000, "gfx2", 0 ) // sprites
+	ROM_REGION( 0x0c000, "sprites", 0 )
 	ROM_LOAD( "as11.1l", 0x00000, 0x04000, CRC(aa84af24) SHA1(af4ff085dc44b3d1493ec1c8b4a8d18dccecc872) )
 	ROM_LOAD( "as12.1k", 0x04000, 0x04000, CRC(84af9041) SHA1(8fbd5995ca8e708cd7fb9cdfcdb174e12084f526) )
 	ROM_LOAD( "as13.1h", 0x08000, 0x04000, CRC(15d0922b) SHA1(b8d715a9e610531472d516c19f6035adbce93c84) )
@@ -560,12 +866,14 @@ void bwing_state::init_bwing()
 	rom[j - (0x10 - 0x5)] = rom[j - (0x10 - 0xa)] = rom[j - (0x10 - 0x7)];
 }
 
+} // anonymous namespace
+
 //****************************************************************************
 // Game Entries
 
-GAME( 1984, bwings,       0, bwing, bwing, bwing_state, init_bwing, ROT90, "Data East Corporation", "B-Wings (Japan new Ver.)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, bwings,  0,      bwing, bwing, bwing_state, init_bwing, ROT90, "Data East Corporation", "B-Wings (Japan new Ver.)", MACHINE_SUPPORTS_SAVE )
 GAME( 1984, bwingso, bwings, bwing, bwing, bwing_state, init_bwing, ROT90, "Data East Corporation", "B-Wings (Japan old Ver.)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, bwingsa, bwings, bwing, bwing, bwing_state, init_bwing, ROT90, "Data East Corporation", "B-Wings (Alt Ver.?)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, bwingsa, bwings, bwing, bwing, bwing_state, init_bwing, ROT90, "Data East Corporation", "B-Wings (Alt Ver.?)",      MACHINE_SUPPORTS_SAVE )
 
-GAME( 1984, zaviga,       0, bwing, bwing, bwing_state, init_bwing, ROT90, "Data East Corporation", "Zaviga", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, zavigaj, zaviga, bwing, bwing, bwing_state, init_bwing, ROT90, "Data East Corporation", "Zaviga (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, zaviga,  0,      bwing, bwing, bwing_state, init_bwing, ROT90, "Data East Corporation", "Zaviga",                   MACHINE_SUPPORTS_SAVE )
+GAME( 1984, zavigaj, zaviga, bwing, bwing, bwing_state, init_bwing, ROT90, "Data East Corporation", "Zaviga (Japan)",           MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/dataeast/bwing.h b/src/mame/dataeast/bwing.h
deleted file mode 100644
index 8e45ef18682..00000000000
--- a/src/mame/dataeast/bwing.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Acho A. Tang, Alex W. Jackson
-/***************************************************************************
-
-    B-Wings
-
-***************************************************************************/
-
-#include "machine/bankdev.h"
-#include "machine/gen_latch.h"
-#include "emupal.h"
-#include "tilemap.h"
-
-#define BW_DEBUG 0
-
-class bwing_state : public driver_device
-{
-public:
-	bwing_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
-		m_maincpu(*this, "maincpu"),
-		m_subcpu(*this, "sub"),
-		m_audiocpu(*this, "audiocpu"),
-		m_gfxdecode(*this, "gfxdecode"),
-		m_palette(*this, "palette"),
-		m_vrambank(*this, "vrambank"),
-		m_soundlatch(*this, "soundlatch"),
-		m_videoram(*this, "videoram"),
-		m_spriteram(*this, "spriteram"),
-		m_paletteram(*this, "paletteram"),
-		m_fgscrollram(*this, "fgscrollram"),
-		m_bgscrollram(*this, "bgscrollram"),
-		m_gfxram(*this, "gfxram") { }
-
-	void init_bwing();
-	void bwing(machine_config &config);
-	DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
-	DECLARE_INPUT_CHANGED_MEMBER(tilt_pressed);
-
-private:
-	/* device */
-	required_device<cpu_device> m_maincpu;
-	required_device<cpu_device> m_subcpu;
-	required_device<cpu_device> m_audiocpu;
-	required_device<gfxdecode_device> m_gfxdecode;
-	required_device<palette_device> m_palette;
-	required_device<address_map_bank_device> m_vrambank;
-	required_device<generic_latch_8_device> m_soundlatch;
-
-	/* memory pointers */
-	required_shared_ptr<uint8_t> m_videoram;
-	required_shared_ptr<uint8_t> m_spriteram;
-	required_shared_ptr<uint8_t> m_paletteram;
-	required_shared_ptr<uint8_t> m_fgscrollram;
-	required_shared_ptr<uint8_t> m_bgscrollram;
-	required_shared_ptr<uint8_t> m_gfxram;
-
-	/* video-related */
-	tilemap_t *m_charmap = nullptr;
-	tilemap_t *m_fgmap = nullptr;
-	tilemap_t *m_bgmap = nullptr;
-	unsigned m_sreg[8]{};
-	unsigned m_palatch = 0U;
-	unsigned m_mapmask = 0U;
-
-	/* sound-related */
-	int m_bwp3_nmimask = 0;
-	int m_bwp3_u8F_d = 0;
-
-	void bwp3_u8F_w(uint8_t data);
-	void bwp3_nmimask_w(uint8_t data);
-	void bwp3_nmiack_w(uint8_t data);
-	void bwp1_ctrl_w(offs_t offset, uint8_t data);
-	void bwp2_ctrl_w(offs_t offset, uint8_t data);
-	void videoram_w(offs_t offset, uint8_t data);
-	void fgscrollram_w(offs_t offset, uint8_t data);
-	void bgscrollram_w(offs_t offset, uint8_t data);
-	void gfxram_w(offs_t offset, uint8_t data);
-	void scrollreg_w(offs_t offset, uint8_t data);
-	void paletteram_w(offs_t offset, uint8_t data);
-
-	TILE_GET_INFO_MEMBER(get_fgtileinfo);
-	TILE_GET_INFO_MEMBER(get_bgtileinfo);
-	TILE_GET_INFO_MEMBER(get_charinfo);
-	TILEMAP_MAPPER_MEMBER(scan_cols);
-
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
-	virtual void video_start() override;
-	void bwing_postload();
-
-	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	void draw_sprites( bitmap_ind16 &bmp, const rectangle &clip, uint8_t *ram, int pri );
-
-	INTERRUPT_GEN_MEMBER(bwp3_interrupt);
-	void bank_map(address_map &map);
-	void bwp1_map(address_map &map);
-	void bwp2_map(address_map &map);
-	void bwp3_io_map(address_map &map);
-	void bwp3_map(address_map &map);
-};
diff --git a/src/mame/dataeast/bwing_v.cpp b/src/mame/dataeast/bwing_v.cpp
deleted file mode 100644
index 32887c5dae1..00000000000
--- a/src/mame/dataeast/bwing_v.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Acho A. Tang, Alex W. Jackson
-/*****************************************************************************
-
-B-Wings  (c) 1984 Data East Corporation
-Zaviga   (c) 1984 Data East Corporation
-
-drivers by Acho A. Tang
-revised by Alex W. Jackson
-
-*****************************************************************************/
-// Directives
-
-#include "emu.h"
-#include "bwing.h"
-
-
-//****************************************************************************
-// Exports
-
-
-void bwing_state::videoram_w(offs_t offset, uint8_t data)
-{
-	m_videoram[offset] = data;
-	m_charmap->mark_tile_dirty(offset);
-}
-
-
-void bwing_state::fgscrollram_w(offs_t offset, uint8_t data)
-{
-	m_fgscrollram[offset] = data;
-	m_fgmap->mark_tile_dirty(offset);
-}
-
-
-void bwing_state::bgscrollram_w(offs_t offset, uint8_t data)
-{
-	m_bgscrollram[offset] = data;
-	m_bgmap->mark_tile_dirty(offset);
-}
-
-
-void bwing_state::gfxram_w(offs_t offset, uint8_t data)
-{
-	m_gfxram[offset] = data;
-	int whichgfx = (offset & 0x1000) ? 3 : 2;
-	m_gfxdecode->gfx(whichgfx)->mark_dirty((offset & 0xfff) / 32);
-}
-
-
-void bwing_state::scrollreg_w(offs_t offset, uint8_t data)
-{
-	m_sreg[offset] = data;
-
-	switch (offset)
-	{
-		case 6: m_palatch = data; break; // one of the palette components is latched through I/O(yike)
-
-		case 7:
-			m_mapmask = data;
-			m_vrambank->set_bank(data >> 6);
-		break;
-	}
-}
-
-
-void bwing_state::paletteram_w(offs_t offset, uint8_t data)
-{
-	static const float rgb[4][3] = {
-		{0.85f, 0.95f, 1.00f},
-		{0.90f, 1.00f, 1.00f},
-		{0.80f, 1.00f, 1.00f},
-		{0.75f, 0.90f, 1.10f}
-	};
-	int r, g, b, i;
-
-	m_paletteram[offset] = data;
-
-	r = ~data & 7;
-	g = ~(data >> 4) & 7;
-	b = ~m_palatch & 7;
-
-	r = ((r << 5) + (r << 2) + (r >> 1));
-	g = ((g << 5) + (g << 2) + (g >> 1));
-	b = ((b << 5) + (b << 2) + (b >> 1));
-
-	if ((i = ioport("EXTRA")->read()) < 4)
-	{
-		r = (float)r * rgb[i][0];
-		g = (float)g * rgb[i][1];
-		b = (float)b * rgb[i][2];
-		if (r > 0xff) r = 0xff;
-		if (g > 0xff) g = 0xff;
-		if (b > 0xff) b = 0xff;
-	}
-
-	m_palette->set_pen_color(offset, rgb_t(r, g, b));
-}
-
-//****************************************************************************
-// Initializations
-
-TILE_GET_INFO_MEMBER(bwing_state::get_fgtileinfo)
-{
-	tileinfo.set(2, m_fgscrollram[tile_index] & 0x7f, m_fgscrollram[tile_index] >> 7, 0);
-}
-
-TILE_GET_INFO_MEMBER(bwing_state::get_bgtileinfo)
-{
-	tileinfo.set(3, m_bgscrollram[tile_index] & 0x7f, m_bgscrollram[tile_index] >> 7, 0);
-}
-
-TILE_GET_INFO_MEMBER(bwing_state::get_charinfo)
-{
-	tileinfo.set(0, m_videoram[tile_index], 0, 0);
-}
-
-TILEMAP_MAPPER_MEMBER(bwing_state::scan_cols)
-{
-	return (row & 0xf) | ((col & 0xf) << 4) | ((row & 0x30) << 4) | ((col & 0x30) << 6);
-}
-
-
-void bwing_state::video_start()
-{
-	int i;
-
-	m_charmap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(bwing_state::get_charinfo)), TILEMAP_SCAN_COLS, 8, 8, 32, 32);
-	m_fgmap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(bwing_state::get_fgtileinfo)), tilemap_mapper_delegate(*this, FUNC(bwing_state::scan_cols)), 16, 16, 64, 64);
-	m_bgmap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(bwing_state::get_bgtileinfo)), tilemap_mapper_delegate(*this, FUNC(bwing_state::scan_cols)), 16, 16, 64, 64);
-
-	m_charmap->set_transparent_pen(0);
-	m_fgmap->set_transparent_pen(0);
-
-	for (i = 0; i < 8; i++)
-		m_sreg[i] = 0;
-}
-
-//****************************************************************************
-// Realtime
-
-void bwing_state::draw_sprites( bitmap_ind16 &bmp, const rectangle &clip, uint8_t *ram, int pri )
-{
-	int attrib, fx, fy, code, x, y, color, i;
-	gfx_element *gfx = m_gfxdecode->gfx(1);
-
-	for (i = 0; i < 0x200; i += 4)
-	{
-		attrib = ram[i];
-		code   = ram[i + 1];
-		y      = ram[i + 2];
-		x      = ram[i + 3];
-		color  = (attrib >> 3) & 1;
-
-		if (!(attrib & 1) || color != pri)
-			continue;
-
-		code += (attrib << 3) & 0x100;
-		y -= (attrib << 1) & 0x100;
-		x -= (attrib << 2) & 0x100;
-
-		fx = attrib & 0x04;
-		fy = ~attrib & 0x02;
-
-		// normal/cocktail
-		if (m_mapmask & 0x20)
-		{
-			fx = !fx;
-			fy = !fy;
-			x = 240 - x;
-			y = 240 - y;
-		}
-
-		// single/double
-		if (!(attrib & 0x10))
-				gfx->transpen(bmp,clip, code, color, fx, fy, x, y, 0);
-		else
-				gfx->zoom_transpen(bmp,clip, code, color, fx, fy, x, y, 1<<16, 2<<16, 0);
-	}
-}
-
-
-uint32_t bwing_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
-	unsigned flip, x, y, shiftx;
-
-	if (m_mapmask & 0x20)
-	{
-		flip = TILEMAP_FLIPX;
-		shiftx = -8;
-	}
-	else
-	{
-		flip = TILEMAP_FLIPY;
-		shiftx = 8;
-	}
-
-	// draw background
-	if (!(m_mapmask & 1))
-	{
-		m_bgmap->set_flip(flip);
-		x = ((m_sreg[1]<<2 & 0x300) + m_sreg[2] + shiftx) & 0x3ff;
-		m_bgmap->set_scrollx(0, x);
-		y = (m_sreg[1]<<4 & 0x300) + m_sreg[3];
-		m_bgmap->set_scrolly(0, y);
-		m_bgmap->draw(screen, bitmap, cliprect, 0, 0);
-	}
-	else
-		bitmap.fill(m_palette->black_pen(), cliprect);
-
-	// draw low priority sprites
-	draw_sprites(bitmap, cliprect, m_spriteram, 0);
-
-	// draw foreground
-	if (!(m_mapmask & 2))
-	{
-		m_fgmap->set_flip(flip);
-		x = ((m_sreg[1] << 6 & 0x300) + m_sreg[4] + shiftx) & 0x3ff;
-		m_fgmap->set_scrollx(0, x);
-		y = (m_sreg[1] << 8 & 0x300) + m_sreg[5];
-		m_fgmap->set_scrolly(0, y);
-		m_fgmap->draw(screen, bitmap, cliprect, 0, 0);
-	}
-
-	// draw high priority sprites
-	draw_sprites(bitmap, cliprect, m_spriteram, 1);
-
-	// draw text layer
-//  if (m_mapmask & 4)
-	{
-		m_charmap->set_flip(flip);
-		m_charmap->draw(screen, bitmap, cliprect, 0, 0);
-	}
-	return 0;
-}