summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/machine/315_5649.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/machine/315_5649.h')
-rw-r--r--src/mame/machine/315_5649.h120
1 files changed, 23 insertions, 97 deletions
diff --git a/src/mame/machine/315_5649.h b/src/mame/machine/315_5649.h
index ad3835d0032..8db6e9c6f34 100644
--- a/src/mame/machine/315_5649.h
+++ b/src/mame/machine/315_5649.h
@@ -15,89 +15,6 @@
//**************************************************************************
-// INTERFACE CONFIGURATION MACROS
-//**************************************************************************
-
-#define MCFG_315_5649_IN_PA_CB(_devcb) \
- downcast<sega_315_5649_device &>(*device).set_in_port_callback<0>(DEVCB_##_devcb);
-
-#define MCFG_315_5649_OUT_PA_CB(_devcb) \
- downcast<sega_315_5649_device &>(*device).set_out_port_callback<0>(DEVCB_##_devcb);
-
-#define MCFG_315_5649_IN_PB_CB(_devcb) \
- downcast<sega_315_5649_device &>(*device).set_in_port_callback<1>(DEVCB_##_devcb);
-
-#define MCFG_315_5649_OUT_PB_CB(_devcb) \
- downcast<sega_315_5649_device &>(*device).set_out_port_callback<1>(DEVCB_##_devcb);
-
-#define MCFG_315_5649_IN_PC_CB(_devcb) \
- downcast<sega_315_5649_device &>(*device).set_in_port_callback<2>(DEVCB_##_devcb);
-
-#define MCFG_315_5649_OUT_PC_CB(_devcb) \
- downcast<sega_315_5649_device &>(*device).set_out_port_callback<2>(DEVCB_##_devcb);
-
-#define MCFG_315_5649_IN_PD_CB(_devcb) \
- downcast<sega_315_5649_device &>(*device).set_in_port_callback<3>(DEVCB_##_devcb);
-
-#define MCFG_315_5649_OUT_PD_CB(_devcb) \
- downcast<sega_315_5649_device &>(*device).set_out_port_callback<3>(DEVCB_##_devcb);
-
-#define MCFG_315_5649_IN_PE_CB(_devcb) \
- downcast<sega_315_5649_device &>(*device).set_in_port_callback<4>(DEVCB_##_devcb);
-
-#define MCFG_315_5649_OUT_PE_CB(_devcb) \
- downcast<sega_315_5649_device &>(*device).set_out_port_callback<4>(DEVCB_##_devcb);
-
-#define MCFG_315_5649_IN_PF_CB(_devcb) \
- downcast<sega_315_5649_device &>(*device).set_in_port_callback<5>(DEVCB_##_devcb);
-
-#define MCFG_315_5649_OUT_PF_CB(_devcb) \
- downcast<sega_315_5649_device &>(*device).set_out_port_callback<5>(DEVCB_##_devcb);
-
-#define MCFG_315_5649_IN_PG_CB(_devcb) \
- downcast<sega_315_5649_device &>(*device).set_in_port_callback<6>(DEVCB_##_devcb);
-
-#define MCFG_315_5649_OUT_PG_CB(_devcb) \
- downcast<sega_315_5649_device &>(*device).set_out_port_callback<6>(DEVCB_##_devcb);
-
-#define MCFG_315_5649_AN0_CB(_devcb) \
- downcast<sega_315_5649_device &>(*device).set_an_port_callback<0>(DEVCB_##_devcb);
-
-#define MCFG_315_5649_AN1_CB(_devcb) \
- downcast<sega_315_5649_device &>(*device).set_an_port_callback<1>(DEVCB_##_devcb);
-
-#define MCFG_315_5649_AN2_CB(_devcb) \
- downcast<sega_315_5649_device &>(*device).set_an_port_callback<2>(DEVCB_##_devcb);
-
-#define MCFG_315_5649_AN3_CB(_devcb) \
- downcast<sega_315_5649_device &>(*device).set_an_port_callback<3>(DEVCB_##_devcb);
-
-#define MCFG_315_5649_AN4_CB(_devcb) \
- downcast<sega_315_5649_device &>(*device).set_an_port_callback<4>(DEVCB_##_devcb);
-
-#define MCFG_315_5649_AN5_CB(_devcb) \
- downcast<sega_315_5649_device &>(*device).set_an_port_callback<5>(DEVCB_##_devcb);
-
-#define MCFG_315_5649_AN6_CB(_devcb) \
- downcast<sega_315_5649_device &>(*device).set_an_port_callback<6>(DEVCB_##_devcb);
-
-#define MCFG_315_5649_AN7_CB(_devcb) \
- downcast<sega_315_5649_device &>(*device).set_an_port_callback<7>(DEVCB_##_devcb);
-
-#define MCFG_315_5649_SERIAL_CH1_READ_CB(_devcb) \
- downcast<sega_315_5649_device &>(*device).set_serial_rd_callback<0>(DEVCB_##_devcb);
-
-#define MCFG_315_5649_SERIAL_CH1_WRITE_CB(_devcb) \
- downcast<sega_315_5649_device &>(*device).set_serial_wr_callback<0>(DEVCB_##_devcb);
-
-#define MCFG_315_5649_SERIAL_CH2_READ_CB(_devcb) \
- downcast<sega_315_5649_device &>(*device).set_serial_rd_callback<1>(DEVCB_##_devcb);
-
-#define MCFG_315_5649_SERIAL_CH2_WRITE_CB(_devcb) \
- downcast<sega_315_5649_device &>(*device).set_serial_wr_callback<1>(DEVCB_##_devcb);
-
-
-//**************************************************************************
// TYPE DEFINITIONS
//**************************************************************************
@@ -108,20 +25,29 @@ public:
sega_315_5649_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// configuration
- template <int N, class Object> devcb_base &set_in_port_callback(Object &&cb)
- { return m_in_port_cb[N].set_callback(std::forward<Object>(cb)); }
-
- template <int N, class Object> devcb_base &set_out_port_callback(Object &&cb)
- { return m_out_port_cb[N].set_callback(std::forward<Object>(cb)); }
-
- template <int N, class Object> devcb_base &set_an_port_callback(Object &&cb)
- { return m_an_port_cb[N].set_callback(std::forward<Object>(cb)); }
-
- template <int N, class Object> devcb_base &set_serial_rd_callback(Object &&cb)
- { return m_serial_rd_cb[N].set_callback(std::forward<Object>(cb)); }
-
- template <int N, class Object> devcb_base &set_serial_wr_callback(Object &&cb)
- { return m_serial_wr_cb[N].set_callback(std::forward<Object>(cb)); }
+ auto in_pa_callback() { return m_in_port_cb[0].bind(); }
+ auto in_pb_callback() { return m_in_port_cb[1].bind(); }
+ auto in_pc_callback() { return m_in_port_cb[2].bind(); }
+ auto in_pd_callback() { return m_in_port_cb[3].bind(); }
+ auto in_pe_callback() { return m_in_port_cb[4].bind(); }
+ auto in_pf_callback() { return m_in_port_cb[5].bind(); }
+ auto in_pg_callback() { return m_in_port_cb[6].bind(); }
+
+ auto out_pa_callback() { return m_out_port_cb[0].bind(); }
+ auto out_pb_callback() { return m_out_port_cb[1].bind(); }
+ auto out_pc_callback() { return m_out_port_cb[2].bind(); }
+ auto out_pd_callback() { return m_out_port_cb[3].bind(); }
+ auto out_pe_callback() { return m_out_port_cb[4].bind(); }
+ auto out_pf_callback() { return m_out_port_cb[5].bind(); }
+ auto out_pg_callback() { return m_out_port_cb[6].bind(); }
+
+ template <unsigned N> auto an_port_callback() { return m_an_port_cb[N].bind(); }
+
+ auto serial_ch1_rd_callback() { return m_serial_rd_cb[0].bind(); }
+ auto serial_ch2_rd_callback() { return m_serial_rd_cb[1].bind(); }
+
+ auto serial_ch1_wr_callback() { return m_serial_wr_cb[0].bind(); }
+ auto serial_ch2_wr_callback() { return m_serial_wr_cb[1].bind(); }
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE8_MEMBER(write);