From b380514764cf857469bae61c11143a19f79a74c5 Mon Sep 17 00:00:00 2001 From: andreasnaive Date: Mon, 25 Mar 2019 23:13:40 +0100 Subject: Revert "conflict resolution (nw)" This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705. --- src/devices/machine/7474.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src/devices/machine/7474.h') diff --git a/src/devices/machine/7474.h b/src/devices/machine/7474.h index 0f9d87fa5bf..0a6a678ddfb 100644 --- a/src/devices/machine/7474.h +++ b/src/devices/machine/7474.h @@ -45,6 +45,19 @@ #pragma once + + +//************************************************************************** +// INTERFACE CONFIGURATION MACROS +//************************************************************************** + +#define MCFG_7474_OUTPUT_CB(_devcb) \ + downcast(*device).set_output_cb(DEVCB_##_devcb); + +#define MCFG_7474_COMP_OUTPUT_CB(_devcb) \ + downcast(*device).set_comp_output_cb(DEVCB_##_devcb); + + //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -58,6 +71,8 @@ public: ttl7474_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // static configuration helpers + template devcb_base &set_output_cb(Object &&cb) { return m_output_func.set_callback(std::forward(cb)); } + template devcb_base &set_comp_output_cb(Object &&cb) { return m_comp_output_func.set_callback(std::forward(cb)); } auto output_cb() { return m_output_func.bind(); } auto comp_output_cb() { return m_comp_output_func.bind(); } -- cgit v1.2.3-70-g09d2