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/konamigx.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/konamigx.cpp')
-rw-r--r-- | src/mame/drivers/konamigx.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/mame/drivers/konamigx.cpp b/src/mame/drivers/konamigx.cpp index 42c60706af5..f08967a5dcf 100644 --- a/src/mame/drivers/konamigx.cpp +++ b/src/mame/drivers/konamigx.cpp @@ -996,7 +996,7 @@ void konamigx_state::gx_base_memmap(address_map &map) map(0xd21000, 0xd21fff).ram(); // second bank of sprite RAM, accessed thru ESC map(0xd22000, 0xd23fff).ram(); // extra bank checked at least by sexyparo, pending further investigation. map(0xd40000, 0xd4003f).w(m_k056832, FUNC(k056832_device::long_w)); - map(0xd44000, 0xd4400f).w(this, FUNC(konamigx_state::konamigx_tilebank_w)); + map(0xd44000, 0xd4400f).w(FUNC(konamigx_state::konamigx_tilebank_w)); map(0xd48000, 0xd48007).w(m_k055673, FUNC(k055673_device::k053246_word_w)); map(0xd4a000, 0xd4a00f).r(m_k055673, FUNC(k055673_device::k055673_rom_word_r)); map(0xd4a010, 0xd4a01f).w(m_k055673, FUNC(k055673_device::k055673_reg_word_w)); @@ -1004,8 +1004,8 @@ void konamigx_state::gx_base_memmap(address_map &map) map(0xd4e000, 0xd4e01f).nopw(); // left-over for "secondary" CCU, apparently (used by type 3/4 for slave screen?) map(0xd50000, 0xd500ff).w(m_k055555, FUNC(k055555_device::K055555_long_w)); map(0xd52000, 0xd5201f).rw(m_k056800, FUNC(k056800_device::host_r), FUNC(k056800_device::host_w)).umask32(0xff00ff00); - map(0xd56000, 0xd56003).w(this, FUNC(konamigx_state::eeprom_w)); - map(0xd58000, 0xd58003).w(this, FUNC(konamigx_state::control_w)); + map(0xd56000, 0xd56003).w(FUNC(konamigx_state::eeprom_w)); + map(0xd58000, 0xd58003).w(FUNC(konamigx_state::control_w)); map(0xd5a000, 0xd5a003).portr("SYSTEM_DSW"); map(0xd5c000, 0xd5c003).portr("INPUTS"); map(0xd5e000, 0xd5e003).portr("SERVICE"); @@ -1022,14 +1022,14 @@ void konamigx_state::gx_type1_map(address_map &map) map(0xdd0000, 0xdd00ff).nopr().nopw(); // LAN board map(0xdda000, 0xddafff).portw("ADC-WRPORT"); map(0xddc000, 0xddcfff).portr("ADC-RDPORT"); - map(0xdde000, 0xdde003).w(this, FUNC(konamigx_state::type1_cablamps_w)); + map(0xdde000, 0xdde003).w(FUNC(konamigx_state::type1_cablamps_w)); map(0xe00000, 0xe0001f).ram().share("k053936_0_ctrl"); map(0xe20000, 0xe2000f).nopw(); map(0xe40000, 0xe40003).nopw(); map(0xe80000, 0xe81fff).ram().share("k053936_0_line"); // chips 21L+19L / S - map(0xec0000, 0xedffff).ram().w(this, FUNC(konamigx_state::konamigx_t1_psacmap_w)).share("psacram"); // chips 20J+23J+18J / S - map(0xf00000, 0xf3ffff).r(this, FUNC(konamigx_state::type1_roz_r1)); // ROM readback - map(0xf40000, 0xf7ffff).r(this, FUNC(konamigx_state::type1_roz_r2)); // ROM readback + map(0xec0000, 0xedffff).ram().w(FUNC(konamigx_state::konamigx_t1_psacmap_w)).share("psacram"); // chips 20J+23J+18J / S + map(0xf00000, 0xf3ffff).r(FUNC(konamigx_state::type1_roz_r1)); // ROM readback + map(0xf40000, 0xf7ffff).r(FUNC(konamigx_state::type1_roz_r2)); // ROM readback map(0xf80000, 0xf80fff).ram(); // chip 21Q / S map(0xfc0000, 0xfc00ff).ram(); // chip 22N / S } @@ -1037,7 +1037,7 @@ void konamigx_state::gx_type1_map(address_map &map) void konamigx_state::gx_type2_map(address_map &map) { gx_base_memmap(map); - map(0xcc0000, 0xcc0003).w(this, FUNC(konamigx_state::esc_w)); + map(0xcc0000, 0xcc0003).w(FUNC(konamigx_state::esc_w)); map(0xd90000, 0xd97fff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); } @@ -1048,18 +1048,18 @@ void konamigx_state::gx_type3_map(address_map &map) //AM_RANGE(0xcc0000, 0xcc0007) AM_WRITE(type4_prot_w) map(0xe00000, 0xe0001f).ram().share("k053936_0_ctrl"); //AM_RANGE(0xe20000, 0xe20003) AM_WRITENOP - map(0xe40000, 0xe40003).w(this, FUNC(konamigx_state::konamigx_type3_psac2_bank_w)).share("psac2_bank"); + map(0xe40000, 0xe40003).w(FUNC(konamigx_state::konamigx_type3_psac2_bank_w)).share("psac2_bank"); map(0xe60000, 0xe60fff).ram().share("k053936_0_line"); map(0xe80000, 0xe83fff).ram().share("paletteram"); // main monitor palette map(0xea0000, 0xea3fff).ram().share("subpaletteram"); - map(0xec0000, 0xec0003).r(this, FUNC(konamigx_state::type3_sync_r)); + map(0xec0000, 0xec0003).r(FUNC(konamigx_state::type3_sync_r)); //AM_RANGE(0xf00000, 0xf07fff) AM_RAM } void konamigx_state::gx_type4_map(address_map &map) { gx_base_memmap(map); - map(0xcc0000, 0xcc0007).w(this, FUNC(konamigx_state::type4_prot_w)); + map(0xcc0000, 0xcc0007).w(FUNC(konamigx_state::type4_prot_w)); map(0xd90000, 0xd97fff).ram(); map(0xe00000, 0xe0001f).ram().share("k053936_0_ctrl"); map(0xe20000, 0xe20003).nopw(); @@ -1067,8 +1067,8 @@ void konamigx_state::gx_type4_map(address_map &map) map(0xe60000, 0xe60fff).ram().share("k053936_0_line"); // 29C & 29G (PSAC2 line control) map(0xe80000, 0xe87fff).ram().share("paletteram"); // 11G/13G/15G (main screen palette RAM) map(0xea0000, 0xea7fff).ram().share("subpaletteram"); // 5G/7G/9G (sub screen palette RAM) - map(0xec0000, 0xec0003).r(this, FUNC(konamigx_state::type3_sync_r)); // type 4 polls this too - map(0xf00000, 0xf07fff).ram().w(this, FUNC(konamigx_state::konamigx_t4_psacmap_w)).share("psacram"); // PSAC2 tilemap + map(0xec0000, 0xec0003).r(FUNC(konamigx_state::type3_sync_r)); // type 4 polls this too + map(0xf00000, 0xf07fff).ram().w(FUNC(konamigx_state::konamigx_t4_psacmap_w)).share("psacram"); // PSAC2 tilemap // AM_RANGE(0xf00000, 0xf07fff) AM_RAM } @@ -1115,9 +1115,9 @@ void konamigx_state::gxsndmap(address_map &map) map(0x100000, 0x10ffff).ram(); map(0x200000, 0x2004ff).rw(m_k054539_1, FUNC(k054539_device::read), FUNC(k054539_device::write)).umask16(0xff00); map(0x200000, 0x2004ff).rw(m_k054539_2, FUNC(k054539_device::read), FUNC(k054539_device::write)).umask16(0x00ff); - map(0x300000, 0x300001).rw(this, FUNC(konamigx_state::tms57002_data_word_r), FUNC(konamigx_state::tms57002_data_word_w)); + map(0x300000, 0x300001).rw(FUNC(konamigx_state::tms57002_data_word_r), FUNC(konamigx_state::tms57002_data_word_w)); map(0x400000, 0x40001f).rw(m_k056800, FUNC(k056800_device::sound_r), FUNC(k056800_device::sound_w)).umask16(0x00ff); - map(0x500000, 0x500001).rw(this, FUNC(konamigx_state::tms57002_status_word_r), FUNC(konamigx_state::tms57002_control_word_w)); + map(0x500000, 0x500001).rw(FUNC(konamigx_state::tms57002_status_word_r), FUNC(konamigx_state::tms57002_control_word_w)); map(0x580000, 0x580001).nopw(); // 'NRES' - D2: K056602 /RESET } |