summaryrefslogtreecommitdiffstats
path: root/src/mame/audio/redalert.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/audio/redalert.cpp')
-rw-r--r--src/mame/audio/redalert.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/mame/audio/redalert.cpp b/src/mame/audio/redalert.cpp
index 7aaf5577ffb..67070bcdb1a 100644
--- a/src/mame/audio/redalert.cpp
+++ b/src/mame/audio/redalert.cpp
@@ -180,15 +180,15 @@ void redalert_state::redalert_voice_map(address_map &map)
MACHINE_CONFIG_START(redalert_state::redalert_audio_m37b)
- MCFG_CPU_ADD("audiocpu", M6502, REDALERT_AUDIO_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(redalert_audio_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(redalert_state, irq0_line_hold, REDALERT_AUDIO_CPU_IRQ_FREQ)
+ MCFG_DEVICE_ADD("audiocpu", M6502, REDALERT_AUDIO_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(redalert_audio_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(redalert_state, irq0_line_hold, REDALERT_AUDIO_CPU_IRQ_FREQ)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8910, REDALERT_AY8910_CLOCK)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(redalert_state, redalert_analog_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, REDALERT_AY8910_CLOCK)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, redalert_state, redalert_analog_w))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
/* channel C is used a noise source and is not connected to a speaker */
@@ -203,14 +203,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(redalert_state::redalert_audio_voice)
- MCFG_CPU_ADD("voice", I8085A, REDALERT_VOICE_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(redalert_voice_map)
- MCFG_I8085A_SID(READLINE(redalert_state,sid_callback))
- MCFG_I8085A_SOD(WRITELINE(redalert_state,sod_callback))
+ MCFG_DEVICE_ADD("voice", I8085A, REDALERT_VOICE_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(redalert_voice_map)
+ MCFG_I8085A_SID(READLINE(*this, redalert_state,sid_callback))
+ MCFG_I8085A_SOD(WRITELINE(*this, redalert_state,sod_callback))
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("cvsd", HC55516, REDALERT_HC55516_CLOCK)
+ MCFG_DEVICE_ADD("cvsd", HC55516, REDALERT_HC55516_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -346,14 +346,14 @@ SOUND_START_MEMBER( redalert_state, demoneye )
MACHINE_CONFIG_START(redalert_state::demoneye_audio)
- MCFG_CPU_ADD("audiocpu", M6802, DEMONEYE_AUDIO_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(demoneye_audio_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(redalert_state, irq0_line_hold, REDALERT_AUDIO_CPU_IRQ_FREQ) /* guess */
+ MCFG_DEVICE_ADD("audiocpu", M6802, DEMONEYE_AUDIO_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(demoneye_audio_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(redalert_state, irq0_line_hold, REDALERT_AUDIO_CPU_IRQ_FREQ) /* guess */
MCFG_DEVICE_ADD("sndpia", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(redalert_state, demoneye_ay8910_latch_2_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(redalert_state, demoneye_ay8910_data_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(redalert_state, demoneye_ay8910_latch_1_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, redalert_state, demoneye_ay8910_latch_2_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, redalert_state, demoneye_ay8910_data_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, redalert_state, demoneye_ay8910_latch_1_w))
MCFG_SOUND_START_OVERRIDE( redalert_state, demoneye )
@@ -361,10 +361,10 @@ MACHINE_CONFIG_START(redalert_state::demoneye_audio)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, DEMONEYE_AY8910_CLOCK)
+ MCFG_DEVICE_ADD("ay1", AY8910, DEMONEYE_AY8910_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ay2", AY8910, DEMONEYE_AY8910_CLOCK)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
+ MCFG_DEVICE_ADD("ay2", AY8910, DEMONEYE_AY8910_CLOCK)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END