summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/audio/copsnrob.cpp
diff options
context:
space:
mode:
author mooglyguy <therealmogminer@gmail.com>2018-08-11 15:00:54 +0200
committer mooglyguy <therealmogminer@gmail.com>2018-08-11 15:01:20 +0200
commitd5d598a1c021c19e992e5f4cd8f56aa8c697076e (patch)
tree3deeca26e7b770f0140041a1902d3b9bee21f6f4 /src/mame/audio/copsnrob.cpp
parent543e49cc2443e3ab531168ec80e93dd3afeea795 (diff)
-7200fifo, 7400, 7404, 74123, 74145, 74148, 74153, 74157, 74161, 74259: [Ryan Holtz]
* Removed MCFG and old devcb macros. AJR, any breakage? nw
Diffstat (limited to 'src/mame/audio/copsnrob.cpp')
-rw-r--r--src/mame/audio/copsnrob.cpp31
1 files changed, 16 insertions, 15 deletions
diff --git a/src/mame/audio/copsnrob.cpp b/src/mame/audio/copsnrob.cpp
index cda3823e988..b91df3809d8 100644
--- a/src/mame/audio/copsnrob.cpp
+++ b/src/mame/audio/copsnrob.cpp
@@ -695,22 +695,23 @@ WRITE_LINE_MEMBER(copsnrob_state::one_start_w)
}
-MACHINE_CONFIG_START(copsnrob_state::copsnrob_audio)
+void copsnrob_state::copsnrob_audio(machine_config &config)
+{
/* sound hardware */
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
- MCFG_DEVICE_ADD("discrete", DISCRETE, copsnrob_discrete)
- MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
- MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
-
- MCFG_DEVICE_ADD("latch", F9334, 0) // H3 on audio board
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE("discrete", discrete_device, write_line<COPSNROB_MOTOR3_INV>))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE("discrete", discrete_device, write_line<COPSNROB_MOTOR2_INV>))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE("discrete", discrete_device, write_line<COPSNROB_MOTOR1_INV>))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE("discrete", discrete_device, write_line<COPSNROB_MOTOR0_INV>))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("discrete", discrete_device, write_line<COPSNROB_SCREECH_INV>))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE("discrete", discrete_device, write_line<COPSNROB_CRASH_INV>))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, copsnrob_state, one_start_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE("discrete", discrete_device, write_line<COPSNROB_AUDIO_ENABLE>))
-MACHINE_CONFIG_END
+ discrete_sound_device &discrete(DISCRETE(config, "discrete", copsnrob_discrete));
+ discrete.add_route(0, "lspeaker", 1.0);
+ discrete.add_route(1, "rspeaker", 1.0);
+
+ f9334_device &latch(F9334(config, "latch")); // H3 on audio board
+ latch.q_out_cb<0>().set("discrete", FUNC(discrete_device::write_line<COPSNROB_MOTOR3_INV>));
+ latch.q_out_cb<1>().set("discrete", FUNC(discrete_device::write_line<COPSNROB_MOTOR2_INV>));
+ latch.q_out_cb<2>().set("discrete", FUNC(discrete_device::write_line<COPSNROB_MOTOR1_INV>));
+ latch.q_out_cb<3>().set("discrete", FUNC(discrete_device::write_line<COPSNROB_MOTOR0_INV>));
+ latch.q_out_cb<4>().set("discrete", FUNC(discrete_device::write_line<COPSNROB_SCREECH_INV>));
+ latch.q_out_cb<5>().set("discrete", FUNC(discrete_device::write_line<COPSNROB_CRASH_INV>));
+ latch.q_out_cb<6>().set(FUNC(copsnrob_state::one_start_w));
+ latch.q_out_cb<7>().set("discrete", FUNC(discrete_device::write_line<COPSNROB_AUDIO_ENABLE>));
+}