diff options
Diffstat (limited to 'src/mame/drivers/segas16b.cpp')
-rw-r--r-- | src/mame/drivers/segas16b.cpp | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/src/mame/drivers/segas16b.cpp b/src/mame/drivers/segas16b.cpp index 85ac0f7aa95..b80a25dd44e 100644 --- a/src/mame/drivers/segas16b.cpp +++ b/src/mame/drivers/segas16b.cpp @@ -905,30 +905,30 @@ void segas16b_state::memory_mapper(sega_315_5195_mapper_device &mapper, uint8_t break; case 6: // 4k of paletteram - mapper.map_as_ram(0x00000, 0x01000, 0xfff000, "paletteram", write16_delegate(FUNC(segas16b_state::paletteram_w), this)); + mapper.map_as_ram(0x00000, 0x01000, 0xfff000, "paletteram", write16_delegate(*this, FUNC(segas16b_state::paletteram_w))); break; case 5: // 64k of tileram + 4k of textram - mapper.map_as_ram(0x00000, 0x10000, 0xfe0000, "tileram", write16_delegate(FUNC(segas16b_state::tileram_w), this)); - mapper.map_as_ram(0x10000, 0x01000, 0xfef000, "textram", write16_delegate(FUNC(segas16b_state::textram_w), this)); + mapper.map_as_ram(0x00000, 0x10000, 0xfe0000, "tileram", write16_delegate(*this, FUNC(segas16b_state::tileram_w))); + mapper.map_as_ram(0x10000, 0x01000, 0xfef000, "textram", write16_delegate(*this, FUNC(segas16b_state::textram_w))); break; case 4: // 2k of spriteram - mapper.map_as_ram(0x00000, 0x00800, 0xfff800, "sprites", write16_delegate()); + mapper.map_as_ram(0x00000, 0x00800, 0xfff800, "sprites", write16_delegate(*this)); break; case 3: // 16k or 256k of work RAM - mapper.map_as_ram(0x00000, m_workram.bytes(), ~(m_workram.bytes() - 1), "workram", write16_delegate()); + mapper.map_as_ram(0x00000, m_workram.bytes(), ~(m_workram.bytes() - 1), "workram", write16_delegate(*this)); break; case 2: // 3rd ROM base, or board-specific banking switch (m_romboard) { - case ROM_BOARD_171_5358_SMALL: mapper.map_as_rom(0x00000, 0x20000, 0xfe0000, "rom2base", "decrypted_rom2base", 0x20000, write16_delegate()); break; - case ROM_BOARD_171_5358: mapper.map_as_rom(0x00000, 0x20000, 0xfe0000, "rom2base", "decrypted_rom2base", 0x40000, write16_delegate()); break; + case ROM_BOARD_171_5358_SMALL: mapper.map_as_rom(0x00000, 0x20000, 0xfe0000, "rom2base", "decrypted_rom2base", 0x20000, write16_delegate(*this)); break; + case ROM_BOARD_171_5358: mapper.map_as_rom(0x00000, 0x20000, 0xfe0000, "rom2base", "decrypted_rom2base", 0x40000, write16_delegate(*this)); break; case ROM_BOARD_171_5521: - case ROM_BOARD_171_5704: mapper.map_as_handler(0x00000, 0x10000, 0xff0000, read16_delegate(), write16_delegate(FUNC(segas16b_state::rom_5704_bank_w), this)); break; - case ROM_BOARD_171_5797: mapper.map_as_handler(0x00000, 0x10000, 0xff0000, read16_delegate(FUNC(segas16b_state::unknown_rgn2_r), this), write16_delegate(FUNC(segas16b_state::unknown_rgn2_w), this)); break; + case ROM_BOARD_171_5704: mapper.map_as_handler(0x00000, 0x10000, 0xff0000, read16_delegate(*this), write16_delegate(*this, FUNC(segas16b_state::rom_5704_bank_w))); break; + case ROM_BOARD_171_5797: mapper.map_as_handler(0x00000, 0x10000, 0xff0000, read16_delegate(*this, FUNC(segas16b_state::unknown_rgn2_r)), write16_delegate(*this, FUNC(segas16b_state::unknown_rgn2_w))); break; case ROM_BOARD_KOREAN: break; default: assert(false); } @@ -937,12 +937,12 @@ void segas16b_state::memory_mapper(sega_315_5195_mapper_device &mapper, uint8_t case 1: // 2nd ROM base, banking & math, or sound for Korean games switch (m_romboard) { - case ROM_BOARD_171_5358_SMALL: mapper.map_as_rom(0x00000, 0x20000, 0xfe0000, "rom1base", "decrypted_rom1base", 0x10000, write16_delegate()); break; - case ROM_BOARD_171_5358: mapper.map_as_rom(0x00000, 0x20000, 0xfe0000, "rom1base", "decrypted_rom1base", 0x20000, write16_delegate()); break; + case ROM_BOARD_171_5358_SMALL: mapper.map_as_rom(0x00000, 0x20000, 0xfe0000, "rom1base", "decrypted_rom1base", 0x10000, write16_delegate(*this)); break; + case ROM_BOARD_171_5358: mapper.map_as_rom(0x00000, 0x20000, 0xfe0000, "rom1base", "decrypted_rom1base", 0x20000, write16_delegate(*this)); break; case ROM_BOARD_171_5521: - case ROM_BOARD_171_5704: mapper.map_as_rom(0x00000, 0x40000, 0xfc0000, "rom1base", "decrypted_rom1base", 0x40000, write16_delegate()); break; - case ROM_BOARD_KOREAN: mapper.map_as_handler(0x00000, 0x10000, 0xff0000, read16_delegate(), write16_delegate(FUNC(segas16b_state::atomicp_sound_w), this)); break; - case ROM_BOARD_171_5797: mapper.map_as_handler(0x00000, 0x04000, 0xffc000, read16_delegate(FUNC(segas16b_state::rom_5797_bank_math_r), this), write16_delegate(FUNC(segas16b_state::rom_5797_bank_math_w), this)); break; + case ROM_BOARD_171_5704: mapper.map_as_rom(0x00000, 0x40000, 0xfc0000, "rom1base", "decrypted_rom1base", 0x40000, write16_delegate(*this)); break; + case ROM_BOARD_KOREAN: mapper.map_as_handler(0x00000, 0x10000, 0xff0000, read16_delegate(*this), write16_delegate(*this, FUNC(segas16b_state::atomicp_sound_w))); break; + case ROM_BOARD_171_5797: mapper.map_as_handler(0x00000, 0x04000, 0xffc000, read16_delegate(*this, FUNC(segas16b_state::rom_5797_bank_math_r)), write16_delegate(*this, FUNC(segas16b_state::rom_5797_bank_math_w))); break; default: assert(false); } break; @@ -950,12 +950,12 @@ void segas16b_state::memory_mapper(sega_315_5195_mapper_device &mapper, uint8_t case 0: // 1st ROM base switch (m_romboard) { - case ROM_BOARD_171_5358_SMALL: mapper.map_as_rom(0x00000, 0x20000, 0xfe0000, "rom0base", "decrypted_rom0base", 0x00000, write16_delegate()); break; - case ROM_BOARD_171_5358: mapper.map_as_rom(0x00000, 0x20000, 0xfe0000, "rom0base", "decrypted_rom0base", 0x00000, write16_delegate()); break; + case ROM_BOARD_171_5358_SMALL: mapper.map_as_rom(0x00000, 0x20000, 0xfe0000, "rom0base", "decrypted_rom0base", 0x00000, write16_delegate(*this)); break; + case ROM_BOARD_171_5358: mapper.map_as_rom(0x00000, 0x20000, 0xfe0000, "rom0base", "decrypted_rom0base", 0x00000, write16_delegate(*this)); break; case ROM_BOARD_171_5521: - case ROM_BOARD_171_5704: mapper.map_as_rom(0x00000, 0x40000, 0xfc0000, "rom0base", "decrypted_rom0base", 0000000, write16_delegate()); break; - case ROM_BOARD_KOREAN: mapper.map_as_rom(0x00000, 0x40000, 0xfc0000, "rom0base", "decrypted_rom0base", 0000000, write16_delegate()); break; - case ROM_BOARD_171_5797: mapper.map_as_rom(0x00000, 0x80000, 0xf80000, "rom0base", "decrypted_rom0base", 0000000, write16_delegate()); break; + case ROM_BOARD_171_5704: mapper.map_as_rom(0x00000, 0x40000, 0xfc0000, "rom0base", "decrypted_rom0base", 0x00000, write16_delegate(*this)); break; + case ROM_BOARD_KOREAN: mapper.map_as_rom(0x00000, 0x40000, 0xfc0000, "rom0base", "decrypted_rom0base", 0x00000, write16_delegate(*this)); break; + case ROM_BOARD_171_5797: mapper.map_as_rom(0x00000, 0x80000, 0xf80000, "rom0base", "decrypted_rom0base", 0x00000, write16_delegate(*this)); break; default: assert(false); } break; @@ -3910,7 +3910,7 @@ void segas16b_state::system16b(machine_config &config) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); SEGA_315_5195_MEM_MAPPER(config, m_mapper, MASTER_CLOCK_10MHz, m_maincpu); - m_mapper->set_mapper(FUNC(segas16b_state::memory_mapper), this); + m_mapper->set_mapper(FUNC(segas16b_state::memory_mapper)); m_mapper->pbf().set_inputline(m_soundcpu, 0); // video hardware @@ -4084,7 +4084,7 @@ void segas16b_state::fpointbl(machine_config &config) m_sprites->set_local_originx(75); // these align the pieces with the playfield m_sprites->set_local_originy(-2); // some other gfx don't have identical alignment to original tho (flickey character over 'good luck') - m_segaic16vid->set_pagelatch_cb(FUNC(segas16b_state::tilemap_16b_fpointbl_fill_latch), this); + m_segaic16vid->set_pagelatch_cb(FUNC(segas16b_state::tilemap_16b_fpointbl_fill_latch)); } void segas16b_state::fpointbla(machine_config &config) @@ -9299,8 +9299,8 @@ void segas16b_state::init_generic(segas16b_rom_board rom_board) m_nvram->set_base(m_workram, m_workram.bytes()); // create default read/write handlers - m_custom_io_r = read16_delegate(FUNC(segas16b_state::standard_io_r), this); - m_custom_io_w = write16_delegate(FUNC(segas16b_state::standard_io_w), this); + m_custom_io_r = read16_delegate(*this, FUNC(segas16b_state::standard_io_r)); + m_custom_io_w = write16_delegate(*this, FUNC(segas16b_state::standard_io_w)); // save state save_item(NAME(m_atomicp_sound_count)); @@ -9359,8 +9359,8 @@ void segas16b_state::init_generic_bootleg() void segas16b_state::init_aceattac_5358() { init_generic_5358(); - m_custom_io_r = read16_delegate(FUNC(segas16b_state::aceattac_custom_io_r), this); - m_custom_io_w = write16_delegate(FUNC(segas16b_state::aceattac_custom_io_w), this); + m_custom_io_r = read16_delegate(*this, FUNC(segas16b_state::aceattac_custom_io_r)); + m_custom_io_w = write16_delegate(*this, FUNC(segas16b_state::aceattac_custom_io_w)); } void segas16b_state::init_aliensyn7_5358_small() @@ -9384,27 +9384,27 @@ void segas16b_state::init_altbeas4_5521() void segas16b_state::init_dunkshot_5358_small() { init_generic_5358_small(); - m_custom_io_r = read16_delegate(FUNC(segas16b_state::dunkshot_custom_io_r), this); + m_custom_io_r = read16_delegate(*this, FUNC(segas16b_state::dunkshot_custom_io_r)); m_tilemap_type = segaic16_video_device::TILEMAP_16B_ALT; } void segas16b_state::init_exctleag_5358() { init_generic_5358(); - m_custom_io_r = read16_delegate(FUNC(segas16b_state::sdi_custom_io_r), this); + m_custom_io_r = read16_delegate(*this, FUNC(segas16b_state::sdi_custom_io_r)); } void segas16b_state::init_hwchamp_5521() { init_generic_5521(); - m_custom_io_r = read16_delegate(FUNC(segas16b_state::hwchamp_custom_io_r), this); - m_custom_io_w = write16_delegate(FUNC(segas16b_state::hwchamp_custom_io_w), this); + m_custom_io_r = read16_delegate(*this, FUNC(segas16b_state::hwchamp_custom_io_r)); + m_custom_io_w = write16_delegate(*this, FUNC(segas16b_state::hwchamp_custom_io_w)); } void segas16b_state::init_passshtj_5358() { init_generic_5358(); - m_custom_io_r = read16_delegate(FUNC(segas16b_state::passshtj_custom_io_r), this); + m_custom_io_r = read16_delegate(*this, FUNC(segas16b_state::passshtj_custom_io_r)); } void segas16b_state::init_cencourt_5358() @@ -9416,7 +9416,7 @@ void segas16b_state::init_cencourt_5358() void segas16b_state::init_sdi_5358_small() { init_generic_5358_small(); - m_custom_io_r = read16_delegate(FUNC(segas16b_state::sdi_custom_io_r), this); + m_custom_io_r = read16_delegate(*this, FUNC(segas16b_state::sdi_custom_io_r)); if (memregion("maincpux") != nullptr) { @@ -9440,7 +9440,7 @@ void segas16b_state::init_fpointbla() void segas16b_state::init_defense_5358_small() { init_generic_5358_small(); - m_custom_io_r = read16_delegate(FUNC(segas16b_state::sdi_custom_io_r), this); + m_custom_io_r = read16_delegate(*this, FUNC(segas16b_state::sdi_custom_io_r)); } void segas16b_state::init_shinobi4_5521() @@ -9458,8 +9458,8 @@ void segas16b_state::init_shinobi3_5358() void segas16b_state::init_sjryuko_5358_small() { init_generic_5358_small(); - m_custom_io_r = read16_delegate(FUNC(segas16b_state::sjryuko_custom_io_r), this); - m_custom_io_w = write16_delegate(FUNC(segas16b_state::sjryuko_custom_io_w), this); + m_custom_io_r = read16_delegate(*this, FUNC(segas16b_state::sjryuko_custom_io_r)); + m_custom_io_w = write16_delegate(*this, FUNC(segas16b_state::sjryuko_custom_io_w)); m_tilemap_type = segaic16_video_device::TILEMAP_16B_ALT; } |