diff options
Diffstat (limited to 'src/mame/machine/playch10.cpp')
-rw-r--r-- | src/mame/machine/playch10.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/mame/machine/playch10.cpp b/src/mame/machine/playch10.cpp index d38a4fc87f1..3fbb5b89018 100644 --- a/src/mame/machine/playch10.cpp +++ b/src/mame/machine/playch10.cpp @@ -46,8 +46,8 @@ void playch10_state::machine_start() /* move to individual boards as documentation of actual boards allows */ m_nt_ram = std::make_unique<uint8_t[]>(0x1000); - m_ppu->space(AS_PROGRAM).install_readwrite_handler(0, 0x1fff, read8_delegate(FUNC(playch10_state::pc10_chr_r),this), write8_delegate(FUNC(playch10_state::pc10_chr_w),this)); - m_ppu->space(AS_PROGRAM).install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(playch10_state::pc10_nt_r),this),write8_delegate(FUNC(playch10_state::pc10_nt_w),this)); + m_ppu->space(AS_PROGRAM).install_readwrite_handler(0, 0x1fff, read8_delegate(*this, FUNC(playch10_state::pc10_chr_r)), write8_delegate(*this, FUNC(playch10_state::pc10_chr_w))); + m_ppu->space(AS_PROGRAM).install_readwrite_handler(0x2000, 0x3eff, read8_delegate(*this, FUNC(playch10_state::pc10_nt_r)), write8_delegate(*this, FUNC(playch10_state::pc10_nt_w))); if (nullptr != m_vram) set_videoram_bank(0, 8, 0, 8); @@ -69,8 +69,8 @@ MACHINE_START_MEMBER(playch10_state,playch10_hboard) m_vram = std::make_unique<uint8_t[]>(0x2000); - m_ppu->space(AS_PROGRAM).install_readwrite_handler(0, 0x1fff, read8_delegate(FUNC(playch10_state::pc10_chr_r),this), write8_delegate(FUNC(playch10_state::pc10_chr_w),this)); - m_ppu->space(AS_PROGRAM).install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(playch10_state::pc10_nt_r),this), write8_delegate(FUNC(playch10_state::pc10_nt_w),this)); + m_ppu->space(AS_PROGRAM).install_readwrite_handler(0, 0x1fff, read8_delegate(*this, FUNC(playch10_state::pc10_chr_r)), write8_delegate(*this, FUNC(playch10_state::pc10_chr_w))); + m_ppu->space(AS_PROGRAM).install_readwrite_handler(0x2000, 0x3eff, read8_delegate(*this, FUNC(playch10_state::pc10_nt_r)), write8_delegate(*this, FUNC(playch10_state::pc10_nt_w))); } /************************************* @@ -555,7 +555,7 @@ WRITE8_MEMBER(playch10_state::aboard_vrom_switch_w) void playch10_state::init_pcaboard() { /* switches vrom with writes to the $803e-$8041 area */ - m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0x8fff, write8_delegate(FUNC(playch10_state::aboard_vrom_switch_w),this)); + m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0x8fff, write8_delegate(*this, FUNC(playch10_state::aboard_vrom_switch_w))); /* common init */ init_playch10(); @@ -587,7 +587,7 @@ void playch10_state::init_pcbboard() memcpy(&prg[0x08000], &prg[0x28000], 0x8000); /* Roms are banked at $8000 to $bfff */ - m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::bboard_rom_switch_w),this)); + m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(*this, FUNC(playch10_state::bboard_rom_switch_w))); /* common init */ init_playch10(); @@ -612,7 +612,7 @@ WRITE8_MEMBER(playch10_state::cboard_vrom_switch_w) void playch10_state::init_pccboard() { /* switches vrom with writes to $6000 */ - m_cartcpu->space(AS_PROGRAM).install_write_handler(0x6000, 0x6000, write8_delegate(FUNC(playch10_state::cboard_vrom_switch_w),this)); + m_cartcpu->space(AS_PROGRAM).install_write_handler(0x6000, 0x6000, write8_delegate(*this, FUNC(playch10_state::cboard_vrom_switch_w))); /* we have no vram, make sure switching games doesn't point to an old allocation */ m_vram = nullptr; @@ -635,7 +635,7 @@ void playch10_state::init_pcdboard() m_mmc1_rom_mask = 0x07; /* MMC mapper at writes to $8000-$ffff */ - m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::mmc1_rom_switch_w),this)); + m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(*this, FUNC(playch10_state::mmc1_rom_switch_w))); /* common init */ @@ -746,10 +746,10 @@ void playch10_state::init_pceboard() memcpy(&prg[0x08000], &prg[0x28000], 0x8000); /* basically a mapper 9 on a nes */ - m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::eboard_rom_switch_w),this)); + m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(*this, FUNC(playch10_state::eboard_rom_switch_w))); /* ppu_latch callback */ - m_ppu->set_latch(ppu2c0x_device::latch_delegate(FUNC(playch10_state::mapper9_latch),this)); + m_ppu->set_latch(*this, FUNC(playch10_state::mapper9_latch)); /* nvram at $6000-$6fff */ m_cartcpu->space(AS_PROGRAM).install_ram(0x6000, 0x6fff); @@ -776,7 +776,7 @@ void playch10_state::init_pcfboard() m_mmc1_rom_mask = ((len - 0x10000) / 0x4000) - 1; /* MMC mapper at writes to $8000-$ffff */ - m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::mmc1_rom_switch_w),this)); + m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(*this, FUNC(playch10_state::mmc1_rom_switch_w))); /* common init */ init_playch10(); @@ -960,7 +960,7 @@ void playch10_state::init_pcgboard() memcpy(&prg[0x0c000], &prg[0x4c000], 0x4000); /* MMC3 mapper at writes to $8000-$ffff */ - m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::gboard_rom_switch_w),this)); + m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(*this, FUNC(playch10_state::gboard_rom_switch_w))); /* extra ram at $6000-$7fff */ m_cartcpu->space(AS_PROGRAM).install_ram(0x6000, 0x7fff); @@ -976,7 +976,7 @@ void playch10_state::init_pcgboard() /* common init */ init_playch10(); - m_ppu->set_scanline_callback(ppu2c0x_device::scanline_delegate(FUNC(playch10_state::gboard_scanline_cb),this)); + m_ppu->set_scanline_callback(*this, FUNC(playch10_state::gboard_scanline_cb)); } void playch10_state::init_pcgboard_type2() @@ -1014,7 +1014,7 @@ void playch10_state::init_pciboard() memcpy(&prg[0x08000], &prg[0x10000], 0x8000); /* Roms are banked at $8000 to $bfff */ - m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::iboard_rom_switch_w),this)); + m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(*this, FUNC(playch10_state::iboard_rom_switch_w))); /* common init */ init_playch10(); @@ -1081,7 +1081,7 @@ void playch10_state::init_pchboard() memcpy(&prg[0x0c000], &prg[0x4c000], 0x4000); /* Roms are banked at $8000 to $bfff */ - m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::hboard_rom_switch_w),this)); + m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(*this, FUNC(playch10_state::hboard_rom_switch_w))); /* extra ram at $6000-$7fff */ m_cartcpu->space(AS_PROGRAM).install_ram(0x6000, 0x7fff); @@ -1096,7 +1096,7 @@ void playch10_state::init_pchboard() /* common init */ init_playch10(); - m_ppu->set_scanline_callback(ppu2c0x_device::scanline_delegate(FUNC(playch10_state::gboard_scanline_cb),this)); + m_ppu->set_scanline_callback(*this, FUNC(playch10_state::gboard_scanline_cb)); } /**********************************************************************************/ @@ -1116,7 +1116,7 @@ void playch10_state::init_pckboard() m_cartcpu->space(AS_PROGRAM).install_ram(0x6000, 0x7fff); /* Roms are banked at $8000 to $bfff */ - m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::mmc1_rom_switch_w),this)); + m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(*this, FUNC(playch10_state::mmc1_rom_switch_w))); /* common init */ init_playch10(); |