summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/6821pia.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine/6821pia.h')
-rw-r--r--src/devices/machine/6821pia.h52
1 files changed, 0 insertions, 52 deletions
diff --git a/src/devices/machine/6821pia.h b/src/devices/machine/6821pia.h
index 9f55e9b38a4..b31bf03183c 100644
--- a/src/devices/machine/6821pia.h
+++ b/src/devices/machine/6821pia.h
@@ -28,46 +28,6 @@
/***************************************************************************
- DEVICE CONFIGURATION MACROS
-***************************************************************************/
-
-// TODO: REMOVE THESE
-#define MCFG_PIA_READPA_HANDLER(_devcb) \
- downcast<pia6821_device &>(*device).set_readpa_handler(DEVCB_##_devcb);
-
-#define MCFG_PIA_READPB_HANDLER(_devcb) \
- downcast<pia6821_device &>(*device).set_readpb_handler(DEVCB_##_devcb);
-
-#define MCFG_PIA_READCA1_HANDLER(_devcb) \
- downcast<pia6821_device &>(*device).set_readca1_handler(DEVCB_##_devcb);
-
-#define MCFG_PIA_READCA2_HANDLER(_devcb) \
- downcast<pia6821_device &>(*device).set_readca2_handler(DEVCB_##_devcb);
-
-#define MCFG_PIA_READCB1_HANDLER(_devcb) \
- downcast<pia6821_device &>(*device).set_readcb1_handler(DEVCB_##_devcb);
-
-// TODO: CONVERT THESE TO WRITE LINE
-#define MCFG_PIA_WRITEPA_HANDLER(_devcb) \
- downcast<pia6821_device &>(*device).set_writepa_handler(DEVCB_##_devcb);
-
-#define MCFG_PIA_WRITEPB_HANDLER(_devcb) \
- downcast<pia6821_device &>(*device).set_writepb_handler(DEVCB_##_devcb);
-
-#define MCFG_PIA_CA2_HANDLER(_devcb) \
- downcast<pia6821_device &>(*device).set_ca2_handler(DEVCB_##_devcb);
-
-#define MCFG_PIA_CB2_HANDLER(_devcb) \
- downcast<pia6821_device &>(*device).set_cb2_handler(DEVCB_##_devcb);
-
-#define MCFG_PIA_IRQA_HANDLER(_devcb) \
- downcast<pia6821_device &>(*device).set_irqa_handler(DEVCB_##_devcb);
-
-#define MCFG_PIA_IRQB_HANDLER(_devcb) \
- downcast<pia6821_device &>(*device).set_irqb_handler(DEVCB_##_devcb);
-
-
-/***************************************************************************
TYPE DEFINITIONS
***************************************************************************/
@@ -79,13 +39,7 @@ public:
// construction/destruction
pia6821_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
- // static configuration helpers
// TODO: REMOVE THESE
- template<class Obj> devcb_base &set_readpa_handler(Obj &&object) { return m_in_a_handler.set_callback(std::forward<Obj>(object)); }
- template<class Obj> devcb_base &set_readpb_handler(Obj &&object) { return m_in_b_handler.set_callback(std::forward<Obj>(object)); }
- template<class Obj> devcb_base &set_readca1_handler(Obj &&object) { return m_in_ca1_handler.set_callback(std::forward<Obj>(object)); }
- template<class Obj> devcb_base &set_readca2_handler(Obj &&object) { return m_in_ca2_handler.set_callback(std::forward<Obj>(object)); }
- template<class Obj> devcb_base &set_readcb1_handler(Obj &&object) { return m_in_cb1_handler.set_callback(std::forward<Obj>(object)); }
auto readpa_handler() { return m_in_a_handler.bind(); }
auto readpb_handler() { return m_in_b_handler.bind(); }
auto readca1_handler() { return m_in_ca1_handler.bind(); }
@@ -93,15 +47,9 @@ public:
auto readcb1_handler() { return m_in_cb1_handler.bind(); }
// TODO: CONVERT THESE TO WRITE LINE
- template<class Obj> devcb_base &set_writepa_handler(Obj &&object) { return m_out_a_handler.set_callback(std::forward<Obj>(object)); }
- template<class Obj> devcb_base &set_writepb_handler(Obj &&object) { return m_out_b_handler.set_callback(std::forward<Obj>(object)); }
auto writepa_handler() { return m_out_a_handler.bind(); }
auto writepb_handler() { return m_out_b_handler.bind(); }
- template<class Obj> devcb_base &set_ca2_handler(Obj &&object) { return m_ca2_handler.set_callback(std::forward<Obj>(object)); }
- template<class Obj> devcb_base &set_cb2_handler(Obj &&object) { return m_cb2_handler.set_callback(std::forward<Obj>(object)); }
- template<class Obj> devcb_base &set_irqa_handler(Obj &&object) { return m_irqa_handler.set_callback(std::forward<Obj>(object)); }
- template<class Obj> devcb_base &set_irqb_handler(Obj &&object) { return m_irqb_handler.set_callback(std::forward<Obj>(object)); }
auto ca2_handler() { return m_ca2_handler.bind(); }
auto cb2_handler() { return m_cb2_handler.bind(); }
auto irqa_handler() { return m_irqa_handler.bind(); }