diff options
Diffstat (limited to 'src/mame/drivers/segas18.cpp')
-rw-r--r-- | src/mame/drivers/segas18.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/mame/drivers/segas18.cpp b/src/mame/drivers/segas18.cpp index edc09a610e1..4be60825962 100644 --- a/src/mame/drivers/segas18.cpp +++ b/src/mame/drivers/segas18.cpp @@ -52,24 +52,24 @@ void segas18_state::memory_mapper(sega_315_5195_mapper_device &mapper, uint8_t i switch (index) { case 7: - mapper.map_as_handler(0x00000, 0x04000, 0xffc000, read16_delegate(FUNC(segas18_state::misc_io_r), this), write16_delegate(FUNC(segas18_state::misc_io_w), this)); + mapper.map_as_handler(0x00000, 0x04000, 0xffc000, read16_delegate(*this, FUNC(segas18_state::misc_io_r)), write16_delegate(*this, FUNC(segas18_state::misc_io_w))); break; case 6: - mapper.map_as_ram(0x00000, 0x01000, 0xfff000, "paletteram", write16_delegate(FUNC(segas18_state::paletteram_w), this)); + mapper.map_as_ram(0x00000, 0x01000, 0xfff000, "paletteram", write16_delegate(*this, FUNC(segas18_state::paletteram_w))); break; case 5: - mapper.map_as_ram(0x00000, 0x10000, 0xfe0000, "tileram", write16_delegate(FUNC(segas18_state::tileram_w), this)); - mapper.map_as_ram(0x10000, 0x01000, 0xfef000, "textram", write16_delegate(FUNC(segas18_state::textram_w), this)); + mapper.map_as_ram(0x00000, 0x10000, 0xfe0000, "tileram", write16_delegate(*this, FUNC(segas18_state::tileram_w))); + mapper.map_as_ram(0x10000, 0x01000, 0xfef000, "textram", write16_delegate(*this, FUNC(segas18_state::textram_w))); break; case 4: - mapper.map_as_ram(0x00000, 0x00800, 0xfff800, "sprites", write16_delegate()); + mapper.map_as_ram(0x00000, 0x00800, 0xfff800, "sprites", write16_delegate(*this)); break; case 3: - mapper.map_as_ram(0x00000, 0x04000, 0xffc000, "workram", write16_delegate()); + mapper.map_as_ram(0x00000, 0x04000, 0xffc000, "workram", write16_delegate(*this)); break; case 2: @@ -78,7 +78,7 @@ void segas18_state::memory_mapper(sega_315_5195_mapper_device &mapper, uint8_t i case ROM_BOARD_171_SHADOW: break; // ??? case ROM_BOARD_837_7525: case ROM_BOARD_171_5874: - case ROM_BOARD_171_5987: mapper.map_as_handler(0x00000, 0x00010, 0xfffff0, read16_delegate(FUNC(segas18_state::genesis_vdp_r), this), write16_delegate(FUNC(segas18_state::genesis_vdp_w), this)); break; + case ROM_BOARD_171_5987: mapper.map_as_handler(0x00000, 0x00010, 0xfffff0, read16_delegate(*this, FUNC(segas18_state::genesis_vdp_r)), write16_delegate(*this, FUNC(segas18_state::genesis_vdp_w))); break; default: assert(false); } break; @@ -86,14 +86,14 @@ void segas18_state::memory_mapper(sega_315_5195_mapper_device &mapper, uint8_t i case 1: switch (m_romboard) { - case ROM_BOARD_171_SHADOW: mapper.map_as_handler(0x00000, 0x00010, 0xfffff0, read16_delegate(FUNC(segas18_state::genesis_vdp_r), this), write16_delegate(FUNC(segas18_state::genesis_vdp_w), this)); break; - case ROM_BOARD_171_5874: mapper.map_as_rom(0x00000, 0x80000, 0xf80000, "rom1base", "decrypted_rom1base", 0x80000, write16_delegate()); break; + case ROM_BOARD_171_SHADOW: mapper.map_as_handler(0x00000, 0x00010, 0xfffff0, read16_delegate(*this, FUNC(segas18_state::genesis_vdp_r)), write16_delegate(*this, FUNC(segas18_state::genesis_vdp_w))); break; + case ROM_BOARD_171_5874: mapper.map_as_rom(0x00000, 0x80000, 0xf80000, "rom1base", "decrypted_rom1base", 0x80000, write16_delegate(*this)); break; case ROM_BOARD_171_5987: if (romsize <= 0x100000) - mapper.map_as_rom(0x00000, 0x80000, 0xf80000, "rom1base", "decrypted_rom1base", 0x80000, write16_delegate(FUNC(segas18_state::rom_5987_bank_w), this)); + mapper.map_as_rom(0x00000, 0x80000, 0xf80000, "rom1base", "decrypted_rom1base", 0x80000, write16_delegate(*this, FUNC(segas18_state::rom_5987_bank_w))); else - mapper.map_as_rom(0x00000,0x100000, 0xf00000, "rom1base", "decrypted_rom1base",0x100000, write16_delegate(FUNC(segas18_state::rom_5987_bank_w), this)); + mapper.map_as_rom(0x00000,0x100000, 0xf00000, "rom1base", "decrypted_rom1base",0x100000, write16_delegate(*this, FUNC(segas18_state::rom_5987_bank_w))); break; - case ROM_BOARD_837_7525: mapper.map_as_rom(0x00000, 0x80000, 0xf80000, "rom1base", "decrypted_rom1base", 0x80000, write16_delegate(FUNC(segas18_state::rom_837_7525_bank_w), this)); + case ROM_BOARD_837_7525: mapper.map_as_rom(0x00000, 0x80000, 0xf80000, "rom1base", "decrypted_rom1base", 0x80000, write16_delegate(*this, FUNC(segas18_state::rom_837_7525_bank_w))); break; default: assert(false); @@ -104,12 +104,12 @@ void segas18_state::memory_mapper(sega_315_5195_mapper_device &mapper, uint8_t i switch (m_romboard) { case ROM_BOARD_171_SHADOW: - case ROM_BOARD_171_5874: mapper.map_as_rom(0x00000, 0x80000, 0xf80000, "rom0base", "decrypted_rom0base", 0x00000, write16_delegate()); break; + case ROM_BOARD_171_5874: mapper.map_as_rom(0x00000, 0x80000, 0xf80000, "rom0base", "decrypted_rom0base", 0x00000, write16_delegate(*this)); break; case ROM_BOARD_837_7525: case ROM_BOARD_171_5987: if (romsize <= 0x100000) - mapper.map_as_rom(0x00000, 0x80000, 0xf80000, "rom0base", "decrypted_rom0base", 0x00000, write16_delegate()); + mapper.map_as_rom(0x00000, 0x80000, 0xf80000, "rom0base", "decrypted_rom0base", 0x00000, write16_delegate(*this)); else - mapper.map_as_rom(0x00000,0x100000, 0xf00000, "rom0base", "decrypted_rom0base", 0x00000, write16_delegate()); + mapper.map_as_rom(0x00000,0x100000, 0xf00000, "rom0base", "decrypted_rom0base", 0x00000, write16_delegate(*this)); break; default: assert(false); } @@ -1321,7 +1321,7 @@ void segas18_state::system18(machine_config &config) NVRAM(config, m_nvram, nvram_device::DEFAULT_ALL_0); SEGA_315_5195_MEM_MAPPER(config, m_mapper, 10000000, m_maincpu); - m_mapper->set_mapper(FUNC(segas18_state::memory_mapper), this); + m_mapper->set_mapper(FUNC(segas18_state::memory_mapper)); m_mapper->pbf().set_inputline(m_soundcpu, INPUT_LINE_NMI); SEGA_315_5296(config, m_io, 16000000); @@ -1441,7 +1441,7 @@ void segas18_state::system18_i8751(machine_config &config) system18(config); // basic machine hardware - m_maincpu->set_vblank_int(device_interrupt_delegate(), nullptr); + m_maincpu->remove_vblank_int(); m_mapper->mcu_int().set_inputline(m_mcu, INPUT_LINE_IRQ1); @@ -1455,7 +1455,7 @@ void segas18_state::system18_fd1094_i8751(machine_config &config) system18_fd1094(config); // basic machine hardware - m_maincpu->set_vblank_int(device_interrupt_delegate(), nullptr); + m_maincpu->remove_vblank_int(); m_mapper->mcu_int().set_inputline(m_mcu, INPUT_LINE_IRQ1); @@ -3184,21 +3184,21 @@ void segas18_state::init_hamaway() void segas18_state::init_ddcrew() { init_generic_5987(); - m_custom_io_r = read16_delegate(FUNC(segas18_state::ddcrew_custom_io_r), this); + m_custom_io_r = read16_delegate(*this, FUNC(segas18_state::ddcrew_custom_io_r)); } void segas18_state::init_lghost() { init_generic_5987(); - m_custom_io_r = read16_delegate(FUNC(segas18_state::lghost_custom_io_r), this); - m_custom_io_w = write16_delegate(FUNC(segas18_state::lghost_custom_io_w), this); + m_custom_io_r = read16_delegate(*this, FUNC(segas18_state::lghost_custom_io_r)); + m_custom_io_w = write16_delegate(*this, FUNC(segas18_state::lghost_custom_io_w)); } void segas18_state::init_wwally() { init_generic_5987(); - m_custom_io_r = read16_delegate(FUNC(segas18_state::wwally_custom_io_r), this); - m_custom_io_w = write16_delegate(FUNC(segas18_state::wwally_custom_io_w), this); + m_custom_io_r = read16_delegate(*this, FUNC(segas18_state::wwally_custom_io_r)); + m_custom_io_w = write16_delegate(*this, FUNC(segas18_state::wwally_custom_io_w)); } |