diff options
Diffstat (limited to 'src/mame/drivers/nbmj8900.cpp')
-rw-r--r-- | src/mame/drivers/nbmj8900.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mame/drivers/nbmj8900.cpp b/src/mame/drivers/nbmj8900.cpp index 4c64c885f1b..16cecc8a9ff 100644 --- a/src/mame/drivers/nbmj8900.cpp +++ b/src/mame/drivers/nbmj8900.cpp @@ -96,16 +96,16 @@ void nbmj8900_state::init_togenkyo() void nbmj8900_state::ohpaipee_map(address_map &map) { map(0x0000, 0xefff).rom(); - map(0xf000, 0xf00f).rw(this, FUNC(nbmj8900_state::clut_r), FUNC(nbmj8900_state::clut_w)); - map(0xf400, 0xf5ff).rw(this, FUNC(nbmj8900_state::palette_type1_r), FUNC(nbmj8900_state::palette_type1_w)); + map(0xf000, 0xf00f).rw(FUNC(nbmj8900_state::clut_r), FUNC(nbmj8900_state::clut_w)); + map(0xf400, 0xf5ff).rw(FUNC(nbmj8900_state::palette_type1_r), FUNC(nbmj8900_state::palette_type1_w)); map(0xf800, 0xffff).ram(); } void nbmj8900_state::togenkyo_map(address_map &map) { map(0x0000, 0xefff).rom(); - map(0xf000, 0xf00f).rw(this, FUNC(nbmj8900_state::clut_r), FUNC(nbmj8900_state::clut_w)); - map(0xf400, 0xf5ff).rw(this, FUNC(nbmj8900_state::palette_type1_r), FUNC(nbmj8900_state::palette_type1_w)); + map(0xf000, 0xf00f).rw(FUNC(nbmj8900_state::clut_r), FUNC(nbmj8900_state::clut_w)); + map(0xf400, 0xf5ff).rw(FUNC(nbmj8900_state::palette_type1_r), FUNC(nbmj8900_state::palette_type1_w)); map(0xf800, 0xffff).ram(); } @@ -114,11 +114,11 @@ void nbmj8900_state::ohpaipee_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x7f).r(m_nb1413m3, FUNC(nb1413m3_device::sndrom_r)); map(0x00, 0x00).w(m_nb1413m3, FUNC(nb1413m3_device::nmi_clock_w)); - map(0x20, 0x27).w(this, FUNC(nbmj8900_state::blitter_w)); + map(0x20, 0x27).w(FUNC(nbmj8900_state::blitter_w)); - map(0x40, 0x40).w(this, FUNC(nbmj8900_state::clutsel_w)); - map(0x60, 0x60).w(this, FUNC(nbmj8900_state::romsel_w)); - map(0x70, 0x70).w(this, FUNC(nbmj8900_state::scrolly_w)); + map(0x40, 0x40).w(FUNC(nbmj8900_state::clutsel_w)); + map(0x60, 0x60).w(FUNC(nbmj8900_state::romsel_w)); + map(0x70, 0x70).w(FUNC(nbmj8900_state::scrolly_w)); map(0x80, 0x81).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); @@ -127,8 +127,8 @@ void nbmj8900_state::ohpaipee_io_map(address_map &map) map(0xa0, 0xa0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport1_r), FUNC(nb1413m3_device::inputportsel_w)); map(0xb0, 0xb0).rw(m_nb1413m3, FUNC(nb1413m3_device::inputport2_r), FUNC(nb1413m3_device::sndrombank1_w)); map(0xc0, 0xc0).r(m_nb1413m3, FUNC(nb1413m3_device::inputport3_r)); - map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::write)); - map(0xe0, 0xe0).w(this, FUNC(nbmj8900_state::vramsel_w)); + map(0xd0, 0xd0).w("dac", FUNC(dac_byte_interface::data_w)); + map(0xe0, 0xe0).w(FUNC(nbmj8900_state::vramsel_w)); map(0xf0, 0xf0).r(m_nb1413m3, FUNC(nb1413m3_device::dipsw1_r)); map(0xf1, 0xf1).rw(m_nb1413m3, FUNC(nb1413m3_device::dipsw2_r), FUNC(nb1413m3_device::outcoin_w)); } |