diff options
Diffstat (limited to 'src/mame/drivers/f1gp.cpp')
-rw-r--r-- | src/mame/drivers/f1gp.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/mame/drivers/f1gp.cpp b/src/mame/drivers/f1gp.cpp index a2d8ad79c8d..9634e1f98f7 100644 --- a/src/mame/drivers/f1gp.cpp +++ b/src/mame/drivers/f1gp.cpp @@ -58,26 +58,26 @@ void f1gp_state::f1gp_cpu1_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x100000, 0x2fffff).rom().region("user1", 0); map(0xa00000, 0xbfffff).rom().region("user2", 0); - map(0xc00000, 0xc3ffff).rw(this, FUNC(f1gp_state::f1gp_zoomdata_r), FUNC(f1gp_state::f1gp_zoomdata_w)); - map(0xd00000, 0xd01fff).rw(this, FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)).share("rozvideoram"); - map(0xd02000, 0xd03fff).rw(this, FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)); /* mirror */ - map(0xd04000, 0xd05fff).rw(this, FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)); /* mirror */ - map(0xd06000, 0xd07fff).rw(this, FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)); /* mirror */ + map(0xc00000, 0xc3ffff).rw(FUNC(f1gp_state::f1gp_zoomdata_r), FUNC(f1gp_state::f1gp_zoomdata_w)); + map(0xd00000, 0xd01fff).rw(FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)).share("rozvideoram"); + map(0xd02000, 0xd03fff).rw(FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)); /* mirror */ + map(0xd04000, 0xd05fff).rw(FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)); /* mirror */ + map(0xd06000, 0xd07fff).rw(FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)); /* mirror */ map(0xe00000, 0xe03fff).ram().share("spr1cgram"); // SPR-1 CG RAM map(0xe04000, 0xe07fff).ram().share("spr2cgram"); // SPR-2 CG RAM map(0xf00000, 0xf003ff).ram().share("spr1vram"); // SPR-1 VRAM map(0xf10000, 0xf103ff).ram().share("spr2vram"); // SPR-2 VRAM map(0xff8000, 0xffbfff).ram(); // WORK RAM-1 map(0xffc000, 0xffcfff).ram().share("sharedram"); // DUAL RAM - map(0xffd000, 0xffdfff).ram().w(this, FUNC(f1gp_state::f1gp_fgvideoram_w)).share("fgvideoram"); // CHARACTER + map(0xffd000, 0xffdfff).ram().w(FUNC(f1gp_state::f1gp_fgvideoram_w)).share("fgvideoram"); // CHARACTER map(0xffe000, 0xffefff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // PALETTE map(0xfff000, 0xfff001).portr("INPUTS"); - map(0xfff000, 0xfff001).w(this, FUNC(f1gp_state::f1gp_gfxctrl_w)); + map(0xfff000, 0xfff001).w(FUNC(f1gp_state::f1gp_gfxctrl_w)); map(0xfff002, 0xfff003).portr("WHEEL"); map(0xfff004, 0xfff005).portr("DSW1"); - map(0xfff002, 0xfff005).w(this, FUNC(f1gp_state::f1gp_fgscroll_w)); + map(0xfff002, 0xfff005).w(FUNC(f1gp_state::f1gp_fgscroll_w)); map(0xfff006, 0xfff007).portr("DSW2"); - map(0xfff009, 0xfff009).r(this, FUNC(f1gp_state::command_pending_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask16(0x00ff); + map(0xfff009, 0xfff009).r(FUNC(f1gp_state::command_pending_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask16(0x00ff); map(0xfff020, 0xfff023).w("gga", FUNC(vsystem_gga_device::write)).umask16(0x00ff); map(0xfff040, 0xfff05f).w(m_k053936, FUNC(k053936_device::ctrl_w)); map(0xfff050, 0xfff051).portr("DSW3"); @@ -88,20 +88,20 @@ void f1gp_state::f1gp2_cpu1_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x100000, 0x2fffff).rom().region("user1", 0); map(0xa00000, 0xa07fff).ram().share("sprcgram"); // SPR-1 CG RAM + SPR-2 CG RAM - map(0xd00000, 0xd01fff).rw(this, FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)).share("rozvideoram"); // BACK VRAM + map(0xd00000, 0xd01fff).rw(FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)).share("rozvideoram"); // BACK VRAM map(0xe00000, 0xe00fff).ram().share("spritelist"); // not checked + SPR-1 VRAM + SPR-2 VRAM map(0xff8000, 0xffbfff).ram(); // WORK RAM-1 map(0xffc000, 0xffcfff).ram().share("sharedram"); // DUAL RAM - map(0xffd000, 0xffdfff).ram().w(this, FUNC(f1gp_state::f1gp_fgvideoram_w)).share("fgvideoram"); // CHARACTER + map(0xffd000, 0xffdfff).ram().w(FUNC(f1gp_state::f1gp_fgvideoram_w)).share("fgvideoram"); // CHARACTER map(0xffe000, 0xffefff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // PALETTE - map(0xfff000, 0xfff001).portr("INPUTS").w(this, FUNC(f1gp_state::f1gp2_gfxctrl_w)); + map(0xfff000, 0xfff001).portr("INPUTS").w(FUNC(f1gp_state::f1gp2_gfxctrl_w)); map(0xfff002, 0xfff003).portr("WHEEL"); map(0xfff004, 0xfff005).portr("DSW1"); map(0xfff006, 0xfff007).portr("DSW2"); - map(0xfff009, 0xfff009).r(this, FUNC(f1gp_state::command_pending_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask16(0x00ff); + map(0xfff009, 0xfff009).r(FUNC(f1gp_state::command_pending_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask16(0x00ff); map(0xfff00a, 0xfff00b).portr("DSW3"); map(0xfff020, 0xfff03f).w(m_k053936, FUNC(k053936_device::ctrl_w)); - map(0xfff044, 0xfff047).w(this, FUNC(f1gp_state::f1gp_fgscroll_w)); + map(0xfff044, 0xfff047).w(FUNC(f1gp_state::f1gp_fgscroll_w)); } void f1gp_state::f1gp_cpu2_map(address_map &map) @@ -122,8 +122,8 @@ void f1gp_state::sound_map(address_map &map) void f1gp_state::sound_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w(this, FUNC(f1gp_state::f1gp_sh_bankswitch_w)); // f1gp - map(0x0c, 0x0c).w(this, FUNC(f1gp_state::f1gp_sh_bankswitch_w)); // f1gp2 + map(0x00, 0x00).w(FUNC(f1gp_state::f1gp_sh_bankswitch_w)); // f1gp + map(0x0c, 0x0c).w(FUNC(f1gp_state::f1gp_sh_bankswitch_w)); // f1gp2 map(0x14, 0x14).rw(m_soundlatch, FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::acknowledge_w)); map(0x18, 0x1b).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write)); } @@ -159,18 +159,18 @@ void f1gp_state::f1gpb_cpu1_map(address_map &map) map(0x100000, 0x2fffff).rom().region("user1", 0); map(0xa00000, 0xbfffff).rom().region("user2", 0); map(0x800000, 0x801fff).ram().share("spriteram"); - map(0xc00000, 0xc3ffff).rw(this, FUNC(f1gp_state::f1gp_zoomdata_r), FUNC(f1gp_state::f1gp_zoomdata_w)); - map(0xd00000, 0xd01fff).rw(this, FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)).share("rozvideoram"); - map(0xd02000, 0xd03fff).rw(this, FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)); /* mirror */ - map(0xd04000, 0xd05fff).rw(this, FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)); /* mirror */ - map(0xd06000, 0xd07fff).rw(this, FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)); /* mirror */ + map(0xc00000, 0xc3ffff).rw(FUNC(f1gp_state::f1gp_zoomdata_r), FUNC(f1gp_state::f1gp_zoomdata_w)); + map(0xd00000, 0xd01fff).rw(FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)).share("rozvideoram"); + map(0xd02000, 0xd03fff).rw(FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)); /* mirror */ + map(0xd04000, 0xd05fff).rw(FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)); /* mirror */ + map(0xd06000, 0xd07fff).rw(FUNC(f1gp_state::f1gp_rozvideoram_r), FUNC(f1gp_state::f1gp_rozvideoram_w)); /* mirror */ map(0xe00000, 0xe03fff).ram(); //unused map(0xe04000, 0xe07fff).ram(); //unused map(0xf00000, 0xf003ff).ram(); //unused map(0xf10000, 0xf103ff).ram(); //unused map(0xff8000, 0xffbfff).ram(); map(0xffc000, 0xffcfff).ram().share("sharedram"); - map(0xffd000, 0xffdfff).ram().w(this, FUNC(f1gp_state::f1gp_fgvideoram_w)).share("fgvideoram"); + map(0xffd000, 0xffdfff).ram().w(FUNC(f1gp_state::f1gp_fgvideoram_w)).share("fgvideoram"); map(0xffe000, 0xffefff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xfff000, 0xfff001).portr("INPUTS"); map(0xfff002, 0xfff003).portr("WHEEL"); @@ -180,7 +180,7 @@ void f1gp_state::f1gpb_cpu1_map(address_map &map) map(0xfff006, 0xfff007).nopw(); map(0xfff00a, 0xfff00b).ram().share("fgregs"); map(0xfff00f, 0xfff00f).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0xfff00c, 0xfff00d).w(this, FUNC(f1gp_state::f1gpb_misc_w)); + map(0xfff00c, 0xfff00d).w(FUNC(f1gp_state::f1gpb_misc_w)); map(0xfff010, 0xfff011).nopw(); map(0xfff020, 0xfff023).nopw(); // GGA access map(0xfff050, 0xfff051).portr("DSW3"); |