From 2e5e818fb943875c83a74010cfdf4417934b58bb Mon Sep 17 00:00:00 2001 From: mooglyguy Date: Tue, 18 Dec 2018 16:15:29 +0100 Subject: -bus/a7800/a78_slot, bus/astrocde/exp, slot, pc_joy/pc_joy, vcs/vcs_slot, : Removed MCFG macros. [Ryan Holtz] -bus/a7800/hiscore, xboard, isa/gblaster, sb16, sblaster, ssi2001, stereo_fx, bus/msx_cart/moonsound: Removed MACHINE_CONFIG macros. [Ryan Holtz] -sound/astrocde, es5506, qs1000, saa1099, t6721a, tc8830f, tiaintf, tms3615, upd7752, ymf278b, ymz280b: Removed MCFG macros. [Ryan Holtz] -video/ef9369: Removed MCFG macros. [Ryan Holtz] -drivers/a2600, a7800, astrocde, astrohome, bingor, bishi, eolith, esqasr, esqmr, fuukifg3, ghosteo, guab, jpmsys5, limenko, lordgun, macrossp, mastboy, mpu4vid, psikyo, psikyo4, psikyosh, samcoupe, ssv, timeplt, vamphalf, vegaeo, xorworld: Removed MCFG macros. [Ryan Holtz] -drivers/cave: Removed MCFG macros and moved common config into common functions. [Ryan Holtz] -drivers/tourtabl: Removed MCFG macros and corrected CPU type. [Ryan Holtz] --- src/devices/sound/qs1000.h | 42 +++++++----------------------------------- 1 file changed, 7 insertions(+), 35 deletions(-) (limited to 'src/devices/sound/qs1000.h') diff --git a/src/devices/sound/qs1000.h b/src/devices/sound/qs1000.h index b5f1c4b6b12..237ef21b8e5 100644 --- a/src/devices/sound/qs1000.h +++ b/src/devices/sound/qs1000.h @@ -16,34 +16,6 @@ #include "cpu/mcs51/mcs51.h" #include "sound/okiadpcm.h" -//************************************************************************** -// INTERFACE CONFIGURATION MACROS -//************************************************************************** - -#define MCFG_QS1000_EXTERNAL_ROM(_bool) \ - downcast(*device).set_external_rom(_bool); - -#define MCFG_QS1000_IN_P1_CB(_devcb) \ - downcast(*device).set_in_p1_callback(DEVCB_##_devcb); - -#define MCFG_QS1000_IN_P2_CB(_devcb) \ - downcast(*device).set_in_p2_callback(DEVCB_##_devcb); - -#define MCFG_QS1000_IN_P3_CB(_devcb) \ - downcast(*device).set_in_p3_callback(DEVCB_##_devcb); - -#define MCFG_QS1000_OUT_P1_CB(_devcb) \ - downcast(*device).set_out_p1_callback(DEVCB_##_devcb); - -#define MCFG_QS1000_OUT_P2_CB(_devcb) \ - downcast(*device).set_out_p2_callback(DEVCB_##_devcb); - -#define MCFG_QS1000_OUT_P3_CB(_devcb) \ - downcast(*device).set_out_p3_callback(DEVCB_##_devcb); - -/*#define MCFG_QS1000_SERIAL_W_CB(_devcb) \ - downcast(*device).set_serial_w_callback(DEVCB_##_devcb);*/ - //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -59,13 +31,13 @@ public: qs1000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); void set_external_rom(bool external_rom) { m_external_rom = external_rom; } - template devcb_base &set_in_p1_callback(Object &&cb) { return m_in_p1_cb.set_callback(std::forward(cb)); } - template devcb_base &set_in_p2_callback(Object &&cb) { return m_in_p2_cb.set_callback(std::forward(cb)); } - template devcb_base &set_in_p3_callback(Object &&cb) { return m_in_p3_cb.set_callback(std::forward(cb)); } - template devcb_base &set_out_p1_callback(Object &&cb) { return m_out_p1_cb.set_callback(std::forward(cb)); } - template devcb_base &set_out_p2_callback(Object &&cb) { return m_out_p2_cb.set_callback(std::forward(cb)); } - template devcb_base &set_out_p3_callback(Object &&cb) { return m_out_p3_cb.set_callback(std::forward(cb)); } - //template devcb_base &set_serial_w_callback(Object &&cb) { return m_serial_w_cb.set_callback(std::forward(cb)); } + auto p1_in() { return m_in_p1_cb.bind(); } + auto p2_in() { return m_in_p2_cb.bind(); } + auto p3_in() { return m_in_p3_cb.bind(); } + auto p1_out() { return m_out_p1_cb.bind(); } + auto p2_out() { return m_out_p2_cb.bind(); } + auto p3_out() { return m_out_p3_cb.bind(); } + //auto serial_w() { return m_serial_w_cb.bind(); } // external void serial_in(uint8_t data); -- cgit v1.2.3-70-g09d2