diff options
Diffstat (limited to 'src/mame/drivers/segac2.cpp')
-rw-r--r-- | src/mame/drivers/segac2.cpp | 61 |
1 files changed, 31 insertions, 30 deletions
diff --git a/src/mame/drivers/segac2.cpp b/src/mame/drivers/segac2.cpp index a194c4d37d0..ce5350b1ec5 100644 --- a/src/mame/drivers/segac2.cpp +++ b/src/mame/drivers/segac2.cpp @@ -105,6 +105,7 @@ public: : md_base_state(mconfig, type, tag) , m_paletteram(*this, "paletteram") , m_upd_region(*this, "upd") + , m_prot_func(*this) , m_upd7759(*this, "upd") , m_screen(*this, "screen") , m_palette(*this, "palette") @@ -2140,7 +2141,7 @@ void segac2_state::segac2_common_init(segac2_prot_delegate prot_func) m_prot_func = prot_func; if (m_upd7759 != nullptr) - m_maincpu->space(AS_PROGRAM).install_write_handler(0x880000, 0x880001, 0, 0x13fefe, 0, write16_delegate(FUNC(segac2_state::segac2_upd7759_w),this)); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x880000, 0x880001, 0, 0x13fefe, 0, write16_delegate(*this, FUNC(segac2_state::segac2_upd7759_w))); } int segac2_state::prot_func_dummy(int in) @@ -2373,94 +2374,94 @@ int segac2_state::prot_func_pclubjv5(int in) void segac2_state::init_c2boot() { - segac2_common_init(segac2_prot_delegate(FUNC(segac2_state::prot_func_dummy),this)); + segac2_common_init(segac2_prot_delegate(*this, FUNC(segac2_state::prot_func_dummy))); } void segac2_state::init_bloxeedc() { - segac2_common_init(segac2_prot_delegate(FUNC(segac2_state::prot_func_dummy),this)); + segac2_common_init(segac2_prot_delegate(*this, FUNC(segac2_state::prot_func_dummy))); } void segac2_state::init_columns() { - segac2_common_init(segac2_prot_delegate(FUNC(segac2_state::prot_func_columns),this)); + segac2_common_init(segac2_prot_delegate(*this, FUNC(segac2_state::prot_func_columns))); } void segac2_state::init_columns2() { - segac2_common_init(segac2_prot_delegate(FUNC(segac2_state::prot_func_columns2),this)); + segac2_common_init(segac2_prot_delegate(*this, FUNC(segac2_state::prot_func_columns2))); } void segac2_state::init_tfrceac() { - segac2_common_init(segac2_prot_delegate(FUNC(segac2_state::prot_func_tfrceac),this)); + segac2_common_init(segac2_prot_delegate(*this, FUNC(segac2_state::prot_func_tfrceac))); } void segac2_state::init_tfrceacb() { /* disable the palette bank switching from the protection chip */ - segac2_common_init(segac2_prot_delegate(FUNC(segac2_state::prot_func_dummy),this)); + segac2_common_init(segac2_prot_delegate(*this, FUNC(segac2_state::prot_func_dummy))); m_maincpu->space(AS_PROGRAM).nop_write(0x800000, 0x800001); } void segac2_state::init_borench() { - segac2_common_init(segac2_prot_delegate(FUNC(segac2_state::prot_func_borench),this)); + segac2_common_init(segac2_prot_delegate(*this, FUNC(segac2_state::prot_func_borench))); } void segac2_state::init_twinsqua() { - segac2_common_init(segac2_prot_delegate(FUNC(segac2_state::prot_func_twinsqua),this)); + segac2_common_init(segac2_prot_delegate(*this, FUNC(segac2_state::prot_func_twinsqua))); } void segac2_state::init_ribbit() { - segac2_common_init(segac2_prot_delegate(FUNC(segac2_state::prot_func_ribbit),this)); + segac2_common_init(segac2_prot_delegate(*this, FUNC(segac2_state::prot_func_ribbit))); } void segac2_state::init_puyo() { - segac2_common_init(segac2_prot_delegate(FUNC(segac2_state::prot_func_puyo),this)); + segac2_common_init(segac2_prot_delegate(*this, FUNC(segac2_state::prot_func_puyo))); } void segac2_state::init_tantr() { - segac2_common_init(segac2_prot_delegate(FUNC(segac2_state::prot_func_tantr),this)); + segac2_common_init(segac2_prot_delegate(*this, FUNC(segac2_state::prot_func_tantr))); } void segac2_state::init_tantrkor() { - segac2_common_init(segac2_prot_delegate(FUNC(segac2_state::prot_func_tantrkor),this)); + segac2_common_init(segac2_prot_delegate(*this, FUNC(segac2_state::prot_func_tantrkor))); } void segac2_state::init_potopoto() { - segac2_common_init(segac2_prot_delegate(FUNC(segac2_state::prot_func_potopoto),this)); + segac2_common_init(segac2_prot_delegate(*this, FUNC(segac2_state::prot_func_potopoto))); } void segac2_state::init_stkclmns() { - segac2_common_init(segac2_prot_delegate(FUNC(segac2_state::prot_func_stkclmns),this)); + segac2_common_init(segac2_prot_delegate(*this, FUNC(segac2_state::prot_func_stkclmns))); } void segac2_state::init_stkclmnj() { - segac2_common_init(segac2_prot_delegate(FUNC(segac2_state::prot_func_stkclmnj),this)); + segac2_common_init(segac2_prot_delegate(*this, FUNC(segac2_state::prot_func_stkclmnj))); } void segac2_state::init_ichir() { - segac2_common_init(segac2_prot_delegate(FUNC(segac2_state::prot_func_ichir),this)); + segac2_common_init(segac2_prot_delegate(*this, FUNC(segac2_state::prot_func_ichir))); } void segac2_state::init_ichirk() { - segac2_common_init(segac2_prot_delegate(FUNC(segac2_state::prot_func_ichirk),this)); + segac2_common_init(segac2_prot_delegate(*this, FUNC(segac2_state::prot_func_ichirk))); } void segac2_state::init_ichirj() { - segac2_common_init(segac2_prot_delegate(FUNC(segac2_state::prot_func_ichirj),this)); + segac2_common_init(segac2_prot_delegate(*this, FUNC(segac2_state::prot_func_ichirj))); } READ16_MEMBER(segac2_state::ichirjbl_prot_r ) @@ -2470,49 +2471,49 @@ READ16_MEMBER(segac2_state::ichirjbl_prot_r ) void segac2_state::init_ichirjbl() { - segac2_common_init(segac2_prot_delegate(FUNC(segac2_state::prot_func_dummy),this)); + segac2_common_init(segac2_prot_delegate(*this, FUNC(segac2_state::prot_func_dummy))); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x840108, 0x840109, read16_delegate(FUNC(segac2_state::ichirjbl_prot_r),this) ); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x840108, 0x840109, read16_delegate(*this, FUNC(segac2_state::ichirjbl_prot_r))); } void segac2_state::init_puyopuy2() { - segac2_common_init(segac2_prot_delegate(FUNC(segac2_state::prot_func_puyopuy2),this)); + segac2_common_init(segac2_prot_delegate(*this, FUNC(segac2_state::prot_func_puyopuy2))); } void segac2_state::init_zunkyou() { - segac2_common_init(segac2_prot_delegate(FUNC(segac2_state::prot_func_zunkyou),this)); + segac2_common_init(segac2_prot_delegate(*this, FUNC(segac2_state::prot_func_zunkyou))); } void segac2_state::init_pclub() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x880120, 0x880121, read16_delegate(FUNC(segac2_state::printer_r),this) ); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x880124, 0x880125, read16_delegate(FUNC(segac2_state::printer_r),this) ); - m_maincpu->space(AS_PROGRAM).install_write_handler(0x880124, 0x880125, write16_delegate(FUNC(segac2_state::print_club_camera_w),this)); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x880120, 0x880121, read16_delegate(*this, FUNC(segac2_state::printer_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x880124, 0x880125, read16_delegate(*this, FUNC(segac2_state::printer_r))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x880124, 0x880125, write16_delegate(*this, FUNC(segac2_state::print_club_camera_w))); } void segac2_state::init_pclubj() { - segac2_common_init(segac2_prot_delegate(FUNC(segac2_state::prot_func_pclub),this)); + segac2_common_init(segac2_prot_delegate(*this, FUNC(segac2_state::prot_func_pclub))); init_pclub(); } void segac2_state::init_pclubjv2() { - segac2_common_init(segac2_prot_delegate(FUNC(segac2_state::prot_func_pclubjv2),this)); + segac2_common_init(segac2_prot_delegate(*this, FUNC(segac2_state::prot_func_pclubjv2))); init_pclub(); } void segac2_state::init_pclubjv4() { - segac2_common_init(segac2_prot_delegate(FUNC(segac2_state::prot_func_pclubjv4),this)); + segac2_common_init(segac2_prot_delegate(*this, FUNC(segac2_state::prot_func_pclubjv4))); init_pclub(); } void segac2_state::init_pclubjv5() { - segac2_common_init(segac2_prot_delegate(FUNC(segac2_state::prot_func_pclubjv5),this)); + segac2_common_init(segac2_prot_delegate(*this, FUNC(segac2_state::prot_func_pclubjv5))); init_pclub(); } |