diff options
Diffstat (limited to 'src/mame/drivers/jclub2.cpp')
-rw-r--r-- | src/mame/drivers/jclub2.cpp | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/src/mame/drivers/jclub2.cpp b/src/mame/drivers/jclub2.cpp index b849f97ba1b..b01af988bb8 100644 --- a/src/mame/drivers/jclub2.cpp +++ b/src/mame/drivers/jclub2.cpp @@ -584,37 +584,37 @@ void jclub2o_state::jclub2o_map(address_map &map) map(0x000000, 0x27ffff).rom(); map(0x400000, 0x41ffff).ram().share("nvram"); // battery - map(0x490000, 0x490003).w(this, FUNC(jclub2o_state::eeprom_s29290_w)); + map(0x490000, 0x490003).w(FUNC(jclub2o_state::eeprom_s29290_w)); - map(0x4a0000, 0x4a0003).w(this, FUNC(jclub2o_state::out2_w)); + map(0x4a0000, 0x4a0003).w(FUNC(jclub2o_state::out2_w)); // AM_RANGE(0x4a0010, 0x4a0013) AM_WRITE // AM_RANGE(0x4a0020, 0x4a0023) AM_WRITE // AM_RANGE(0x4a0030, 0x4a0033) AM_WRITE // ST-0016 - map(0x4b0000, 0x4b0003).rw(this, FUNC(jclub2o_state::cmd1_word_r), FUNC(jclub2o_state::cmd1_word_w)); - map(0x4b0004, 0x4b0007).rw(this, FUNC(jclub2o_state::cmd2_word_r), FUNC(jclub2o_state::cmd2_word_w)); - map(0x4b0008, 0x4b000b).r(this, FUNC(jclub2o_state::cmd_stat_word_r)); + map(0x4b0000, 0x4b0003).rw(FUNC(jclub2o_state::cmd1_word_r), FUNC(jclub2o_state::cmd1_word_w)); + map(0x4b0004, 0x4b0007).rw(FUNC(jclub2o_state::cmd2_word_r), FUNC(jclub2o_state::cmd2_word_w)); + map(0x4b0008, 0x4b000b).r(FUNC(jclub2o_state::cmd_stat_word_r)); map(0x4d0000, 0x4d0003).nopr().nopw(); // reads seem unused? this write would go to two 7-segs (but the code is never called) map(0x4d0004, 0x4d0007).nopr(); map(0x4d0008, 0x4d000b).nopr(); map(0x4d000c, 0x4d000f).nopr(); - map(0x4e0000, 0x4e0003).r(this, FUNC(jclub2o_state::p2_r)).w(this, FUNC(jclub2o_state::input_sel2_w)); + map(0x4e0000, 0x4e0003).r(FUNC(jclub2o_state::p2_r)).w(FUNC(jclub2o_state::input_sel2_w)); map(0x580000, 0x580003).portr("EEPROM"); - map(0x580004, 0x580007).r(this, FUNC(jclub2o_state::p1_r)); + map(0x580004, 0x580007).r(FUNC(jclub2o_state::p1_r)); map(0x580008, 0x58000b).portr("COIN"); - map(0x58000c, 0x58000f).w(this, FUNC(jclub2o_state::input_sel1_out3_w)); - map(0x580010, 0x580013).w(this, FUNC(jclub2o_state::out1_w)); + map(0x58000c, 0x58000f).w(FUNC(jclub2o_state::input_sel1_out3_w)); + map(0x580010, 0x580013).w(FUNC(jclub2o_state::out1_w)); // AM_RANGE(0x580018, 0x58001b) AM_WRITE // AM_RANGE(0x58001c, 0x58001f) AM_WRITE map(0x580200, 0x580201).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); - map(0x580401, 0x580401).rw(this, FUNC(jclub2o_state::console_r), FUNC(jclub2o_state::console_w)); - map(0x580421, 0x580421).r(this, FUNC(jclub2o_state::console_status_r)); //AM_WRITE + map(0x580401, 0x580401).rw(FUNC(jclub2o_state::console_r), FUNC(jclub2o_state::console_w)); + map(0x580421, 0x580421).r(FUNC(jclub2o_state::console_status_r)); //AM_WRITE // AM_RANGE(0x580440, 0x580443) AM_WRITE // ST-0020 @@ -676,10 +676,10 @@ void jclub2o_state::st0016_io(address_map &map) { map.global_mask(0xff); //AM_RANGE(0x00, 0xbf) AM_READ(st0016_vregs_r) AM_WRITE(st0016_vregs_w) - map(0xc0, 0xc0).rw(this, FUNC(jclub2o_state::cmd1_r), FUNC(jclub2o_state::cmd1_w)); - map(0xc1, 0xc1).rw(this, FUNC(jclub2o_state::cmd2_r), FUNC(jclub2o_state::cmd2_w)); - map(0xc2, 0xc2).r(this, FUNC(jclub2o_state::cmd_stat_r)); - map(0xe1, 0xe1).w(this, FUNC(jclub2o_state::st0016_rom_bank_w)); + map(0xc0, 0xc0).rw(FUNC(jclub2o_state::cmd1_r), FUNC(jclub2o_state::cmd1_w)); + map(0xc1, 0xc1).rw(FUNC(jclub2o_state::cmd2_r), FUNC(jclub2o_state::cmd2_w)); + map(0xc2, 0xc2).r(FUNC(jclub2o_state::cmd_stat_r)); + map(0xe1, 0xe1).w(FUNC(jclub2o_state::st0016_rom_bank_w)); map(0xe7, 0xe7).nopw(); // watchdog? //AM_RANGE(0xf0, 0xf0) AM_READ(st0016_dma_r) } @@ -710,29 +710,29 @@ void jclub2_state::jclub2_map(address_map &map) map(0x000000, 0x27ffff).rom(); map(0x400000, 0x41ffff).ram().share("nvram"); // battery - map(0x490000, 0x490003).w(this, FUNC(jclub2_state::eeprom_93c46_w)); + map(0x490000, 0x490003).w(FUNC(jclub2_state::eeprom_93c46_w)); - map(0x4a0000, 0x4a0003).w(this, FUNC(jclub2_state::out2_w)); + map(0x4a0000, 0x4a0003).w(FUNC(jclub2_state::out2_w)); map(0x4d0000, 0x4d0003).nopr().nopw(); // reads seem unused? this write would go to two 7-segs (but the code is never called) map(0x4d0004, 0x4d0007).nopr(); map(0x4d0008, 0x4d000b).nopr(); map(0x4d000c, 0x4d000f).nopr(); - map(0x4e0000, 0x4e0003).r(this, FUNC(jclub2_state::p2_r)).w(this, FUNC(jclub2_state::input_sel2_w)); + map(0x4e0000, 0x4e0003).r(FUNC(jclub2_state::p2_r)).w(FUNC(jclub2_state::input_sel2_w)); map(0x580000, 0x580003).portr("EEPROM"); - map(0x580004, 0x580007).r(this, FUNC(jclub2_state::p1_r)); + map(0x580004, 0x580007).r(FUNC(jclub2_state::p1_r)); map(0x580008, 0x58000b).portr("COIN"); - map(0x58000c, 0x58000f).w(this, FUNC(jclub2_state::input_sel1_out3_w)); - map(0x580010, 0x580013).w(this, FUNC(jclub2_state::out1_w)); + map(0x58000c, 0x58000f).w(FUNC(jclub2_state::input_sel1_out3_w)); + map(0x580010, 0x580013).w(FUNC(jclub2_state::out1_w)); // AM_RANGE(0x580018, 0x58001b) AM_WRITE // AM_RANGE(0x58001c, 0x58001f) AM_WRITE map(0x580200, 0x580201).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); - map(0x580401, 0x580401).rw(this, FUNC(jclub2_state::console_r), FUNC(jclub2_state::console_w)); - map(0x580421, 0x580421).r(this, FUNC(jclub2_state::console_status_r)); //AM_WRITE + map(0x580401, 0x580401).rw(FUNC(jclub2_state::console_r), FUNC(jclub2_state::console_w)); + map(0x580421, 0x580421).r(FUNC(jclub2_state::console_status_r)); //AM_WRITE // AM_RANGE(0x580440, 0x580443) AM_WRITE // ST-0032 @@ -800,13 +800,13 @@ void darkhors_state::darkhors_map(address_map &map) map(0x000000, 0x0fffff).rom(); map(0x400000, 0x41ffff).ram().share("nvram"); // battery - map(0x490040, 0x490043).w(this, FUNC(darkhors_state::eeprom_93c46_w)); - map(0x4e0080, 0x4e0083).portr("SERVICE").w(this, FUNC(darkhors_state::out1_w)); + map(0x490040, 0x490043).w(FUNC(darkhors_state::eeprom_93c46_w)); + map(0x4e0080, 0x4e0083).portr("SERVICE").w(FUNC(darkhors_state::out1_w)); map(0x580000, 0x580003).portr("UNKNOWN"); map(0x580004, 0x580007).portr("COIN"); - map(0x580008, 0x58000b).r(this, FUNC(darkhors_state::input_r)); - map(0x58000c, 0x58000f).w(this, FUNC(darkhors_state::input_sel_w)); + map(0x580008, 0x58000b).r(FUNC(darkhors_state::input_r)); + map(0x58000c, 0x58000f).w(FUNC(darkhors_state::input_sel_w)); // AM_RANGE(0x580010, 0x580013) AM_WRITE // AM_RANGE(0x580018, 0x58001b) AM_WRITE // AM_RANGE(0x58001c, 0x58001f) AM_WRITE @@ -814,12 +814,12 @@ void darkhors_state::darkhors_map(address_map &map) // AM_RANGE(0x58008c, 0x58008f) AM_WRITE map(0x580200, 0x580201).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); - map(0x580401, 0x580401).rw(this, FUNC(darkhors_state::console_r), FUNC(darkhors_state::console_w)); - map(0x580421, 0x580421).r(this, FUNC(darkhors_state::console_status_r)); + map(0x580401, 0x580401).rw(FUNC(darkhors_state::console_r), FUNC(darkhors_state::console_w)); + map(0x580421, 0x580421).r(FUNC(darkhors_state::console_status_r)); map(0x800000, 0x86bfff).ram(); - map(0x86c000, 0x86ffff).ram().w(this, FUNC(darkhors_state::tmapram_w)).share("tmapram"); - map(0x870000, 0x873fff).ram().w(this, FUNC(darkhors_state::tmapram2_w)).share("tmapram2"); + map(0x86c000, 0x86ffff).ram().w(FUNC(darkhors_state::tmapram_w)).share("tmapram"); + map(0x870000, 0x873fff).ram().w(FUNC(darkhors_state::tmapram2_w)).share("tmapram2"); map(0x874000, 0x87dfff).ram(); map(0x87e000, 0x87ffff).ram().share("spriteram"); map(0x880000, 0x89ffff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); |