summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/mpu3.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/mpu3.cpp')
-rw-r--r--src/mame/drivers/mpu3.cpp62
1 files changed, 31 insertions, 31 deletions
diff --git a/src/mame/drivers/mpu3.cpp b/src/mame/drivers/mpu3.cpp
index 6aa4658a092..7d648822dbe 100644
--- a/src/mame/drivers/mpu3.cpp
+++ b/src/mame/drivers/mpu3.cpp
@@ -844,8 +844,8 @@ void mpu3_state::mpu3_basemap(address_map &map)
MCFG_STEPPER_INIT_PHASE(2)
MACHINE_CONFIG_START(mpu3_state::mpu3base)
- MCFG_CPU_ADD("maincpu", M6808, MPU3_MASTER_CLOCK)///4)
- MCFG_CPU_PROGRAM_MAP(mpu3_basemap)
+ MCFG_DEVICE_ADD("maincpu", M6808, MPU3_MASTER_CLOCK)///4)
+ MCFG_DEVICE_PROGRAM_MAP(mpu3_basemap)
MCFG_MSC1937_ADD("vfd",0)
@@ -855,48 +855,48 @@ MACHINE_CONFIG_START(mpu3_state::mpu3base)
/* 6840 PTM */
MCFG_DEVICE_ADD("ptm_ic2", PTM6840, MPU3_MASTER_CLOCK)
MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0)
- MCFG_PTM6840_O1_CB(WRITELINE(mpu3_state, ic2_o1_callback))
- MCFG_PTM6840_O2_CB(WRITELINE(mpu3_state, ic2_o2_callback))
- MCFG_PTM6840_O3_CB(WRITELINE(mpu3_state, ic2_o3_callback))
- MCFG_PTM6840_IRQ_CB(WRITELINE(mpu3_state, cpu0_irq))
+ MCFG_PTM6840_O1_CB(WRITELINE(*this, mpu3_state, ic2_o1_callback))
+ MCFG_PTM6840_O2_CB(WRITELINE(*this, mpu3_state, ic2_o2_callback))
+ MCFG_PTM6840_O3_CB(WRITELINE(*this, mpu3_state, ic2_o3_callback))
+ MCFG_PTM6840_IRQ_CB(WRITELINE(*this, mpu3_state, cpu0_irq))
MCFG_DEVICE_ADD("pia_ic3", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(mpu3_state, pia_ic3_porta_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu3_state, pia_ic3_portb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(mpu3_state, pia_ic3_ca2_w))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(mpu3_state, cpu0_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, mpu3_state, pia_ic3_porta_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, mpu3_state, pia_ic3_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, mpu3_state, pia_ic3_ca2_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, mpu3_state, cpu0_irq))
MCFG_DEVICE_ADD("pia_ic4", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(mpu3_state, pia_ic4_porta_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(mpu3_state, pia_ic4_porta_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu3_state, pia_ic4_portb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(mpu3_state, pia_ic4_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(mpu3_state, pia_ic4_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(mpu3_state, cpu0_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, mpu3_state, pia_ic4_porta_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, mpu3_state, pia_ic4_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, mpu3_state, pia_ic4_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, mpu3_state, pia_ic4_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, mpu3_state, pia_ic4_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, mpu3_state, cpu0_irq))
MCFG_DEVICE_ADD("pia_ic5", PIA6821, 0)
- MCFG_PIA_READPB_HANDLER(READ8(mpu3_state, pia_ic5_portb_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(mpu3_state, pia_ic5_porta_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu3_state, pia_ic5_portb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(mpu3_state, pia_ic5_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(mpu3_state, pia_ic5_cb2_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, mpu3_state, pia_ic5_portb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, mpu3_state, pia_ic5_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, mpu3_state, pia_ic5_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, mpu3_state, pia_ic5_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, mpu3_state, pia_ic5_cb2_w))
MCFG_DEVICE_ADD("pia_ic6", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(mpu3_state, pia_ic6_porta_r))
- MCFG_PIA_READPB_HANDLER(READ8(mpu3_state, pia_ic6_portb_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(mpu3_state, pia_ic6_porta_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu3_state, pia_ic6_portb_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(mpu3_state, cpu0_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(mpu3_state, cpu0_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, mpu3_state, pia_ic6_porta_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, mpu3_state, pia_ic6_portb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, mpu3_state, pia_ic6_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, mpu3_state, pia_ic6_portb_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, mpu3_state, cpu0_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, mpu3_state, cpu0_irq))
MCFG_MPU3_REEL_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu3_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu3_state, reel_optic_cb<0>))
MCFG_MPU3_REEL_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu3_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu3_state, reel_optic_cb<1>))
MCFG_MPU3_REEL_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu3_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu3_state, reel_optic_cb<2>))
MCFG_MPU3_REEL_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu3_state, reel_optic_cb<3>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu3_state, reel_optic_cb<3>))
MCFG_DEVICE_ADD("meters", METERS, 0)
MCFG_METERS_NUMBER(8)