diff options
Diffstat (limited to 'src/mame/drivers/mazerbla.cpp')
-rw-r--r-- | src/mame/drivers/mazerbla.cpp | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/src/mame/drivers/mazerbla.cpp b/src/mame/drivers/mazerbla.cpp index d440e38a07c..376535cb5ef 100644 --- a/src/mame/drivers/mazerbla.cpp +++ b/src/mame/drivers/mazerbla.cpp @@ -964,24 +964,24 @@ void mazerbla_state::machine_reset() MACHINE_CONFIG_START(mazerbla_state::mazerbla) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* 4 MHz, no NMI, IM2 - vectors at 0xf8, 0xfa, 0xfc */ - MCFG_CPU_PROGRAM_MAP(mazerbla_map) - MCFG_CPU_IO_MAP(mazerbla_io_map) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(mazerbla_state,irq_callback) - - MCFG_CPU_ADD("sub", Z80, MASTER_CLOCK) /* 4 MHz, NMI, IM1 INT */ - MCFG_CPU_PROGRAM_MAP(mazerbla_cpu2_map) - MCFG_CPU_IO_MAP(mazerbla_cpu2_io_map) - MCFG_CPU_PERIODIC_INT_DRIVER(mazerbla_state, irq0_line_hold, 400) /* frequency in Hz */ - - MCFG_CPU_ADD("sub2", Z80, MASTER_CLOCK) /* 4 MHz, no NMI, IM1 INT */ - MCFG_CPU_PROGRAM_MAP(mazerbla_cpu3_map) - MCFG_CPU_IO_MAP(mazerbla_cpu3_io_map) + MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK) /* 4 MHz, no NMI, IM2 - vectors at 0xf8, 0xfa, 0xfc */ + MCFG_DEVICE_PROGRAM_MAP(mazerbla_map) + MCFG_DEVICE_IO_MAP(mazerbla_io_map) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(mazerbla_state,irq_callback) + + MCFG_DEVICE_ADD("sub", Z80, MASTER_CLOCK) /* 4 MHz, NMI, IM1 INT */ + MCFG_DEVICE_PROGRAM_MAP(mazerbla_cpu2_map) + MCFG_DEVICE_IO_MAP(mazerbla_cpu2_io_map) + MCFG_DEVICE_PERIODIC_INT_DRIVER(mazerbla_state, irq0_line_hold, 400) /* frequency in Hz */ + + MCFG_DEVICE_ADD("sub2", Z80, MASTER_CLOCK) /* 4 MHz, no NMI, IM1 INT */ + MCFG_DEVICE_PROGRAM_MAP(mazerbla_cpu3_map) + MCFG_DEVICE_IO_MAP(mazerbla_cpu3_io_map) /* (vblank related ??) int generated by a custom video processor and cleared on ANY port access. but handled differently for now */ - MCFG_CPU_VBLANK_INT_DRIVER("screen", mazerbla_state, irq0_line_hold) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mazerbla_state, irq0_line_hold) /* synchronization forced on the fly */ MCFG_DEVICE_ADD("vcu", MB_VCU, SOUND_CLOCK/4) @@ -997,7 +997,7 @@ MACHINE_CONFIG_START(mazerbla_state::mazerbla) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1) MCFG_SCREEN_UPDATE_DRIVER(mazerbla_state, screen_update_mazerbla) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(mazerbla_state, screen_vblank)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mazerbla_state, screen_vblank)) MCFG_PALETTE_ADD("palette", 256+1) MCFG_PALETTE_INIT_OWNER(mazerbla_state, mazerbla) @@ -1009,23 +1009,23 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(mazerbla_state::greatgun) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* 4 MHz, no NMI, IM2 - vectors at 0xf8, 0xfa, 0xfc */ - MCFG_CPU_PROGRAM_MAP(mazerbla_map) - MCFG_CPU_IO_MAP(greatgun_io_map) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(mazerbla_state,irq_callback) - - MCFG_CPU_ADD("sub", Z80, SOUND_CLOCK / 4) /* 3.579500 MHz, NMI - caused by sound command write, periodic INT */ - MCFG_CPU_PROGRAM_MAP(greatgun_sound_map) - MCFG_CPU_PERIODIC_INT_DRIVER(mazerbla_state, sound_interrupt, (double)14318180/16/16/16/16 ) - - MCFG_CPU_ADD("sub2", Z80, MASTER_CLOCK) /* 4 MHz, no NMI, IM1 INT */ - MCFG_CPU_PROGRAM_MAP(mazerbla_cpu3_map) - MCFG_CPU_IO_MAP(greatgun_cpu3_io_map) + MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK) /* 4 MHz, no NMI, IM2 - vectors at 0xf8, 0xfa, 0xfc */ + MCFG_DEVICE_PROGRAM_MAP(mazerbla_map) + MCFG_DEVICE_IO_MAP(greatgun_io_map) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(mazerbla_state,irq_callback) + + MCFG_DEVICE_ADD("sub", Z80, SOUND_CLOCK / 4) /* 3.579500 MHz, NMI - caused by sound command write, periodic INT */ + MCFG_DEVICE_PROGRAM_MAP(greatgun_sound_map) + MCFG_DEVICE_PERIODIC_INT_DRIVER(mazerbla_state, sound_interrupt, (double)14318180/16/16/16/16 ) + + MCFG_DEVICE_ADD("sub2", Z80, MASTER_CLOCK) /* 4 MHz, no NMI, IM1 INT */ + MCFG_DEVICE_PROGRAM_MAP(mazerbla_cpu3_map) + MCFG_DEVICE_IO_MAP(greatgun_cpu3_io_map) /* (vblank related ??) int generated by a custom video processor and cleared on ANY port access. but handled differently for now */ - MCFG_CPU_VBLANK_INT_DRIVER("screen", mazerbla_state, irq0_line_hold) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mazerbla_state, irq0_line_hold) MCFG_DEVICE_ADD("vcu", MB_VCU, SOUND_CLOCK/4) MCFG_MB_VCU_CPU("sub2") @@ -1040,7 +1040,7 @@ MACHINE_CONFIG_START(mazerbla_state::greatgun) MCFG_SCREEN_SIZE(40*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1) MCFG_SCREEN_UPDATE_DRIVER(mazerbla_state, screen_update_mazerbla) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(mazerbla_state, screen_vblank)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mazerbla_state, screen_vblank)) MCFG_PALETTE_ADD("palette", 256+1) MCFG_PALETTE_INIT_OWNER(mazerbla_state, mazerbla) @@ -1048,12 +1048,12 @@ MACHINE_CONFIG_START(mazerbla_state::greatgun) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ay1", AY8910, SOUND_CLOCK / 8) - MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read)) + MCFG_DEVICE_ADD("ay1", AY8910, SOUND_CLOCK / 8) + MCFG_AY8910_PORT_B_READ_CB(READ8("soundlatch", generic_latch_8_device, read)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) - MCFG_SOUND_ADD("ay2", AY8910, SOUND_CLOCK / 8) - MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(mazerbla_state, gg_led_ctrl_w)) + MCFG_DEVICE_ADD("ay2", AY8910, SOUND_CLOCK / 8) + MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, mazerbla_state, gg_led_ctrl_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_GENERIC_LATCH_8_ADD("soundlatch") |