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/sderby.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/sderby.cpp')
-rw-r--r-- | src/mame/drivers/sderby.cpp | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/src/mame/drivers/sderby.cpp b/src/mame/drivers/sderby.cpp index d1e2427b758..08cb316ae04 100644 --- a/src/mame/drivers/sderby.cpp +++ b/src/mame/drivers/sderby.cpp @@ -299,15 +299,15 @@ WRITE16_MEMBER(sderby_state::roulette_out_w) void sderby_state::sderby_map(address_map &map) { map(0x000000, 0x07ffff).rom(); - map(0x100000, 0x100fff).ram().w(this, FUNC(sderby_state::sderby_videoram_w)).share("videoram"); /* bg */ - map(0x101000, 0x101fff).ram().w(this, FUNC(sderby_state::sderby_md_videoram_w)).share("md_videoram"); /* mid */ - map(0x102000, 0x103fff).ram().w(this, FUNC(sderby_state::sderby_fg_videoram_w)).share("fg_videoram"); /* fg */ - map(0x104000, 0x10400b).w(this, FUNC(sderby_state::sderby_scroll_w)); + map(0x100000, 0x100fff).ram().w(FUNC(sderby_state::sderby_videoram_w)).share("videoram"); /* bg */ + map(0x101000, 0x101fff).ram().w(FUNC(sderby_state::sderby_md_videoram_w)).share("md_videoram"); /* mid */ + map(0x102000, 0x103fff).ram().w(FUNC(sderby_state::sderby_fg_videoram_w)).share("fg_videoram"); /* fg */ + map(0x104000, 0x10400b).w(FUNC(sderby_state::sderby_scroll_w)); map(0x10400c, 0x10400d).nopw(); /* ??? - check code at 0x000456 (executed once at startup) */ map(0x10400e, 0x10400f).nopw(); /* ??? - check code at 0x000524 (executed once at startup) */ map(0x200000, 0x200fff).ram().share("spriteram"); - map(0x308000, 0x30800d).r(this, FUNC(sderby_state::sderby_input_r)); - map(0x308008, 0x308009).w(this, FUNC(sderby_state::sderby_out_w)); /* output port */ + map(0x308000, 0x30800d).r(FUNC(sderby_state::sderby_input_r)); + map(0x308008, 0x308009).w(FUNC(sderby_state::sderby_out_w)); /* output port */ map(0x30800f, 0x30800f).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x380000, 0x380fff).w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x500000, 0x500001).nopw(); /* unknown... write 0x01 in game, and 0x00 on reset */ @@ -318,15 +318,15 @@ void sderby_state::sderby_map(address_map &map) void sderby_state::sderbya_map(address_map &map) { map(0x000000, 0x07ffff).rom(); - map(0x100000, 0x100fff).ram().w(this, FUNC(sderby_state::sderby_videoram_w)).share("videoram"); /* bg */ - map(0x101000, 0x101fff).ram().w(this, FUNC(sderby_state::sderby_md_videoram_w)).share("md_videoram"); /* mid */ - map(0x102000, 0x103fff).ram().w(this, FUNC(sderby_state::sderby_fg_videoram_w)).share("fg_videoram"); /* fg */ - map(0x104000, 0x10400b).w(this, FUNC(sderby_state::sderby_scroll_w)); + map(0x100000, 0x100fff).ram().w(FUNC(sderby_state::sderby_videoram_w)).share("videoram"); /* bg */ + map(0x101000, 0x101fff).ram().w(FUNC(sderby_state::sderby_md_videoram_w)).share("md_videoram"); /* mid */ + map(0x102000, 0x103fff).ram().w(FUNC(sderby_state::sderby_fg_videoram_w)).share("fg_videoram"); /* fg */ + map(0x104000, 0x10400b).w(FUNC(sderby_state::sderby_scroll_w)); map(0x10400c, 0x10400d).nopw(); /* ??? - check code at 0x000456 (executed once at startup) */ map(0x10400e, 0x10400f).nopw(); /* ??? - check code at 0x000524 (executed once at startup) */ map(0x200000, 0x200fff).ram().share("spriteram"); - map(0x308000, 0x30800d).r(this, FUNC(sderby_state::sderbya_input_r)); - map(0x308008, 0x308009).w(this, FUNC(sderby_state::sderby_out_w)); /* output port */ + map(0x308000, 0x30800d).r(FUNC(sderby_state::sderbya_input_r)); + map(0x308008, 0x308009).w(FUNC(sderby_state::sderby_out_w)); /* output port */ map(0x30800f, 0x30800f).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x380000, 0x380fff).w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x300000, 0x300001).nopw(); /* unknown... write 0x01 in game, and 0x00 on reset */ //MOD @@ -338,15 +338,15 @@ void sderby_state::sderbya_map(address_map &map) void sderby_state::luckboom_map(address_map &map) { map(0x000000, 0x07ffff).rom(); - map(0x100000, 0x100fff).ram().w(this, FUNC(sderby_state::sderby_videoram_w)).share("videoram"); /* bg */ - map(0x101000, 0x101fff).ram().w(this, FUNC(sderby_state::sderby_md_videoram_w)).share("md_videoram"); /* mid */ - map(0x102000, 0x103fff).ram().w(this, FUNC(sderby_state::sderby_fg_videoram_w)).share("fg_videoram"); /* fg */ - map(0x104000, 0x10400b).w(this, FUNC(sderby_state::sderby_scroll_w)); + map(0x100000, 0x100fff).ram().w(FUNC(sderby_state::sderby_videoram_w)).share("videoram"); /* bg */ + map(0x101000, 0x101fff).ram().w(FUNC(sderby_state::sderby_md_videoram_w)).share("md_videoram"); /* mid */ + map(0x102000, 0x103fff).ram().w(FUNC(sderby_state::sderby_fg_videoram_w)).share("fg_videoram"); /* fg */ + map(0x104000, 0x10400b).w(FUNC(sderby_state::sderby_scroll_w)); map(0x10400c, 0x10400d).nopw(); /* ??? - check code at 0x000456 (executed once at startup) */ map(0x10400e, 0x10400f).nopw(); /* ??? - check code at 0x000524 (executed once at startup) */ map(0x200000, 0x200fff).ram().share("spriteram"); - map(0x308000, 0x30800d).r(this, FUNC(sderby_state::sderby_input_r)); - map(0x308008, 0x308009).w(this, FUNC(sderby_state::sderby_out_w)); /* output port */ + map(0x308000, 0x30800d).r(FUNC(sderby_state::sderby_input_r)); + map(0x308008, 0x308009).w(FUNC(sderby_state::sderby_out_w)); /* output port */ map(0x30800f, 0x30800f).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x380000, 0x380fff).w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x500000, 0x500001).nopw(); /* unknown... write 0x01 in game, and 0x00 on reset */ @@ -357,16 +357,16 @@ void sderby_state::luckboom_map(address_map &map) void sderby_state::spacewin_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x100000, 0x100fff).ram().w(this, FUNC(sderby_state::sderby_videoram_w)).share("videoram"); /* bg */ - map(0x101000, 0x101fff).ram().w(this, FUNC(sderby_state::sderby_md_videoram_w)).share("md_videoram"); /* mid */ - map(0x102000, 0x103fff).ram().w(this, FUNC(sderby_state::sderby_fg_videoram_w)).share("fg_videoram"); /* fg */ - map(0x104000, 0x10400b).w(this, FUNC(sderby_state::sderby_scroll_w)); /* tilemaps offset control */ + map(0x100000, 0x100fff).ram().w(FUNC(sderby_state::sderby_videoram_w)).share("videoram"); /* bg */ + map(0x101000, 0x101fff).ram().w(FUNC(sderby_state::sderby_md_videoram_w)).share("md_videoram"); /* mid */ + map(0x102000, 0x103fff).ram().w(FUNC(sderby_state::sderby_fg_videoram_w)).share("fg_videoram"); /* fg */ + map(0x104000, 0x10400b).w(FUNC(sderby_state::sderby_scroll_w)); /* tilemaps offset control */ map(0x10400c, 0x10400d).nopw(); /* seems another video register. constantly used */ map(0x10400e, 0x10400f).nopw(); /* seems another video register. constantly used */ map(0x104010, 0x105fff).nopw(); /* unknown */ map(0x300000, 0x300001).nopw(); /* unknown... write 0x01 in game, and 0x00 on reset */ - map(0x308000, 0x30800d).r(this, FUNC(sderby_state::sderby_input_r)); - map(0x308008, 0x308009).w(this, FUNC(sderby_state::scmatto_out_w)); /* output port */ + map(0x308000, 0x30800d).r(FUNC(sderby_state::sderby_input_r)); + map(0x308008, 0x308009).w(FUNC(sderby_state::scmatto_out_w)); /* output port */ map(0x30800f, 0x30800f).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x380000, 0x380fff).w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xd00000, 0xd001ff).ram(); @@ -379,15 +379,15 @@ void sderby_state::spacewin_map(address_map &map) void sderby_state::shinygld_map(address_map &map) { map(0x000000, 0x03ffff).rom(); - map(0x100000, 0x100fff).ram().w(this, FUNC(sderby_state::sderby_videoram_w)).share("videoram"); /* bg */ - map(0x101000, 0x101fff).ram().w(this, FUNC(sderby_state::sderby_md_videoram_w)).share("md_videoram"); /* mid */ - map(0x102000, 0x103fff).ram().w(this, FUNC(sderby_state::sderby_fg_videoram_w)).share("fg_videoram"); /* fg */ - map(0x104000, 0x10400b).w(this, FUNC(sderby_state::sderby_scroll_w)); /* tilemaps offset control */ + map(0x100000, 0x100fff).ram().w(FUNC(sderby_state::sderby_videoram_w)).share("videoram"); /* bg */ + map(0x101000, 0x101fff).ram().w(FUNC(sderby_state::sderby_md_videoram_w)).share("md_videoram"); /* mid */ + map(0x102000, 0x103fff).ram().w(FUNC(sderby_state::sderby_fg_videoram_w)).share("fg_videoram"); /* fg */ + map(0x104000, 0x10400b).w(FUNC(sderby_state::sderby_scroll_w)); /* tilemaps offset control */ map(0x10400c, 0x10400d).nopw(); /* seems another video register. constantly used */ map(0x10400e, 0x10400f).nopw(); /* seems another video register. constantly used */ map(0x104010, 0x105fff).nopw(); /* unknown */ map(0x300000, 0x300001).nopw(); /* unknown... write 0x01 in game, and 0x00 on reset */ - map(0x308000, 0x30800d).r(this, FUNC(sderby_state::sderby_input_r)); + map(0x308000, 0x30800d).r(FUNC(sderby_state::sderby_input_r)); map(0x308008, 0x308009).nopw(); /* output port */ map(0x30800f, 0x30800f).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x380000, 0x380fff).w(m_palette, FUNC(palette_device::write16)).share("palette"); @@ -401,17 +401,17 @@ void sderby_state::roulette_map(address_map &map) { map(0x000000, 0x03ffff).rom(); map(0x440000, 0x440fff).writeonly().share("spriteram"); - map(0x500000, 0x500fff).ram().w(this, FUNC(sderby_state::sderby_videoram_w)).share("videoram"); /* bg */ - map(0x501000, 0x501fff).ram().w(this, FUNC(sderby_state::sderby_md_videoram_w)).share("md_videoram"); /* mid */ - map(0x502000, 0x503fff).ram().w(this, FUNC(sderby_state::sderby_fg_videoram_w)).share("fg_videoram"); /* fg */ - map(0x504000, 0x50400b).ram().w(this, FUNC(sderby_state::sderby_scroll_w)); + map(0x500000, 0x500fff).ram().w(FUNC(sderby_state::sderby_videoram_w)).share("videoram"); /* bg */ + map(0x501000, 0x501fff).ram().w(FUNC(sderby_state::sderby_md_videoram_w)).share("md_videoram"); /* mid */ + map(0x502000, 0x503fff).ram().w(FUNC(sderby_state::sderby_fg_videoram_w)).share("fg_videoram"); /* fg */ + map(0x504000, 0x50400b).ram().w(FUNC(sderby_state::sderby_scroll_w)); map(0x50400e, 0x50400f).nopw(); - map(0x708000, 0x708009).r(this, FUNC(sderby_state::roulette_input_r)); - map(0x708006, 0x708007).w(this, FUNC(sderby_state::roulette_out_w)); + map(0x708000, 0x708009).r(FUNC(sderby_state::roulette_input_r)); + map(0x708006, 0x708007).w(FUNC(sderby_state::roulette_out_w)); map(0x70800b, 0x70800b).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x70800c, 0x70800d).nopw(); /* watchdog?? (0x0003) */ - map(0x70800e, 0x70800f).rw(this, FUNC(sderby_state::rprot_r), FUNC(sderby_state::rprot_w)); /* MCU communication */ + map(0x70800e, 0x70800f).rw(FUNC(sderby_state::rprot_r), FUNC(sderby_state::rprot_w)); /* MCU communication */ map(0x780000, 0x780fff).w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0xff0000, 0xff07ff).ram().share("nvram"); |