diff options
author | Vas Crabb <vas@vastheman.com> | 2018-06-08 01:29:39 +1000 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2018-06-08 01:29:39 +1000 |
commit | 93eaa6a4943ade6513257a740fcde97ca9468559 (patch) | |
tree | 1340f2160a7064a839b7ca649b2257489cdd3d6d /src/mame/drivers/20pacgal.cpp | |
parent | fafafe7050e4d04230656215b840ac53aad081e7 (diff) |
as if millions of this pointers suddenly cried out in terror, and were suddenly silenced
* streamline templates in addrmap.h
* get rid of overloads on read/write member names - this will become even more important in the near future
Diffstat (limited to 'src/mame/drivers/20pacgal.cpp')
-rw-r--r-- | src/mame/drivers/20pacgal.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/mame/drivers/20pacgal.cpp b/src/mame/drivers/20pacgal.cpp index 15e2cb4d4f6..86b2bfd2189 100644 --- a/src/mame/drivers/20pacgal.cpp +++ b/src/mame/drivers/20pacgal.cpp @@ -193,10 +193,10 @@ void _25pacman_state::_25pacman_map(address_map &map) map(0x04000, 0x047ff).ram().share("video_ram"); map(0x04800, 0x05fff).ram(); map(0x06000, 0x06fff).writeonly().share("char_gfx_ram"); - map(0x07000, 0x0717f).w(this, FUNC(_25pacman_state::sprite_ram_w)); + map(0x07000, 0x0717f).w(FUNC(_25pacman_state::sprite_ram_w)); // AM_RANGE(0x08000, 0x09fff) AM_READ_BANK("bank1") AM_WRITE(ram_48000_w) map(0x08000, 0x09fff).nopw(); - map(0x0a000, 0x0bfff).w(this, FUNC(_25pacman_state::sprite_gfx_w)); + map(0x0a000, 0x0bfff).w(FUNC(_25pacman_state::sprite_gfx_w)); map(0x0c000, 0x0dfff).nopw(); // is this the sound waveforms in a different format? map(0x0e000, 0x0ffff).nopw(); map(0x1c000, 0x1ffff).nopw(); @@ -215,11 +215,11 @@ void _20pacgal_state::_20pacgal_map(address_map &map) map(0x45f00, 0x45fff).w("namco", FUNC(namco_cus30_device::namcos1_cus30_w)); map(0x46000, 0x46fff).writeonly().share("char_gfx_ram"); map(0x47100, 0x47100).ram(); /* leftover from original Galaga code */ - map(0x48000, 0x49fff).bankr("bank1").w(this, FUNC(_20pacgal_state::ram_48000_w)); /* this should be a mirror of 08000-09fff */ - map(0x4c000, 0x4dfff).w(this, FUNC(_20pacgal_state::sprite_gfx_w)); - map(0x4e000, 0x4e17f).w(this, FUNC(_20pacgal_state::sprite_ram_w)); + map(0x48000, 0x49fff).bankr("bank1").w(FUNC(_20pacgal_state::ram_48000_w)); /* this should be a mirror of 08000-09fff */ + map(0x4c000, 0x4dfff).w(FUNC(_20pacgal_state::sprite_gfx_w)); + map(0x4e000, 0x4e17f).w(FUNC(_20pacgal_state::sprite_ram_w)); map(0x4e180, 0x4feff).nopw(); - map(0x4ff00, 0x4ffff).w(this, FUNC(_20pacgal_state::sprite_lookup_w)); + map(0x4ff00, 0x4ffff).w(FUNC(_20pacgal_state::sprite_lookup_w)); } @@ -243,18 +243,18 @@ void _25pacman_state::_25pacman_io_map(address_map &map) map(0x81, 0x81).portr("P2"); map(0x82, 0x82).portr("SERVICE"); map(0x80, 0x80).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x81, 0x81).w(this, FUNC(_25pacman_state::timer_pulse_w)); /* ??? pulsed by the timer irq */ - map(0x82, 0x82).w(this, FUNC(_25pacman_state::irqack_w)); + map(0x81, 0x81).w(FUNC(_25pacman_state::timer_pulse_w)); /* ??? pulsed by the timer irq */ + map(0x82, 0x82).w(FUNC(_25pacman_state::irqack_w)); // AM_RANGE(0x84, 0x84) AM_NOP /* ?? */ map(0x85, 0x86).writeonly().share("stars_seed"); /* stars: rng seed (lo/hi) */ - map(0x87, 0x87).r(this, FUNC(_25pacman_state::_25pacman_io_87_r)); // not eeprom on this + map(0x87, 0x87).r(FUNC(_25pacman_state::_25pacman_io_87_r)); // not eeprom on this map(0x87, 0x87).nopw(); // AM_RANGE(0x88, 0x88) AM_WRITE(ram_bank_select_w) - map(0x89, 0x89).w("dac", FUNC(dac_byte_interface::write)); + map(0x89, 0x89).w("dac", FUNC(dac_byte_interface::data_w)); map(0x8a, 0x8a).writeonly().share("stars_ctrl"); /* stars: bits 3-4 = active set; bit 5 = enable */ map(0x8b, 0x8b).writeonly().share("flip"); map(0x8c, 0x8c).nopw(); - map(0x8f, 0x8f).w(this, FUNC(_25pacman_state::_20pacgal_coin_counter_w)); + map(0x8f, 0x8f).w(FUNC(_25pacman_state::_20pacgal_coin_counter_w)); } void _20pacgal_state::_20pacgal_io_map(address_map &map) @@ -266,16 +266,16 @@ void _20pacgal_state::_20pacgal_io_map(address_map &map) map(0x81, 0x81).portr("P2"); map(0x82, 0x82).portr("SERVICE"); map(0x80, 0x80).w("watchdog", FUNC(watchdog_timer_device::reset_w)); - map(0x81, 0x81).w(this, FUNC(_20pacgal_state::timer_pulse_w)); /* ??? pulsed by the timer irq */ - map(0x82, 0x82).w(this, FUNC(_20pacgal_state::irqack_w)); + map(0x81, 0x81).w(FUNC(_20pacgal_state::timer_pulse_w)); /* ??? pulsed by the timer irq */ + map(0x82, 0x82).w(FUNC(_20pacgal_state::irqack_w)); map(0x84, 0x84).noprw(); /* ?? */ map(0x85, 0x86).writeonly().share("stars_seed"); /* stars: rng seed (lo/hi) */ map(0x87, 0x87).portr("EEPROMIN").portw("EEPROMOUT"); - map(0x88, 0x88).w(this, FUNC(_20pacgal_state::ram_bank_select_w)); - map(0x89, 0x89).w("dac", FUNC(dac_byte_interface::write)); + map(0x88, 0x88).w(FUNC(_20pacgal_state::ram_bank_select_w)); + map(0x89, 0x89).w("dac", FUNC(dac_byte_interface::data_w)); map(0x8a, 0x8a).writeonly().share("stars_ctrl"); /* stars: bits 3-4 = active set; bit 5 = enable */ map(0x8b, 0x8b).writeonly().share("flip"); - map(0x8f, 0x8f).w(this, FUNC(_20pacgal_state::_20pacgal_coin_counter_w)); + map(0x8f, 0x8f).w(FUNC(_20pacgal_state::_20pacgal_coin_counter_w)); } |