diff options
Diffstat (limited to 'src/mame/machine/mpu4.cpp')
-rw-r--r-- | src/mame/machine/mpu4.cpp | 386 |
1 files changed, 193 insertions, 193 deletions
diff --git a/src/mame/machine/mpu4.cpp b/src/mame/machine/mpu4.cpp index 4591f5a3722..a41c0410049 100644 --- a/src/mame/machine/mpu4.cpp +++ b/src/mame/machine/mpu4.cpp @@ -2668,338 +2668,338 @@ void mpu4_state::mpu4_memmap(address_map &map) MACHINE_CONFIG_START(mpu4_state::mpu4_std_3reel) MCFG_MPU4_STD_REEL_ADD("reel0") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>)) MCFG_MPU4_STD_REEL_ADD("reel1") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>)) MCFG_MPU4_STD_REEL_ADD("reel2") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>)) MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mpu4_type2_3reel) MCFG_MPU4_TYPE2_REEL_ADD("reel0") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>)) MCFG_MPU4_TYPE2_REEL_ADD("reel1") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>)) MCFG_MPU4_TYPE2_REEL_ADD("reel2") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>)) MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mpu4_type3_3reel) MCFG_MPU4_TYPE3_REEL_ADD("reel0") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>)) MCFG_MPU4_TYPE3_REEL_ADD("reel1") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>)) MCFG_MPU4_TYPE3_REEL_ADD("reel2") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>)) MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mpu4_type4_3reel) MCFG_MPU4_TYPE4_REEL_ADD("reel0") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>)) MCFG_MPU4_TYPE4_REEL_ADD("reel1") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>)) MCFG_MPU4_TYPE4_REEL_ADD("reel2") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>)) MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mpu4_bwb_3reel) MCFG_MPU4_BWB_REEL_ADD("reel0") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>)) MCFG_MPU4_BWB_REEL_ADD("reel1") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>)) MCFG_MPU4_BWB_REEL_ADD("reel2") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>)) MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mpu4_std_4reel) MCFG_MPU4_STD_REEL_ADD("reel0") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>)) MCFG_MPU4_STD_REEL_ADD("reel1") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>)) MCFG_MPU4_STD_REEL_ADD("reel2") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>)) MCFG_MPU4_STD_REEL_ADD("reel3") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>)) MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mpu4_type2_4reel) MCFG_MPU4_TYPE2_REEL_ADD("reel0") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>)) MCFG_MPU4_TYPE2_REEL_ADD("reel1") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>)) MCFG_MPU4_TYPE2_REEL_ADD("reel2") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>)) MCFG_MPU4_TYPE2_REEL_ADD("reel3") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>)) MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mpu4_type3_4reel) MCFG_MPU4_TYPE3_REEL_ADD("reel0") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>)) MCFG_MPU4_TYPE3_REEL_ADD("reel1") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>)) MCFG_MPU4_TYPE3_REEL_ADD("reel2") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>)) MCFG_MPU4_TYPE3_REEL_ADD("reel3") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>)) MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mpu4_type4_4reel) MCFG_MPU4_TYPE4_REEL_ADD("reel0") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>)) MCFG_MPU4_TYPE4_REEL_ADD("reel1") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>)) MCFG_MPU4_TYPE4_REEL_ADD("reel2") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>)) MCFG_MPU4_TYPE4_REEL_ADD("reel3") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>)) MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mpu4_bwb_4reel) MCFG_MPU4_BWB_REEL_ADD("reel0") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>)) MCFG_MPU4_BWB_REEL_ADD("reel1") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>)) MCFG_MPU4_BWB_REEL_ADD("reel2") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>)) MCFG_MPU4_BWB_REEL_ADD("reel3") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>)) MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mpu4_std_5reel) MCFG_MPU4_STD_REEL_ADD("reel0") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>)) MCFG_MPU4_STD_REEL_ADD("reel1") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>)) MCFG_MPU4_STD_REEL_ADD("reel2") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>)) MCFG_MPU4_STD_REEL_ADD("reel3") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>)) MCFG_MPU4_STD_REEL_ADD("reel4") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>)) MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mpu4_type2_5reel) MCFG_MPU4_TYPE2_REEL_ADD("reel0") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>)) MCFG_MPU4_TYPE2_REEL_ADD("reel1") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>)) MCFG_MPU4_TYPE2_REEL_ADD("reel2") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>)) MCFG_MPU4_TYPE2_REEL_ADD("reel3") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>)) MCFG_MPU4_TYPE2_REEL_ADD("reel4") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>)) MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mpu4_type3_5reel) MCFG_MPU4_TYPE3_REEL_ADD("reel0") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>)) MCFG_MPU4_TYPE3_REEL_ADD("reel1") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>)) MCFG_MPU4_TYPE3_REEL_ADD("reel2") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>)) MCFG_MPU4_TYPE3_REEL_ADD("reel3") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>)) MCFG_MPU4_TYPE3_REEL_ADD("reel4") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>)) MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mpu4_type4_5reel) MCFG_MPU4_TYPE4_REEL_ADD("reel0") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>)) MCFG_MPU4_TYPE4_REEL_ADD("reel1") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>)) MCFG_MPU4_TYPE4_REEL_ADD("reel2") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>)) MCFG_MPU4_TYPE4_REEL_ADD("reel3") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>)) MCFG_MPU4_TYPE4_REEL_ADD("reel4") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>)) MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mpu4_bwb_5reel) MCFG_MPU4_BWB_REEL_ADD("reel0") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>)) MCFG_MPU4_BWB_REEL_ADD("reel1") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>)) MCFG_MPU4_BWB_REEL_ADD("reel2") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>)) MCFG_MPU4_BWB_REEL_ADD("reel3") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>)) MCFG_MPU4_BWB_REEL_ADD("reel4") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>)) MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mpu4_std_6reel) MCFG_MPU4_STD_REEL_ADD("reel0") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>)) MCFG_MPU4_STD_REEL_ADD("reel1") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>)) MCFG_MPU4_STD_REEL_ADD("reel2") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>)) MCFG_MPU4_STD_REEL_ADD("reel3") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>)) MCFG_MPU4_STD_REEL_ADD("reel4") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>)) MCFG_MPU4_STD_REEL_ADD("reel5") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>)) MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mpu4_type2_6reel) MCFG_MPU4_TYPE2_REEL_ADD("reel0") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>)) MCFG_MPU4_TYPE2_REEL_ADD("reel1") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>)) MCFG_MPU4_TYPE2_REEL_ADD("reel2") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>)) MCFG_MPU4_TYPE2_REEL_ADD("reel3") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>)) MCFG_MPU4_TYPE2_REEL_ADD("reel4") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>)) MCFG_MPU4_TYPE2_REEL_ADD("reel5") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<5>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<5>)) MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mpu4_type3_6reel) MCFG_MPU4_TYPE3_REEL_ADD("reel0") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>)) MCFG_MPU4_TYPE3_REEL_ADD("reel1") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>)) MCFG_MPU4_TYPE3_REEL_ADD("reel2") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>)) MCFG_MPU4_TYPE3_REEL_ADD("reel3") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>)) MCFG_MPU4_TYPE3_REEL_ADD("reel4") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>)) MCFG_MPU4_TYPE3_REEL_ADD("reel5") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<5>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<5>)) MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mpu4_type4_6reel) MCFG_MPU4_TYPE4_REEL_ADD("reel0") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>)) MCFG_MPU4_TYPE4_REEL_ADD("reel1") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>)) MCFG_MPU4_TYPE4_REEL_ADD("reel2") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>)) MCFG_MPU4_TYPE4_REEL_ADD("reel3") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>)) MCFG_MPU4_TYPE4_REEL_ADD("reel4") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>)) MCFG_MPU4_TYPE4_REEL_ADD("reel5") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<5>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<5>)) MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mpu4_bwb_6reel) MCFG_MPU4_BWB_REEL_ADD("reel0") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>)) MCFG_MPU4_BWB_REEL_ADD("reel1") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>)) MCFG_MPU4_BWB_REEL_ADD("reel2") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>)) MCFG_MPU4_BWB_REEL_ADD("reel3") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>)) MCFG_MPU4_BWB_REEL_ADD("reel4") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>)) MCFG_MPU4_BWB_REEL_ADD("reel5") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<5>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<5>)) MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mpu4_std_7reel) MCFG_MPU4_STD_REEL_ADD("reel0") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>)) MCFG_MPU4_STD_REEL_ADD("reel1") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>)) MCFG_MPU4_STD_REEL_ADD("reel2") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>)) MCFG_MPU4_STD_REEL_ADD("reel3") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>)) MCFG_MPU4_STD_REEL_ADD("reel4") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>)) MCFG_MPU4_STD_REEL_ADD("reel5") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<5>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<5>)) MCFG_MPU4_STD_REEL_ADD("reel6") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<6>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<6>)) MCFG_MPU4_STD_REEL_ADD("reel7") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<7>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<7>)) MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mpu4_type2_7reel) MCFG_MPU4_TYPE2_REEL_ADD("reel0") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>)) MCFG_MPU4_TYPE2_REEL_ADD("reel1") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>)) MCFG_MPU4_TYPE2_REEL_ADD("reel2") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>)) MCFG_MPU4_TYPE2_REEL_ADD("reel3") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>)) MCFG_MPU4_TYPE2_REEL_ADD("reel4") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>)) MCFG_MPU4_TYPE2_REEL_ADD("reel5") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<5>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<5>)) MCFG_MPU4_TYPE2_REEL_ADD("reel6") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<6>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<6>)) MCFG_MPU4_TYPE2_REEL_ADD("reel7") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<7>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<7>)) MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mpu4_type3_7reel) MCFG_MPU4_TYPE3_REEL_ADD("reel0") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>)) MCFG_MPU4_TYPE3_REEL_ADD("reel1") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>)) MCFG_MPU4_TYPE3_REEL_ADD("reel2") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>)) MCFG_MPU4_TYPE3_REEL_ADD("reel3") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>)) MCFG_MPU4_TYPE3_REEL_ADD("reel4") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>)) MCFG_MPU4_TYPE3_REEL_ADD("reel5") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<5>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<5>)) MCFG_MPU4_TYPE3_REEL_ADD("reel6") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<6>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<6>)) MCFG_MPU4_TYPE3_REEL_ADD("reel7") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<7>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<7>)) MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mpu4_type4_7reel) MCFG_MPU4_TYPE4_REEL_ADD("reel0") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>)) MCFG_MPU4_TYPE4_REEL_ADD("reel1") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>)) MCFG_MPU4_TYPE4_REEL_ADD("reel2") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>)) MCFG_MPU4_TYPE4_REEL_ADD("reel3") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>)) MCFG_MPU4_TYPE4_REEL_ADD("reel4") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>)) MCFG_MPU4_TYPE4_REEL_ADD("reel5") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<5>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<5>)) MCFG_MPU4_TYPE4_REEL_ADD("reel6") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<6>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<6>)) MCFG_MPU4_TYPE4_REEL_ADD("reel7") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<7>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<7>)) MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mpu4_bwb_7reel) MCFG_MPU4_BWB_REEL_ADD("reel0") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>)) MCFG_MPU4_BWB_REEL_ADD("reel1") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>)) MCFG_MPU4_BWB_REEL_ADD("reel2") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>)) MCFG_MPU4_BWB_REEL_ADD("reel3") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>)) MCFG_MPU4_BWB_REEL_ADD("reel4") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>)) MCFG_MPU4_BWB_REEL_ADD("reel5") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<5>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<5>)) MCFG_MPU4_BWB_REEL_ADD("reel6") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<6>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<6>)) MCFG_MPU4_BWB_REEL_ADD("reel7") - MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<7>)) + MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<7>)) MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mpu4_common) @@ -3009,62 +3009,62 @@ MACHINE_CONFIG_START(mpu4_state::mpu4_common) /* 6840 PTM */ MCFG_DEVICE_ADD("ptm_ic2", PTM6840, MPU4_MASTER_CLOCK / 4) MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0) - MCFG_PTM6840_O1_CB(WRITELINE(mpu4_state, ic2_o1_callback)) - MCFG_PTM6840_O2_CB(WRITELINE(mpu4_state, ic2_o2_callback)) - MCFG_PTM6840_O3_CB(WRITELINE(mpu4_state, ic2_o3_callback)) - MCFG_PTM6840_IRQ_CB(WRITELINE(mpu4_state, cpu0_irq)) + MCFG_PTM6840_O1_CB(WRITELINE(*this, mpu4_state, ic2_o1_callback)) + MCFG_PTM6840_O2_CB(WRITELINE(*this, mpu4_state, ic2_o2_callback)) + MCFG_PTM6840_O3_CB(WRITELINE(*this, mpu4_state, ic2_o3_callback)) + MCFG_PTM6840_IRQ_CB(WRITELINE(*this, mpu4_state, cpu0_irq)) MCFG_DEVICE_ADD("pia_ic3", PIA6821, 0) - MCFG_PIA_WRITEPA_HANDLER(WRITE8(mpu4_state, pia_ic3_porta_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_ic3_portb_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(mpu4_state, pia_ic3_ca2_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE(mpu4_state, pia_ic3_cb2_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(mpu4_state, cpu0_irq)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(mpu4_state, cpu0_irq)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, mpu4_state, pia_ic3_porta_w)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, mpu4_state, pia_ic3_portb_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(*this, mpu4_state, pia_ic3_ca2_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(*this, mpu4_state, pia_ic3_cb2_w)) + MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, mpu4_state, cpu0_irq)) + MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, mpu4_state, cpu0_irq)) MCFG_DEVICE_ADD("pia_ic4", PIA6821, 0) - MCFG_PIA_READPB_HANDLER(READ8(mpu4_state, pia_ic4_portb_r)) - MCFG_PIA_WRITEPA_HANDLER(WRITE8(mpu4_state, pia_ic4_porta_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_ic4_portb_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(mpu4_state,pia_ic4_ca2_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE(mpu4_state,pia_ic4_cb2_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(mpu4_state,cpu0_irq)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(mpu4_state,cpu0_irq)) + MCFG_PIA_READPB_HANDLER(READ8(*this, mpu4_state, pia_ic4_portb_r)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, mpu4_state, pia_ic4_porta_w)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, mpu4_state, pia_ic4_portb_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(*this, mpu4_state,pia_ic4_ca2_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(*this, mpu4_state,pia_ic4_cb2_w)) + MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, mpu4_state,cpu0_irq)) + MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, mpu4_state,cpu0_irq)) MCFG_DEVICE_ADD("pia_ic5", PIA6821, 0) - MCFG_PIA_READPA_HANDLER(READ8(mpu4_state, pia_ic5_porta_r)) - MCFG_PIA_READPB_HANDLER(READ8(mpu4_state, pia_ic5_portb_r)) - MCFG_PIA_WRITEPA_HANDLER(WRITE8(mpu4_state, pia_ic5_porta_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_ic5_portb_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(mpu4_state, pia_ic5_ca2_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE(mpu4_state, pia_ic5_cb2_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(mpu4_state, cpu0_irq)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(mpu4_state, cpu0_irq)) + MCFG_PIA_READPA_HANDLER(READ8(*this, mpu4_state, pia_ic5_porta_r)) + MCFG_PIA_READPB_HANDLER(READ8(*this, mpu4_state, pia_ic5_portb_r)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, mpu4_state, pia_ic5_porta_w)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, mpu4_state, pia_ic5_portb_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(*this, mpu4_state, pia_ic5_ca2_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(*this, mpu4_state, pia_ic5_cb2_w)) + MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, mpu4_state, cpu0_irq)) + MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, mpu4_state, cpu0_irq)) MCFG_DEVICE_ADD("pia_ic6", PIA6821, 0) - MCFG_PIA_WRITEPA_HANDLER(WRITE8(mpu4_state, pia_ic6_porta_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_ic6_portb_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(mpu4_state, pia_ic6_ca2_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE(mpu4_state, pia_ic6_cb2_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(mpu4_state, cpu0_irq)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(mpu4_state, cpu0_irq)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, mpu4_state, pia_ic6_porta_w)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, mpu4_state, pia_ic6_portb_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(*this, mpu4_state, pia_ic6_ca2_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(*this, mpu4_state, pia_ic6_cb2_w)) + MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, mpu4_state, cpu0_irq)) + MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, mpu4_state, cpu0_irq)) MCFG_DEVICE_ADD("pia_ic7", PIA6821, 0) - MCFG_PIA_READPB_HANDLER(READ8(mpu4_state, pia_ic7_portb_r)) - MCFG_PIA_WRITEPA_HANDLER(WRITE8(mpu4_state, pia_ic7_porta_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_ic7_portb_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(mpu4_state, pia_ic7_ca2_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE(mpu4_state, pia_ic7_cb2_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(mpu4_state, cpu0_irq)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(mpu4_state, cpu0_irq)) + MCFG_PIA_READPB_HANDLER(READ8(*this, mpu4_state, pia_ic7_portb_r)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, mpu4_state, pia_ic7_porta_w)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, mpu4_state, pia_ic7_portb_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(*this, mpu4_state, pia_ic7_ca2_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(*this, mpu4_state, pia_ic7_cb2_w)) + MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, mpu4_state, cpu0_irq)) + MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, mpu4_state, cpu0_irq)) MCFG_DEVICE_ADD("pia_ic8", PIA6821, 0) - MCFG_PIA_READPA_HANDLER(READ8(mpu4_state, pia_ic8_porta_r)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_ic8_portb_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(mpu4_state, pia_ic8_ca2_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE(mpu4_state, pia_ic8_cb2_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(mpu4_state, cpu0_irq)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(mpu4_state, cpu0_irq)) + MCFG_PIA_READPA_HANDLER(READ8(*this, mpu4_state, pia_ic8_porta_r)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, mpu4_state, pia_ic8_portb_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(*this, mpu4_state, pia_ic8_ca2_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(*this, mpu4_state, pia_ic8_cb2_w)) + MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, mpu4_state, cpu0_irq)) + MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, mpu4_state, cpu0_irq)) MCFG_DEVICE_ADD("meters", METERS, 0) MCFG_METERS_NUMBER(8) @@ -3074,17 +3074,17 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mpu4_common2) MCFG_DEVICE_ADD("ptm_ic3ss", PTM6840, MPU4_MASTER_CLOCK / 4) MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0) - MCFG_PTM6840_O1_CB(DEVWRITELINE("ptm_ic3ss", ptm6840_device, set_c2)) - MCFG_PTM6840_O2_CB(DEVWRITELINE("ptm_ic3ss", ptm6840_device, set_c1)) - //MCFG_PTM6840_O3_CB(DEVWRITELINE("ptm_ic3ss", ptm6840_device, set_g1)) - //MCFG_PTM6840_IRQ_CB(WRITELINE(mpu4_state, cpu1_ptm_irq)) + MCFG_PTM6840_O1_CB(WRITELINE("ptm_ic3ss", ptm6840_device, set_c2)) + MCFG_PTM6840_O2_CB(WRITELINE("ptm_ic3ss", ptm6840_device, set_c1)) + //MCFG_PTM6840_O3_CB(WRITELINE("ptm_ic3ss", ptm6840_device, set_g1)) + //MCFG_PTM6840_IRQ_CB(WRITELINE(*this, mpu4_state, cpu1_ptm_irq)) MCFG_DEVICE_ADD("pia_ic4ss", PIA6821, 0) - MCFG_PIA_READPB_HANDLER(READ8(mpu4_state, pia_gb_portb_r)) - MCFG_PIA_WRITEPA_HANDLER(WRITE8(mpu4_state, pia_gb_porta_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_gb_portb_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(mpu4_state, pia_gb_ca2_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE(mpu4_state, pia_gb_cb2_w)) + MCFG_PIA_READPB_HANDLER(READ8(*this, mpu4_state, pia_gb_portb_r)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, mpu4_state, pia_gb_porta_w)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, mpu4_state, pia_gb_portb_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(*this, mpu4_state, pia_gb_ca2_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(*this, mpu4_state, pia_gb_cb2_w)) MACHINE_CONFIG_END /* machine driver for MOD 2 board */ @@ -3092,8 +3092,8 @@ MACHINE_CONFIG_START(mpu4_state::mpu4base) MCFG_MACHINE_START_OVERRIDE(mpu4_state,mod2 ) MCFG_MACHINE_RESET_OVERRIDE(mpu4_state,mpu4) - MCFG_CPU_ADD("maincpu", MC6809, MPU4_MASTER_CLOCK) // MC68B09P - MCFG_CPU_PROGRAM_MAP(mpu4_memmap) + MCFG_DEVICE_ADD("maincpu", MC6809, MPU4_MASTER_CLOCK) // MC68B09P + MCFG_DEVICE_PROGRAM_MAP(mpu4_memmap) mpu4_common(config); @@ -3107,7 +3107,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mod2) mpu4base(config); - MCFG_SOUND_ADD("ay8913", AY8913, MPU4_MASTER_CLOCK/4) + MCFG_DEVICE_ADD("ay8913", AY8913, MPU4_MASTER_CLOCK/4) MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT) MCFG_AY8910_RES_LOADS(820, 0, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) @@ -3117,7 +3117,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mod2_alt) mpu4base(config); - MCFG_SOUND_ADD("ay8913", AY8913, MPU4_MASTER_CLOCK/4) + MCFG_DEVICE_ADD("ay8913", AY8913, MPU4_MASTER_CLOCK/4) MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT) MCFG_AY8910_RES_LOADS(820, 0, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) @@ -3133,7 +3133,7 @@ MACHINE_CONFIG_START(mpu4_state::mod4yam) mpu4_std_6reel(config); - MCFG_SOUND_ADD("ym2413", YM2413, MPU4_MASTER_CLOCK/4) + MCFG_DEVICE_ADD("ym2413", YM2413, MPU4_MASTER_CLOCK/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_CONFIG_END @@ -3145,7 +3145,7 @@ MACHINE_CONFIG_START(mpu4_state::mod4oki) mpu4_common2(config); mpu4_std_6reel(config); - MCFG_SOUND_ADD("msm6376", OKIM6376, 128000) //16KHz sample Can also be 85430 at 10.5KHz and 64000 at 8KHz + MCFG_DEVICE_ADD("msm6376", OKIM6376, 128000) //16KHz sample Can also be 85430 at 10.5KHz and 64000 at 8KHz MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_CONFIG_END @@ -3157,7 +3157,7 @@ MACHINE_CONFIG_START(mpu4_state::mod4oki_alt) mpu4_common2(config); mpu4_type2_6reel(config); - MCFG_SOUND_ADD("msm6376", OKIM6376, 128000) //16KHz sample Can also be 85430 at 10.5KHz and 64000 at 8KHz + MCFG_DEVICE_ADD("msm6376", OKIM6376, 128000) //16KHz sample Can also be 85430 at 10.5KHz and 64000 at 8KHz MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_CONFIG_END @@ -3169,7 +3169,7 @@ MACHINE_CONFIG_START(mpu4_state::mod4oki_5r) mpu4_common2(config); mpu4_std_5reel(config); - MCFG_SOUND_ADD("msm6376", OKIM6376, 128000) //16KHz sample Can also be 85430 at 10.5KHz and 64000 at 8KHz + MCFG_DEVICE_ADD("msm6376", OKIM6376, 128000) //16KHz sample Can also be 85430 at 10.5KHz and 64000 at 8KHz MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_CONFIG_END @@ -3180,7 +3180,7 @@ MACHINE_CONFIG_START(mpu4_state::bwboki) mpu4_common2(config); mpu4_bwb_5reel(config); - MCFG_SOUND_ADD("msm6376", OKIM6376, 128000) //16KHz sample Can also be 85430 at 10.5KHz and 64000 at 8KHz + MCFG_DEVICE_ADD("msm6376", OKIM6376, 128000) //16KHz sample Can also be 85430 at 10.5KHz and 64000 at 8KHz MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_CONFIG_END @@ -3189,7 +3189,7 @@ MACHINE_CONFIG_START(mpu4_state::mpu4crys) mod2(config); MCFG_MACHINE_START_OVERRIDE(mpu4_state,mpu4cry) - MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK) + MCFG_DEVICE_ADD("upd", UPD7759) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_CONFIG_END |