summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/tube.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine/tube.h')
-rw-r--r--src/devices/machine/tube.h27
1 files changed, 1 insertions, 26 deletions
diff --git a/src/devices/machine/tube.h b/src/devices/machine/tube.h
index 17223d22f84..c8d94b1c7a7 100644
--- a/src/devices/machine/tube.h
+++ b/src/devices/machine/tube.h
@@ -14,27 +14,6 @@
//**************************************************************************
-// INTERFACE CONFIGURATION MACROS
-//**************************************************************************
-
-#define MCFG_TUBE_ADD(_tag) \
- MCFG_DEVICE_ADD(_tag, TUBE, 0);
-
-#define MCFG_TUBE_HIRQ_HANDLER(_devcb) \
- downcast<tube_device &>(*device).set_hirq_handler(DEVCB_##_devcb);
-
-#define MCFG_TUBE_PNMI_HANDLER(_devcb) \
- downcast<tube_device &>(*device).set_pnmi_handler(DEVCB_##_devcb);
-
-#define MCFG_TUBE_PIRQ_HANDLER(_devcb) \
- downcast<tube_device &>(*device).set_pirq_handler(DEVCB_##_devcb);
-
-#define MCFG_TUBE_DRQ_HANDLER(_devcb) \
- downcast<tube_device &>(*device).set_drq_handler(DEVCB_##_devcb);
-
-
-
-//**************************************************************************
// TYPE DEFINITIONS
//**************************************************************************
@@ -45,13 +24,9 @@ class tube_device : public device_t
{
public:
// construction/destruction
- tube_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ tube_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
// callbacks
- template <class Object> devcb_base &set_hirq_handler(Object &&cb) { return m_hirq_handler.set_callback(std::forward<Object>(cb)); }
- template <class Object> devcb_base &set_pnmi_handler(Object &&cb) { return m_pnmi_handler.set_callback(std::forward<Object>(cb)); }
- template <class Object> devcb_base &set_pirq_handler(Object &&cb) { return m_pirq_handler.set_callback(std::forward<Object>(cb)); }
- template <class Object> devcb_base &set_drq_handler(Object &&cb) { return m_drq_handler.set_callback(std::forward<Object>(cb)); }
auto hirq_handler() { return m_hirq_handler.bind(); }
auto pnmi_handler() { return m_pnmi_handler.bind(); }
auto pirq_handler() { return m_pirq_handler.bind(); }