summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/gyruss.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/gyruss.cpp')
-rw-r--r--src/mame/drivers/gyruss.cpp52
1 files changed, 26 insertions, 26 deletions
diff --git a/src/mame/drivers/gyruss.cpp b/src/mame/drivers/gyruss.cpp
index c7a95f6cdd6..87100c0b8ea 100644
--- a/src/mame/drivers/gyruss.cpp
+++ b/src/mame/drivers/gyruss.cpp
@@ -477,36 +477,36 @@ WRITE_LINE_MEMBER(gyruss_state::vblank_irq)
MACHINE_CONFIG_START(gyruss_state::gyruss)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(main_cpu1_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_cpu1_map)
- MCFG_CPU_ADD("sub", KONAMI1, MASTER_CLOCK/12) /* 1.536 MHz */
- MCFG_CPU_PROGRAM_MAP(main_cpu2_map)
+ MCFG_DEVICE_ADD("sub", KONAMI1, MASTER_CLOCK/12) /* 1.536 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_cpu2_map)
- MCFG_CPU_ADD("audiocpu", Z80, SOUND_CLOCK/4) /* 3.579545 MHz */
- MCFG_CPU_PROGRAM_MAP(audio_cpu1_map)
- MCFG_CPU_IO_MAP(audio_cpu1_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, SOUND_CLOCK/4) /* 3.579545 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(audio_cpu1_map)
+ MCFG_DEVICE_IO_MAP(audio_cpu1_io_map)
- MCFG_CPU_ADD("audio2", I8039, XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(audio_cpu2_map)
- MCFG_CPU_IO_MAP(audio_cpu2_io_map)
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(gyruss_state, gyruss_dac_w))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(gyruss_state, gyruss_irq_clear_w))
+ MCFG_DEVICE_ADD("audio2", I8039, XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(audio_cpu2_map)
+ MCFG_DEVICE_IO_MAP(audio_cpu2_io_map)
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, gyruss_state, gyruss_dac_w))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, gyruss_state, gyruss_irq_clear_w))
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 3C
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(gyruss_state, master_nmi_mask_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(gyruss_state, coin_counter_1_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(gyruss_state, coin_counter_2_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(gyruss_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, gyruss_state, master_nmi_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, gyruss_state, coin_counter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, gyruss_state, coin_counter_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, gyruss_state, flipscreen_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(gyruss_state, screen_update_gyruss)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(gyruss_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, gyruss_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", gyruss)
MCFG_PALETTE_ADD("palette", 16*4+16*16)
@@ -519,45 +519,45 @@ MACHINE_CONFIG_START(gyruss_state::gyruss)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ay1", AY8910, SOUND_CLOCK/8)
+ MCFG_DEVICE_ADD("ay1", AY8910, SOUND_CLOCK/8)
MCFG_AY8910_OUTPUT_TYPE(AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(RES_K(3.3), RES_K(3.3), RES_K(3.3))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(gyruss_state, gyruss_filter0_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, gyruss_state, gyruss_filter0_w))
MCFG_SOUND_ROUTE(0, "discrete", 1.0, 0)
MCFG_SOUND_ROUTE(1, "discrete", 1.0, 1)
MCFG_SOUND_ROUTE(2, "discrete", 1.0, 2)
- MCFG_SOUND_ADD("ay2", AY8910, SOUND_CLOCK/8)
+ MCFG_DEVICE_ADD("ay2", AY8910, SOUND_CLOCK/8)
MCFG_AY8910_OUTPUT_TYPE(AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(RES_K(3.3), RES_K(3.3), RES_K(3.3))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(gyruss_state, gyruss_filter1_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, gyruss_state, gyruss_filter1_w))
MCFG_SOUND_ROUTE(0, "discrete", 1.0, 3)
MCFG_SOUND_ROUTE(1, "discrete", 1.0, 4)
MCFG_SOUND_ROUTE(2, "discrete", 1.0, 5)
- MCFG_SOUND_ADD("ay3", AY8910, SOUND_CLOCK/8)
+ MCFG_DEVICE_ADD("ay3", AY8910, SOUND_CLOCK/8)
MCFG_AY8910_OUTPUT_TYPE(AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(RES_K(3.3), RES_K(3.3), RES_K(3.3))
- MCFG_AY8910_PORT_A_READ_CB(READ8(gyruss_state, gyruss_portA_r))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, gyruss_state, gyruss_portA_r))
MCFG_SOUND_ROUTE(0, "discrete", 1.0, 6)
MCFG_SOUND_ROUTE(1, "discrete", 1.0, 7)
MCFG_SOUND_ROUTE(2, "discrete", 1.0, 8)
- MCFG_SOUND_ADD("ay4", AY8910, SOUND_CLOCK/8)
+ MCFG_DEVICE_ADD("ay4", AY8910, SOUND_CLOCK/8)
MCFG_AY8910_OUTPUT_TYPE(AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(RES_K(3.3), RES_K(3.3), RES_K(3.3))
MCFG_SOUND_ROUTE(0, "discrete", 1.0, 9)
MCFG_SOUND_ROUTE(1, "discrete", 1.0, 10)
MCFG_SOUND_ROUTE(2, "discrete", 1.0, 11)
- MCFG_SOUND_ADD("ay5", AY8910, SOUND_CLOCK/8)
+ MCFG_DEVICE_ADD("ay5", AY8910, SOUND_CLOCK/8)
MCFG_AY8910_OUTPUT_TYPE(AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(RES_K(3.3), RES_K(3.3), RES_K(3.3))
MCFG_SOUND_ROUTE(0, "discrete", 1.0, 12)
MCFG_SOUND_ROUTE(1, "discrete", 1.0, 13)
MCFG_SOUND_ROUTE(2, "discrete", 1.0, 14)
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(gyruss_sound)
MCFG_SOUND_ROUTE(0, "rspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)