summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/bwing.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/bwing.cpp')
-rw-r--r--src/mame/drivers/bwing.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/mame/drivers/bwing.cpp b/src/mame/drivers/bwing.cpp
index a248b6a32d1..670794eeb92 100644
--- a/src/mame/drivers/bwing.cpp
+++ b/src/mame/drivers/bwing.cpp
@@ -125,17 +125,17 @@ void bwing_state::bwp1_map(address_map &map)
{
map(0x0000, 0x07ff).ram().share("sharedram");
map(0x0800, 0x0fff).ram();
- map(0x1000, 0x13ff).ram().w(this, FUNC(bwing_state::videoram_w)).share("videoram");
+ map(0x1000, 0x13ff).ram().w(FUNC(bwing_state::videoram_w)).share("videoram");
map(0x1400, 0x17ff).ram();
map(0x1800, 0x19ff).ram().share("spriteram");
- map(0x1a00, 0x1aff).ram().w(this, FUNC(bwing_state::paletteram_w)).share("paletteram");
+ map(0x1a00, 0x1aff).ram().w(FUNC(bwing_state::paletteram_w)).share("paletteram");
map(0x1b00, 0x1b00).portr("DSW0");
map(0x1b01, 0x1b01).portr("DSW1");
map(0x1b02, 0x1b02).portr("IN0");
map(0x1b03, 0x1b03).portr("IN1");
map(0x1b04, 0x1b04).portr("IN2");
- map(0x1b00, 0x1b07).w(this, FUNC(bwing_state::scrollreg_w));
- map(0x1c00, 0x1c07).ram().w(this, FUNC(bwing_state::bwp1_ctrl_w));
+ 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(0x4000, 0xffff).rom(); // "B-Wings US" writes to 9631-9632(debug?)
}
@@ -143,9 +143,9 @@ void bwing_state::bwp1_map(address_map &map)
// Banked video RAM
void bwing_state::bank_map(address_map &map)
{
- map(0x0000, 0x0fff).ram().w(this, FUNC(bwing_state::fgscrollram_w)).share("fgscrollram");
- map(0x1000, 0x1fff).ram().w(this, FUNC(bwing_state::bgscrollram_w)).share("bgscrollram");
- map(0x2000, 0x7fff).ram().w(this, FUNC(bwing_state::gfxram_w)).share("gfxram");
+ 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
@@ -153,7 +153,7 @@ void bwing_state::bwp2_map(address_map &map)
{
map(0x0000, 0x07ff).ram().share("sharedram");
map(0x0800, 0x0fff).ram();
- map(0x1800, 0x1803).w(this, FUNC(bwing_state::bwp2_ctrl_w));
+ map(0x1800, 0x1803).w(FUNC(bwing_state::bwp2_ctrl_w));
map(0xa000, 0xffff).rom();
}
@@ -162,21 +162,21 @@ void bwing_state::bwp2_map(address_map &map)
void bwing_state::bwp3_map(address_map &map)
{
map(0x0000, 0x01ff).ram();
- map(0x0200, 0x0200).w("dac", FUNC(dac_byte_interface::write));
- map(0x1000, 0x1000).w(this, FUNC(bwing_state::bwp3_nmiack_w));
+ map(0x0200, 0x0200).w("dac", FUNC(dac_byte_interface::data_w));
+ map(0x1000, 0x1000).w(FUNC(bwing_state::bwp3_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(this, FUNC(bwing_state::bwp3_nmimask_w));
+ map(0xd000, 0xd000).w(FUNC(bwing_state::bwp3_nmimask_w));
map(0xe000, 0xffff).rom().region("audiocpu", 0);
}
void bwing_state::bwp3_io_map(address_map &map)
{
- map(0x00, 0x00).portr("VBLANK").w(this, FUNC(bwing_state::bwp3_u8F_w));
+ map(0x00, 0x00).portr("VBLANK").w(FUNC(bwing_state::bwp3_u8F_w));
}
//****************************************************************************