diff options
Diffstat (limited to 'src/mame/drivers/senjyo.cpp')
-rw-r--r-- | src/mame/drivers/senjyo.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/mame/drivers/senjyo.cpp b/src/mame/drivers/senjyo.cpp index 923709d13e3..24df8de20d3 100644 --- a/src/mame/drivers/senjyo.cpp +++ b/src/mame/drivers/senjyo.cpp @@ -127,8 +127,8 @@ void senjyo_state::senjyo_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x8fff).ram(); - map(0x9000, 0x93ff).ram().w(this, FUNC(senjyo_state::fgvideoram_w)).share("fgvideoram"); - map(0x9400, 0x97ff).ram().w(this, FUNC(senjyo_state::fgcolorram_w)).share("fgcolorram"); + map(0x9000, 0x93ff).ram().w(FUNC(senjyo_state::fgvideoram_w)).share("fgvideoram"); + map(0x9400, 0x97ff).ram().w(FUNC(senjyo_state::fgcolorram_w)).share("fgcolorram"); map(0x9800, 0x987f).ram().share("spriteram"); map(0x9c00, 0x9dff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0x9e00, 0x9e3f).ram(); @@ -145,15 +145,15 @@ void senjyo_state::senjyo_map(address_map &map) map(0x9e35, 0x9e35).ram().share("scrollx1"); /* AM_RANGE(0x9e38, 0x9e38) probably radar y position (Senjyo only, fixed at 0x61) */ /* AM_RANGE(0x9e3d, 0x9e3d) probably radar x position (Senjyo only, 0x00/0xc0 depending on screen flip) */ - map(0xa000, 0xa7ff).ram().w(this, FUNC(senjyo_state::bg3videoram_w)).share("bg3videoram"); - map(0xa800, 0xafff).ram().w(this, FUNC(senjyo_state::bg2videoram_w)).share("bg2videoram"); - map(0xb000, 0xb7ff).ram().w(this, FUNC(senjyo_state::bg1videoram_w)).share("bg1videoram"); + map(0xa000, 0xa7ff).ram().w(FUNC(senjyo_state::bg3videoram_w)).share("bg3videoram"); + map(0xa800, 0xafff).ram().w(FUNC(senjyo_state::bg2videoram_w)).share("bg2videoram"); + map(0xb000, 0xb7ff).ram().w(FUNC(senjyo_state::bg1videoram_w)).share("bg1videoram"); map(0xb800, 0xbbff).ram().share("radarram"); - map(0xd000, 0xd000).portr("P1").w(this, FUNC(senjyo_state::flip_screen_w)); + map(0xd000, 0xd000).portr("P1").w(FUNC(senjyo_state::flip_screen_w)); map(0xd001, 0xd001).portr("P2"); - map(0xd002, 0xd002).portr("SYSTEM").w(this, FUNC(senjyo_state::irq_ctrl_w)); + map(0xd002, 0xd002).portr("SYSTEM").w(FUNC(senjyo_state::irq_ctrl_w)); map(0xd003, 0xd003).nopr(); // debug cheat port? (i.e. bit 0 in starforc: invincibility, bit 3-0 in senyjo: disables enemy fire) - map(0xd004, 0xd004).portr("DSW1").w(this, FUNC(senjyo_state::sound_cmd_w)); + map(0xd004, 0xd004).portr("DSW1").w(FUNC(senjyo_state::sound_cmd_w)); map(0xd005, 0xd005).portr("DSW2"); } @@ -166,10 +166,10 @@ void senjyo_state::senjyo_sound_map(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x4000, 0x43ff).ram(); - map(0x8000, 0x8000).w("sn1", FUNC(sn76496_device::write)); - map(0x9000, 0x9000).w("sn2", FUNC(sn76496_device::write)); - map(0xa000, 0xa000).w("sn3", FUNC(sn76496_device::write)); - map(0xd000, 0xd000).w(this, FUNC(senjyo_state::volume_w)); + map(0x8000, 0x8000).w("sn1", FUNC(sn76496_device::command_w)); + map(0x9000, 0x9000).w("sn2", FUNC(sn76496_device::command_w)); + map(0xa000, 0xa000).w("sn3", FUNC(sn76496_device::command_w)); + map(0xd000, 0xd000).w(FUNC(senjyo_state::volume_w)); } void senjyo_state::senjyo_sound_io_map(address_map &map) @@ -198,25 +198,25 @@ void senjyo_state::starforb_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x8fff).ram(); - map(0x9000, 0x93ff).ram().w(this, FUNC(senjyo_state::fgvideoram_w)).share("fgvideoram"); - map(0x9400, 0x97ff).ram().w(this, FUNC(senjyo_state::fgcolorram_w)).share("fgcolorram"); + map(0x9000, 0x93ff).ram().w(FUNC(senjyo_state::fgvideoram_w)).share("fgvideoram"); + map(0x9400, 0x97ff).ram().w(FUNC(senjyo_state::fgcolorram_w)).share("fgcolorram"); map(0x9800, 0x987f).ram().share("spriteram"); map(0x9c00, 0x9dff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); /* The format / use of the ram here is different on the bootleg */ map(0x9e00, 0x9e3f).ram(); map(0x9e20, 0x9e21).ram().share("scrolly3"); map(0x9e25, 0x9e25).ram().share("scrollx3"); - map(0x9e30, 0x9e31).ram().w(this, FUNC(senjyo_state::starforb_scrolly2)).share("scrolly2"); // ok - map(0x9e35, 0x9e35).ram().w(this, FUNC(senjyo_state::starforb_scrollx2)).share("scrollx2"); // ok + map(0x9e30, 0x9e31).ram().w(FUNC(senjyo_state::starforb_scrolly2)).share("scrolly2"); // ok + map(0x9e35, 0x9e35).ram().w(FUNC(senjyo_state::starforb_scrollx2)).share("scrollx2"); // ok - map(0xa000, 0xa7ff).ram().w(this, FUNC(senjyo_state::bg3videoram_w)).share("bg3videoram"); - map(0xa800, 0xafff).ram().w(this, FUNC(senjyo_state::bg2videoram_w)).share("bg2videoram"); - map(0xb000, 0xb7ff).ram().w(this, FUNC(senjyo_state::bg1videoram_w)).share("bg1videoram"); + map(0xa000, 0xa7ff).ram().w(FUNC(senjyo_state::bg3videoram_w)).share("bg3videoram"); + map(0xa800, 0xafff).ram().w(FUNC(senjyo_state::bg2videoram_w)).share("bg2videoram"); + map(0xb000, 0xb7ff).ram().w(FUNC(senjyo_state::bg1videoram_w)).share("bg1videoram"); map(0xb800, 0xbbff).ram().share("radarram"); - map(0xd000, 0xd000).portr("P1").w(this, FUNC(senjyo_state::flip_screen_w)); + map(0xd000, 0xd000).portr("P1").w(FUNC(senjyo_state::flip_screen_w)); map(0xd001, 0xd001).portr("P2"); - map(0xd002, 0xd002).portr("SYSTEM").w(this, FUNC(senjyo_state::irq_ctrl_w)); - map(0xd004, 0xd004).portr("DSW1").w(this, FUNC(senjyo_state::sound_cmd_w)); + map(0xd002, 0xd002).portr("SYSTEM").w(FUNC(senjyo_state::irq_ctrl_w)); + map(0xd004, 0xd004).portr("DSW1").w(FUNC(senjyo_state::sound_cmd_w)); map(0xd005, 0xd005).portr("DSW2"); /* these aren't used / written, left here to make sure memory is allocated */ @@ -231,10 +231,10 @@ void senjyo_state::starforb_sound_map(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x4000, 0x43ff).ram(); - map(0x8000, 0x8000).w("sn1", FUNC(sn76496_device::write)); - map(0x9000, 0x9000).w("sn2", FUNC(sn76496_device::write)); - map(0xa000, 0xa000).w("sn3", FUNC(sn76496_device::write)); - map(0xd000, 0xd000).w(this, FUNC(senjyo_state::volume_w)); + map(0x8000, 0x8000).w("sn1", FUNC(sn76496_device::command_w)); + map(0x9000, 0x9000).w("sn2", FUNC(sn76496_device::command_w)); + map(0xa000, 0xa000).w("sn3", FUNC(sn76496_device::command_w)); + map(0xd000, 0xd000).w(FUNC(senjyo_state::volume_w)); map(0xf000, 0xffff).ram(); } |