summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/neogeo.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/neogeo.cpp')
-rw-r--r--src/mame/drivers/neogeo.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/mame/drivers/neogeo.cpp b/src/mame/drivers/neogeo.cpp
index 682e7392d90..bf6e295dcac 100644
--- a/src/mame/drivers/neogeo.cpp
+++ b/src/mame/drivers/neogeo.cpp
@@ -1680,32 +1680,32 @@ READ16_MEMBER(neogeo_base_state::banked_vectors_r)
void neogeo_base_state::base_main_map(address_map &map)
{
- map(0x320000, 0x320000).mirror(0x01fffe).w(this, FUNC(neogeo_base_state::audio_command_w));
- map(0x360000, 0x37ffff).r(this, FUNC(neogeo_base_state::unmapped_r));
- map(0x380000, 0x3800ff).mirror(0x01ff00).w(this, FUNC(neogeo_base_state::io_control_w)).umask16(0x00ff);
- map(0x3a0000, 0x3a001f).mirror(0x01ffe0).r(this, FUNC(neogeo_base_state::unmapped_r));
+ map(0x320000, 0x320000).mirror(0x01fffe).w(FUNC(neogeo_base_state::audio_command_w));
+ map(0x360000, 0x37ffff).r(FUNC(neogeo_base_state::unmapped_r));
+ map(0x380000, 0x3800ff).mirror(0x01ff00).w(FUNC(neogeo_base_state::io_control_w)).umask16(0x00ff);
+ map(0x3a0000, 0x3a001f).mirror(0x01ffe0).r(FUNC(neogeo_base_state::unmapped_r));
map(0x3a0000, 0x3a001f).mirror(0x01ffe0).w("systemlatch", FUNC(hc259_device::write_a3)).umask16(0x00ff); // BITW1 (system control registers)
- map(0x3c0000, 0x3c0007).mirror(0x01fff8).r(this, FUNC(neogeo_base_state::video_register_r));
- map(0x3c0000, 0x3c000f).mirror(0x01fff0).w(this, FUNC(neogeo_base_state::video_register_w));
- map(0x3e0000, 0x3fffff).r(this, FUNC(neogeo_base_state::unmapped_r));
- map(0x400000, 0x401fff).mirror(0x3fe000).rw(this, FUNC(neogeo_base_state::paletteram_r), FUNC(neogeo_base_state::paletteram_w));
+ map(0x3c0000, 0x3c0007).mirror(0x01fff8).r(FUNC(neogeo_base_state::video_register_r));
+ map(0x3c0000, 0x3c000f).mirror(0x01fff0).w(FUNC(neogeo_base_state::video_register_w));
+ map(0x3e0000, 0x3fffff).r(FUNC(neogeo_base_state::unmapped_r));
+ map(0x400000, 0x401fff).mirror(0x3fe000).rw(FUNC(neogeo_base_state::paletteram_r), FUNC(neogeo_base_state::paletteram_w));
}
void ngarcade_base_state::neogeo_main_map(address_map &map)
{
base_main_map(map);
- map(0x000000, 0x00007f).r(this, FUNC(ngarcade_base_state::banked_vectors_r));
+ map(0x000000, 0x00007f).r(FUNC(ngarcade_base_state::banked_vectors_r));
map(0x100000, 0x10ffff).mirror(0x0f0000).ram();
// some games have protection devices in the 0x200000 region, it appears to map to cart space, not surprising, the ROM is read here too
map(0x300080, 0x300081).mirror(0x01ff7e).portr("TEST");
map(0x300001, 0x300001).mirror(0x01fffe).w("watchdog", FUNC(watchdog_timer_device::reset_w));
map(0x320000, 0x320001).mirror(0x01fffe).portr("AUDIO/COIN");
map(0x380000, 0x380001).mirror(0x01fffe).portr("SYSTEM");
- map(0x800000, 0x800fff).r(this, FUNC(ngarcade_base_state::unmapped_r)); // memory card mapped here if present
+ map(0x800000, 0x800fff).r(FUNC(ngarcade_base_state::unmapped_r)); // memory card mapped here if present
map(0xc00000, 0xc1ffff).mirror(0x0e0000).rom().region("mainbios", 0);
- map(0xd00000, 0xd0ffff).mirror(0x0f0000).ram().w(this, FUNC(ngarcade_base_state::save_ram_w)).share("saveram");
- map(0xe00000, 0xffffff).r(this, FUNC(ngarcade_base_state::unmapped_r));
+ map(0xd00000, 0xd0ffff).mirror(0x0f0000).ram().w(FUNC(ngarcade_base_state::save_ram_w)).share("saveram");
+ map(0xe00000, 0xffffff).r(FUNC(ngarcade_base_state::unmapped_r));
}
@@ -1725,19 +1725,19 @@ void aes_base_state::aes_base_main_map(address_map &map)
map(0x300000, 0x300000).mirror(0x01fffe).r(m_ctrl1, FUNC(neogeo_control_port_device::ctrl_r));
map(0x320000, 0x320001).mirror(0x01fffe).portr("AUDIO");
map(0x340000, 0x340000).mirror(0x01fffe).r(m_ctrl2, FUNC(neogeo_control_port_device::ctrl_r));
- map(0x380000, 0x380001).mirror(0x01fffe).r(this, FUNC(aes_base_state::aes_in2_r));
+ map(0x380000, 0x380001).mirror(0x01fffe).r(FUNC(aes_base_state::aes_in2_r));
}
void aes_state::aes_main_map(address_map &map)
{
aes_base_main_map(map);
- map(0x000000, 0x00007f).r(this, FUNC(aes_state::banked_vectors_r));
+ map(0x000000, 0x00007f).r(FUNC(aes_state::banked_vectors_r));
map(0x100000, 0x10ffff).mirror(0x0f0000).ram();
// some games have protection devices in the 0x200000 region, it appears to map to cart space, not surprising, the ROM is read here too
- map(0x800000, 0x800fff).rw(this, FUNC(aes_state::memcard_r), FUNC(aes_state::memcard_w));
+ map(0x800000, 0x800fff).rw(FUNC(aes_state::memcard_r), FUNC(aes_state::memcard_w));
map(0xc00000, 0xc1ffff).mirror(0x0e0000).rom().region("mainbios", 0);
- map(0xd00000, 0xffffff).r(this, FUNC(aes_state::unmapped_r));
+ map(0xd00000, 0xffffff).r(FUNC(aes_state::unmapped_r));
}
@@ -1769,8 +1769,8 @@ void neogeo_base_state::audio_io_map(address_map &map)
{
map(0x00, 0x00).mirror(0xff00).rw(m_soundlatch, FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::clear_w));
map(0x04, 0x07).mirror(0xff00).rw(m_ym, FUNC(ym2610_device::read), FUNC(ym2610_device::write));
- map(0x08, 0x08).mirror(0xff00).select(0x0010).w(this, FUNC(neogeo_base_state::audio_cpu_enable_nmi_w));
- map(0x08, 0x0b).mirror(0x00f0).select(0xff00).r(this, FUNC(neogeo_base_state::audio_cpu_bank_select_r));
+ map(0x08, 0x08).mirror(0xff00).select(0x0010).w(FUNC(neogeo_base_state::audio_cpu_enable_nmi_w));
+ map(0x08, 0x0b).mirror(0x00f0).select(0xff00).r(FUNC(neogeo_base_state::audio_cpu_bank_select_r));
map(0x0c, 0x0c).mirror(0xff00).w(m_soundlatch2, FUNC(generic_latch_8_device::write));
}