diff options
Diffstat (limited to 'src/mame/drivers/sigmab98.cpp')
-rw-r--r-- | src/mame/drivers/sigmab98.cpp | 166 |
1 files changed, 83 insertions, 83 deletions
diff --git a/src/mame/drivers/sigmab98.cpp b/src/mame/drivers/sigmab98.cpp index 87ca1f24ff5..e9d4a7f2005 100644 --- a/src/mame/drivers/sigmab98.cpp +++ b/src/mame/drivers/sigmab98.cpp @@ -818,9 +818,9 @@ void sigmab98_state::dodghero_mem_map(address_map &map) map(0xd800, 0xdfff).bankrw("rambank"); // not used, where is it mapped? - map(0xd800, 0xd821).rw(this, FUNC(sigmab98_state::vregs_r), FUNC(sigmab98_state::vregs_w)).share("vregs"); - map(0xd813, 0xd813).r(this, FUNC(sigmab98_state::d013_r)); - map(0xd821, 0xd821).r(this, FUNC(sigmab98_state::d021_r)); + map(0xd800, 0xd821).rw(FUNC(sigmab98_state::vregs_r), FUNC(sigmab98_state::vregs_w)).share("vregs"); + map(0xd813, 0xd813).r(FUNC(sigmab98_state::d013_r)); + map(0xd821, 0xd821).r(FUNC(sigmab98_state::d021_r)); map(0xe000, 0xefff).ram().share("nvram"); // battery backed RAM @@ -833,15 +833,15 @@ void sigmab98_state::dodghero_io_map(address_map &map) map(0x00, 0x01).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)); - map(0xa0, 0xa1).rw(this, FUNC(sigmab98_state::dodghero_regs_r), FUNC(sigmab98_state::dodghero_regs_w)); + map(0xa0, 0xa1).rw(FUNC(sigmab98_state::dodghero_regs_r), FUNC(sigmab98_state::dodghero_regs_w)); // AM_RANGE( 0xa2, 0xa3 ) - map(0xa4, 0xa5).rw(this, FUNC(sigmab98_state::dodghero_regs2_r), FUNC(sigmab98_state::dodghero_regs2_w)); + map(0xa4, 0xa5).rw(FUNC(sigmab98_state::dodghero_regs2_r), FUNC(sigmab98_state::dodghero_regs2_w)); - map(0xc0, 0xc0).portr("EEPROM").w(this, FUNC(sigmab98_state::eeprom_w)); + map(0xc0, 0xc0).portr("EEPROM").w(FUNC(sigmab98_state::eeprom_w)); map(0xc2, 0xc2).portr("BUTTON"); - map(0xc4, 0xc4).portr("PAYOUT").w(this, FUNC(sigmab98_state::c4_w)); - map(0xc6, 0xc6).w(this, FUNC(sigmab98_state::c6_w)); - map(0xc8, 0xc8).w(this, FUNC(sigmab98_state::c8_w)); + map(0xc4, 0xc4).portr("PAYOUT").w(FUNC(sigmab98_state::c4_w)); + map(0xc6, 0xc6).w(FUNC(sigmab98_state::c6_w)); + map(0xc8, 0xc8).w(FUNC(sigmab98_state::c8_w)); } /*************************************************************************** @@ -1014,9 +1014,9 @@ void sigmab98_state::gegege_mem_map(address_map &map) map(0xc800, 0xc87f).ram().share("vtable"); - map(0xd000, 0xd021).rw(this, FUNC(sigmab98_state::vregs_r), FUNC(sigmab98_state::vregs_w)).share("vregs"); - map(0xd013, 0xd013).r(this, FUNC(sigmab98_state::d013_r)); - map(0xd021, 0xd021).r(this, FUNC(sigmab98_state::d021_r)); + map(0xd000, 0xd021).rw(FUNC(sigmab98_state::vregs_r), FUNC(sigmab98_state::vregs_w)).share("vregs"); + map(0xd013, 0xd013).r(FUNC(sigmab98_state::d013_r)); + map(0xd021, 0xd021).r(FUNC(sigmab98_state::d021_r)); map(0xd800, 0xdfff).bankrw("rambank"); @@ -1031,15 +1031,15 @@ void sigmab98_state::gegege_io_map(address_map &map) map(0x00, 0x01).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)); - map(0xa0, 0xa1).rw(this, FUNC(sigmab98_state::gegege_regs_r), FUNC(sigmab98_state::gegege_regs_w)); + map(0xa0, 0xa1).rw(FUNC(sigmab98_state::gegege_regs_r), FUNC(sigmab98_state::gegege_regs_w)); // AM_RANGE( 0xa2, 0xa3 ) - map(0xa4, 0xa5).rw(this, FUNC(sigmab98_state::gegege_regs2_r), FUNC(sigmab98_state::gegege_regs2_w)); + map(0xa4, 0xa5).rw(FUNC(sigmab98_state::gegege_regs2_r), FUNC(sigmab98_state::gegege_regs2_w)); - map(0xc0, 0xc0).portr("EEPROM").w(this, FUNC(sigmab98_state::eeprom_w)); + map(0xc0, 0xc0).portr("EEPROM").w(FUNC(sigmab98_state::eeprom_w)); map(0xc2, 0xc2).portr("BUTTON"); - map(0xc4, 0xc4).portr("PAYOUT").w(this, FUNC(sigmab98_state::c4_w)); - map(0xc6, 0xc6).w(this, FUNC(sigmab98_state::c6_w)); - map(0xc8, 0xc8).w(this, FUNC(sigmab98_state::c8_w)); + map(0xc4, 0xc4).portr("PAYOUT").w(FUNC(sigmab98_state::c4_w)); + map(0xc6, 0xc6).w(FUNC(sigmab98_state::c6_w)); + map(0xc8, 0xc8).w(FUNC(sigmab98_state::c8_w)); map(0xe5, 0xe5).nopr(); // during irq } @@ -1110,15 +1110,15 @@ void sigmab98_state::dashhero_io_map(address_map &map) map(0x00, 0x01).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write)); - map(0xa0, 0xa1).rw(this, FUNC(sigmab98_state::gegege_regs_r), FUNC(sigmab98_state::gegege_regs_w)); + map(0xa0, 0xa1).rw(FUNC(sigmab98_state::gegege_regs_r), FUNC(sigmab98_state::gegege_regs_w)); // AM_RANGE( 0xa2, 0xa3 ) - map(0xa4, 0xa5).rw(this, FUNC(sigmab98_state::dashhero_regs2_r), FUNC(sigmab98_state::dashhero_regs2_w)); + map(0xa4, 0xa5).rw(FUNC(sigmab98_state::dashhero_regs2_r), FUNC(sigmab98_state::dashhero_regs2_w)); - map(0xc0, 0xc0).portr("EEPROM").w(this, FUNC(sigmab98_state::eeprom_w)); + map(0xc0, 0xc0).portr("EEPROM").w(FUNC(sigmab98_state::eeprom_w)); map(0xc2, 0xc2).portr("BUTTON"); - map(0xc4, 0xc4).portr("PAYOUT").w(this, FUNC(sigmab98_state::c4_w)); - map(0xc6, 0xc6).w(this, FUNC(sigmab98_state::c6_w)); - map(0xc8, 0xc8).w(this, FUNC(sigmab98_state::c8_w)); + map(0xc4, 0xc4).portr("PAYOUT").w(FUNC(sigmab98_state::c4_w)); + map(0xc6, 0xc6).w(FUNC(sigmab98_state::c6_w)); + map(0xc8, 0xc8).w(FUNC(sigmab98_state::c8_w)); map(0xe5, 0xe5).nopr(); // during irq } @@ -1246,9 +1246,9 @@ void lufykzku_state::lufykzku_mem_map(address_map &map) map(0xd000, 0xefff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); // more palette entries - map(0xf000, 0xf021).rw(this, FUNC(lufykzku_state::vregs_r), FUNC(lufykzku_state::vregs_w)).share("vregs"); - map(0xf013, 0xf013).r(this, FUNC(lufykzku_state::d013_r)); - map(0xf021, 0xf021).r(this, FUNC(lufykzku_state::d021_r)); + map(0xf000, 0xf021).rw(FUNC(lufykzku_state::vregs_r), FUNC(lufykzku_state::vregs_w)).share("vregs"); + map(0xf013, 0xf013).r(FUNC(lufykzku_state::d013_r)); + map(0xf021, 0xf021).r(FUNC(lufykzku_state::d021_r)); map(0xf400, 0xf47f).ram().share("vtable"); @@ -1259,15 +1259,15 @@ void lufykzku_state::lufykzku_io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).w("oki", FUNC(okim9810_device::write)); - map(0x01, 0x01).w("oki", FUNC(okim9810_device::write_tmp_register)); + map(0x01, 0x01).w("oki", FUNC(okim9810_device::tmp_register_w)); - map(0xa2, 0xa3).rw(this, FUNC(lufykzku_state::lufykzku_regs_r), FUNC(lufykzku_state::lufykzku_regs_w)); + map(0xa2, 0xa3).rw(FUNC(lufykzku_state::lufykzku_regs_r), FUNC(lufykzku_state::lufykzku_regs_w)); - map(0xc0, 0xc0).portr("COIN").w(this, FUNC(lufykzku_state::lufykzku_watchdog_w)); // bit 7 -> watchdog + map(0xc0, 0xc0).portr("COIN").w(FUNC(lufykzku_state::lufykzku_watchdog_w)); // bit 7 -> watchdog map(0xc2, 0xc2).portr("BUTTON"); - map(0xc4, 0xc4).portr("PAYOUT").w(this, FUNC(lufykzku_state::lufykzku_c4_w)); // bit 7 = medal lock, bit 6 = coin3, bit 5 = yen - map(0xc6, 0xc6).w(this, FUNC(lufykzku_state::lufykzku_c6_w)); - map(0xc8, 0xc8).rw(this, FUNC(lufykzku_state::lufykzku_c8_r), FUNC(lufykzku_state::lufykzku_c8_w)); // 0xc8 bit 6 read (eeprom?) + map(0xc4, 0xc4).portr("PAYOUT").w(FUNC(lufykzku_state::lufykzku_c4_w)); // bit 7 = medal lock, bit 6 = coin3, bit 5 = yen + map(0xc6, 0xc6).w(FUNC(lufykzku_state::lufykzku_c6_w)); + map(0xc8, 0xc8).rw(FUNC(lufykzku_state::lufykzku_c8_r), FUNC(lufykzku_state::lufykzku_c8_w)); // 0xc8 bit 6 read (eeprom?) } @@ -1491,9 +1491,9 @@ void sigmab98_state::animalc_map(address_map &map) map(0xd000, 0xd1ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); map(0xd800, 0xd87f).ram().share("vtable"); - map(0xe000, 0xe021).rw(this, FUNC(sigmab98_state::vregs_r), FUNC(sigmab98_state::vregs_w)).share("vregs"); + map(0xe000, 0xe021).rw(FUNC(sigmab98_state::vregs_r), FUNC(sigmab98_state::vregs_w)).share("vregs"); map(0xe011, 0xe011).nopw(); // IRQ Enable? Screen disable? - map(0xe013, 0xe013).rw(this, FUNC(sigmab98_state::vblank_r), FUNC(sigmab98_state::vblank_w)); // IRQ Ack? + map(0xe013, 0xe013).rw(FUNC(sigmab98_state::vblank_r), FUNC(sigmab98_state::vblank_w)); // IRQ Ack? map(0xfe00, 0xffff).ram(); // High speed internal RAM } @@ -1501,19 +1501,19 @@ void sigmab98_state::animalc_map(address_map &map) void sigmab98_state::animalc_io(address_map &map) { map.global_mask(0xff); - map(0x02, 0x03).rw(this, FUNC(sigmab98_state::animalc_rombank_r), FUNC(sigmab98_state::animalc_rombank_w)); - map(0x04, 0x05).rw(this, FUNC(sigmab98_state::animalc_rambank_r), FUNC(sigmab98_state::animalc_rambank_w)); + map(0x02, 0x03).rw(FUNC(sigmab98_state::animalc_rombank_r), FUNC(sigmab98_state::animalc_rombank_w)); + map(0x04, 0x05).rw(FUNC(sigmab98_state::animalc_rambank_r), FUNC(sigmab98_state::animalc_rambank_w)); - map(0x2c, 0x2c).rw(this, FUNC(sigmab98_state::sammymdl_eeprom_r), FUNC(sigmab98_state::sammymdl_eeprom_w)); - map(0x2e, 0x2e).r(this, FUNC(sigmab98_state::sammymdl_coin_hopper_r)); + map(0x2c, 0x2c).rw(FUNC(sigmab98_state::sammymdl_eeprom_r), FUNC(sigmab98_state::sammymdl_eeprom_w)); + map(0x2e, 0x2e).r(FUNC(sigmab98_state::sammymdl_coin_hopper_r)); map(0x30, 0x30).portr("BUTTON"); - map(0x31, 0x31).rw(this, FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::sammymdl_coin_counter_w)); - map(0x32, 0x32).rw(this, FUNC(sigmab98_state::sammymdl_leds_r), FUNC(sigmab98_state::sammymdl_leds_w)); - map(0x34, 0x34).r(this, FUNC(sigmab98_state::unk_34_r)); + map(0x31, 0x31).rw(FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::sammymdl_coin_counter_w)); + map(0x32, 0x32).rw(FUNC(sigmab98_state::sammymdl_leds_r), FUNC(sigmab98_state::sammymdl_leds_w)); + map(0x34, 0x34).r(FUNC(sigmab98_state::unk_34_r)); map(0x90, 0x90).w("oki", FUNC(okim9810_device::write)); - map(0x91, 0x91).w("oki", FUNC(okim9810_device::write_tmp_register)); + map(0x91, 0x91).w("oki", FUNC(okim9810_device::tmp_register_w)); map(0x92, 0x92).r("oki", FUNC(okim9810_device::read)); - map(0xb0, 0xb0).w(this, FUNC(sigmab98_state::sammymdl_hopper_w)); + map(0xb0, 0xb0).w(FUNC(sigmab98_state::sammymdl_hopper_w)); map(0xc0, 0xc0).w("watchdog", FUNC(watchdog_timer_device::reset_w)); // 1 } @@ -1773,9 +1773,9 @@ void sigmab98_state::gocowboy_map(address_map &map) { map(0x0000, 0x43ff).rom(); - map(0x4400, 0xdbff).rw(this, FUNC(sigmab98_state::gocowboy_4400_r), FUNC(sigmab98_state::gocowboy_4400_w)); // SPRITERAM + PALETTERAM + VTABLE + VREGS | NVRAM + map(0x4400, 0xdbff).rw(FUNC(sigmab98_state::gocowboy_4400_r), FUNC(sigmab98_state::gocowboy_4400_w)); // SPRITERAM + PALETTERAM + VTABLE + VREGS | NVRAM - map(0xdc00, 0xfbff).rw(this, FUNC(sigmab98_state::gocowboy_dc00_r), FUNC(sigmab98_state::gocowboy_dc00_w)).share("nvram"); // PALETTERAM | NVRAM + map(0xdc00, 0xfbff).rw(FUNC(sigmab98_state::gocowboy_dc00_r), FUNC(sigmab98_state::gocowboy_dc00_w)).share("nvram"); // PALETTERAM | NVRAM map(0xfe00, 0xffff).ram(); // High speed internal RAM } @@ -1800,16 +1800,16 @@ WRITE8_MEMBER(sigmab98_state::gocowboy_leds_w) void sigmab98_state::gocowboy_io(address_map &map) { map.global_mask(0xff); - map(0x02, 0x03).rw(this, FUNC(sigmab98_state::gocowboy_rombank_r), FUNC(sigmab98_state::gocowboy_rombank_w)); - map(0x04, 0x05).rw(this, FUNC(sigmab98_state::gocowboy_rambank_r), FUNC(sigmab98_state::gocowboy_rambank_w)); + map(0x02, 0x03).rw(FUNC(sigmab98_state::gocowboy_rombank_r), FUNC(sigmab98_state::gocowboy_rombank_w)); + map(0x04, 0x05).rw(FUNC(sigmab98_state::gocowboy_rambank_r), FUNC(sigmab98_state::gocowboy_rambank_w)); - map(0x2c, 0x2c).rw(this, FUNC(sigmab98_state::sammymdl_eeprom_r), FUNC(sigmab98_state::sammymdl_eeprom_w)); - map(0x2e, 0x2e).r(this, FUNC(sigmab98_state::sammymdl_coin_hopper_r)); + map(0x2c, 0x2c).rw(FUNC(sigmab98_state::sammymdl_eeprom_r), FUNC(sigmab98_state::sammymdl_eeprom_w)); + map(0x2e, 0x2e).r(FUNC(sigmab98_state::sammymdl_coin_hopper_r)); map(0x30, 0x30).portr("BUTTON"); - map(0x31, 0x31).rw(this, FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::sammymdl_coin_counter_w)); - map(0x32, 0x32).rw(this, FUNC(sigmab98_state::sammymdl_leds_r), FUNC(sigmab98_state::gocowboy_leds_w)); + map(0x31, 0x31).rw(FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::sammymdl_coin_counter_w)); + map(0x32, 0x32).rw(FUNC(sigmab98_state::sammymdl_leds_r), FUNC(sigmab98_state::gocowboy_leds_w)); map(0x90, 0x90).rw("oki", FUNC(okim9810_device::read), FUNC(okim9810_device::write)); - map(0x91, 0x91).w("oki", FUNC(okim9810_device::write_tmp_register)); + map(0x91, 0x91).w("oki", FUNC(okim9810_device::tmp_register_w)); map(0x92, 0x92).r("oki", FUNC(okim9810_device::read)); map(0xb0, 0xb0).nopw(); map(0xc0, 0xc0).w("watchdog", FUNC(watchdog_timer_device::reset_w)); // 1 @@ -2038,7 +2038,7 @@ WRITE8_MEMBER(sigmab98_state::haekaka_coin_counter_w) void sigmab98_state::haekaka_map(address_map &map) { map(0x0000, 0x7fff).rom(); - map(0xb000, 0xcfff).rw(this, FUNC(sigmab98_state::haekaka_b000_r), FUNC(sigmab98_state::haekaka_b000_w)); + map(0xb000, 0xcfff).rw(FUNC(sigmab98_state::haekaka_b000_r), FUNC(sigmab98_state::haekaka_b000_w)); map(0xd000, 0xefff).ram().share("nvram"); map(0xfe00, 0xffff).ram(); // High speed internal RAM } @@ -2046,18 +2046,18 @@ void sigmab98_state::haekaka_map(address_map &map) void sigmab98_state::haekaka_io(address_map &map) { map.global_mask(0xff); - map(0x02, 0x03).rw(this, FUNC(sigmab98_state::haekaka_rombank_r), FUNC(sigmab98_state::haekaka_rombank_w)); - map(0x04, 0x05).rw(this, FUNC(sigmab98_state::haekaka_rambank_r), FUNC(sigmab98_state::haekaka_rambank_w)); + map(0x02, 0x03).rw(FUNC(sigmab98_state::haekaka_rombank_r), FUNC(sigmab98_state::haekaka_rombank_w)); + map(0x04, 0x05).rw(FUNC(sigmab98_state::haekaka_rambank_r), FUNC(sigmab98_state::haekaka_rambank_w)); - map(0x2c, 0x2c).rw(this, FUNC(sigmab98_state::sammymdl_eeprom_r), FUNC(sigmab98_state::sammymdl_eeprom_w)); - map(0x2e, 0x2e).r(this, FUNC(sigmab98_state::sammymdl_coin_hopper_r)); + map(0x2c, 0x2c).rw(FUNC(sigmab98_state::sammymdl_eeprom_r), FUNC(sigmab98_state::sammymdl_eeprom_w)); + map(0x2e, 0x2e).r(FUNC(sigmab98_state::sammymdl_coin_hopper_r)); map(0x30, 0x30).portr("BUTTON"); - map(0x31, 0x31).rw(this, FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::haekaka_coin_counter_w)); - map(0x32, 0x32).rw(this, FUNC(sigmab98_state::sammymdl_leds_r), FUNC(sigmab98_state::haekaka_leds_w)); + map(0x31, 0x31).rw(FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::haekaka_coin_counter_w)); + map(0x32, 0x32).rw(FUNC(sigmab98_state::sammymdl_leds_r), FUNC(sigmab98_state::haekaka_leds_w)); map(0x90, 0x90).w("oki", FUNC(okim9810_device::write)); - map(0x91, 0x91).w("oki", FUNC(okim9810_device::write_tmp_register)); + map(0x91, 0x91).w("oki", FUNC(okim9810_device::tmp_register_w)); map(0x92, 0x92).r("oki", FUNC(okim9810_device::read)); - map(0xb0, 0xb0).w(this, FUNC(sigmab98_state::sammymdl_hopper_w)); + map(0xb0, 0xb0).w(FUNC(sigmab98_state::sammymdl_hopper_w)); map(0xc0, 0xc0).w("watchdog", FUNC(watchdog_timer_device::reset_w)); // 1 } @@ -2281,13 +2281,13 @@ void sigmab98_state::itazuram_map(address_map &map) map(0x3800, 0x47ff).bankr("rombank0").bankw("sprbank0"); map(0x4800, 0x57ff).bankr("rombank1").bankw("sprbank1"); - map(0x5800, 0x59ff).rw(this, FUNC(sigmab98_state::itazuram_palette_r), FUNC(sigmab98_state::itazuram_palette_w)); + map(0x5800, 0x59ff).rw(FUNC(sigmab98_state::itazuram_palette_r), FUNC(sigmab98_state::itazuram_palette_w)); map(0x6000, 0x607f).ram().share("vtable"); - map(0x6800, 0x6821).rw(this, FUNC(sigmab98_state::vregs_r), FUNC(sigmab98_state::vregs_w)).share("vregs"); + map(0x6800, 0x6821).rw(FUNC(sigmab98_state::vregs_r), FUNC(sigmab98_state::vregs_w)).share("vregs"); map(0x6811, 0x6811).nopw(); // IRQ Enable? Screen disable? map(0x6813, 0x6813).nopw(); // IRQ Ack? - map(0xdc00, 0xfdff).bankr("palbank").w(this, FUNC(sigmab98_state::itazuram_nvram_palette_w)).share("nvram"); // nvram | paletteram + map(0xdc00, 0xfdff).bankr("palbank").w(FUNC(sigmab98_state::itazuram_nvram_palette_w)).share("nvram"); // nvram | paletteram map(0xfe00, 0xffff).ram(); // High speed internal RAM } @@ -2295,18 +2295,18 @@ void sigmab98_state::itazuram_map(address_map &map) void sigmab98_state::itazuram_io(address_map &map) { map.global_mask(0xff); - map(0x02, 0x03).rw(this, FUNC(sigmab98_state::itazuram_rombank_r), FUNC(sigmab98_state::itazuram_rombank_w)); - map(0x04, 0x05).rw(this, FUNC(sigmab98_state::itazuram_rambank_r), FUNC(sigmab98_state::itazuram_rambank_w)); + map(0x02, 0x03).rw(FUNC(sigmab98_state::itazuram_rombank_r), FUNC(sigmab98_state::itazuram_rombank_w)); + map(0x04, 0x05).rw(FUNC(sigmab98_state::itazuram_rambank_r), FUNC(sigmab98_state::itazuram_rambank_w)); - map(0x2c, 0x2c).rw(this, FUNC(sigmab98_state::sammymdl_eeprom_r), FUNC(sigmab98_state::sammymdl_eeprom_w)); - map(0x2e, 0x2e).r(this, FUNC(sigmab98_state::sammymdl_coin_hopper_r)); + map(0x2c, 0x2c).rw(FUNC(sigmab98_state::sammymdl_eeprom_r), FUNC(sigmab98_state::sammymdl_eeprom_w)); + map(0x2e, 0x2e).r(FUNC(sigmab98_state::sammymdl_coin_hopper_r)); map(0x30, 0x30).portr("BUTTON"); - map(0x31, 0x31).rw(this, FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::sammymdl_coin_counter_w)); - map(0x32, 0x32).rw(this, FUNC(sigmab98_state::sammymdl_leds_r), FUNC(sigmab98_state::sammymdl_leds_w)); + map(0x31, 0x31).rw(FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::sammymdl_coin_counter_w)); + map(0x32, 0x32).rw(FUNC(sigmab98_state::sammymdl_leds_r), FUNC(sigmab98_state::sammymdl_leds_w)); map(0x90, 0x90).w("oki", FUNC(okim9810_device::write)); - map(0x91, 0x91).w("oki", FUNC(okim9810_device::write_tmp_register)); + map(0x91, 0x91).w("oki", FUNC(okim9810_device::tmp_register_w)); map(0x92, 0x92).r("oki", FUNC(okim9810_device::read)); - map(0xb0, 0xb0).w(this, FUNC(sigmab98_state::sammymdl_hopper_w)); + map(0xb0, 0xb0).w(FUNC(sigmab98_state::sammymdl_hopper_w)); map(0xc0, 0xc0).w("watchdog", FUNC(watchdog_timer_device::reset_w)); // 1 } @@ -2317,7 +2317,7 @@ void sigmab98_state::itazuram_io(address_map &map) void sigmab98_state::pyenaget_io(address_map &map) { haekaka_io(map); - map(0x31, 0x31).rw(this, FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::sammymdl_coin_counter_w)); + map(0x31, 0x31).rw(FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::sammymdl_coin_counter_w)); } /*************************************************************************** @@ -2519,7 +2519,7 @@ WRITE8_MEMBER(sigmab98_state::tdoboon_c000_w) void sigmab98_state::tdoboon_map(address_map &map) { map(0x0000, 0xbfff).rom(); - map(0xc000, 0xcfff).rw(this, FUNC(sigmab98_state::tdoboon_c000_r), FUNC(sigmab98_state::tdoboon_c000_w)); + map(0xc000, 0xcfff).rw(FUNC(sigmab98_state::tdoboon_c000_r), FUNC(sigmab98_state::tdoboon_c000_w)); map(0xd000, 0xefff).ram().share("nvram"); map(0xfe00, 0xffff).ram(); // High speed internal RAM } @@ -2527,18 +2527,18 @@ void sigmab98_state::tdoboon_map(address_map &map) void sigmab98_state::tdoboon_io(address_map &map) { map.global_mask(0xff); - map(0x02, 0x03).rw(this, FUNC(sigmab98_state::tdoboon_rombank_r), FUNC(sigmab98_state::tdoboon_rombank_w)); - map(0x04, 0x05).rw(this, FUNC(sigmab98_state::tdoboon_rambank_r), FUNC(sigmab98_state::tdoboon_rambank_w)); + map(0x02, 0x03).rw(FUNC(sigmab98_state::tdoboon_rombank_r), FUNC(sigmab98_state::tdoboon_rombank_w)); + map(0x04, 0x05).rw(FUNC(sigmab98_state::tdoboon_rambank_r), FUNC(sigmab98_state::tdoboon_rambank_w)); - map(0x2c, 0x2c).rw(this, FUNC(sigmab98_state::sammymdl_eeprom_r), FUNC(sigmab98_state::sammymdl_eeprom_w)); - map(0x2e, 0x2e).r(this, FUNC(sigmab98_state::sammymdl_coin_hopper_r)); + map(0x2c, 0x2c).rw(FUNC(sigmab98_state::sammymdl_eeprom_r), FUNC(sigmab98_state::sammymdl_eeprom_w)); + map(0x2e, 0x2e).r(FUNC(sigmab98_state::sammymdl_coin_hopper_r)); map(0x30, 0x30).portr("BUTTON"); - map(0x31, 0x31).rw(this, FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::sammymdl_coin_counter_w)); - map(0x32, 0x32).rw(this, FUNC(sigmab98_state::sammymdl_leds_r), FUNC(sigmab98_state::sammymdl_leds_w)); + map(0x31, 0x31).rw(FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::sammymdl_coin_counter_w)); + map(0x32, 0x32).rw(FUNC(sigmab98_state::sammymdl_leds_r), FUNC(sigmab98_state::sammymdl_leds_w)); map(0x90, 0x90).w("oki", FUNC(okim9810_device::write)); - map(0x91, 0x91).w("oki", FUNC(okim9810_device::write_tmp_register)); + map(0x91, 0x91).w("oki", FUNC(okim9810_device::tmp_register_w)); map(0x92, 0x92).r("oki", FUNC(okim9810_device::read)); - map(0xb0, 0xb0).w(this, FUNC(sigmab98_state::sammymdl_hopper_w)); + map(0xb0, 0xb0).w(FUNC(sigmab98_state::sammymdl_hopper_w)); map(0xc0, 0xc0).w("watchdog", FUNC(watchdog_timer_device::reset_w)); // 1 } |