summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/machine/namcoio.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/machine/namcoio.h')
-rw-r--r--src/mame/machine/namcoio.h39
1 files changed, 20 insertions, 19 deletions
diff --git a/src/mame/machine/namcoio.h b/src/mame/machine/namcoio.h
index a0fd950369e..b788fd452a6 100644
--- a/src/mame/machine/namcoio.h
+++ b/src/mame/machine/namcoio.h
@@ -13,7 +13,8 @@ class namcoio_device : public device_t
public:
template <unsigned N, class Object> devcb_base &set_in_callback(Object &&cb) { return m_in_cb[N].set_callback(std::forward<Object>(cb)); }
template <unsigned N, class Object> devcb_base &set_out_callback(Object &&cb) { return m_out_cb[N].set_callback(std::forward<Object>(cb)); }
-
+ template <unsigned N> auto in_callback() { return m_in_cb[N].bind(); }
+ template <unsigned N> auto out_callback() { return m_out_cb[N].bind(); }
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
@@ -89,59 +90,59 @@ DECLARE_DEVICE_TYPE(NAMCO_59XX, namco59xx_device)
***************************************************************************/
#define MCFG_NAMCO56XX_IN_0_CB(_devcb) \
- devcb = &downcast<namcoio_device &>(*device).set_in_callback<0>(DEVCB_##_devcb);
+ downcast<namcoio_device &>(*device).set_in_callback<0>(DEVCB_##_devcb);
#define MCFG_NAMCO56XX_IN_1_CB(_devcb) \
- devcb = &downcast<namcoio_device &>(*device).set_in_callback<1>(DEVCB_##_devcb);
+ downcast<namcoio_device &>(*device).set_in_callback<1>(DEVCB_##_devcb);
#define MCFG_NAMCO56XX_IN_2_CB(_devcb) \
- devcb = &downcast<namcoio_device &>(*device).set_in_callback<2>(DEVCB_##_devcb);
+ downcast<namcoio_device &>(*device).set_in_callback<2>(DEVCB_##_devcb);
#define MCFG_NAMCO56XX_IN_3_CB(_devcb) \
- devcb = &downcast<namcoio_device &>(*device).set_in_callback<3>(DEVCB_##_devcb);
+ downcast<namcoio_device &>(*device).set_in_callback<3>(DEVCB_##_devcb);
#define MCFG_NAMCO56XX_OUT_0_CB(_devcb) \
- devcb = &downcast<namcoio_device &>(*device).set_out_callback<0>(DEVCB_##_devcb);
+ downcast<namcoio_device &>(*device).set_out_callback<0>(DEVCB_##_devcb);
#define MCFG_NAMCO56XX_OUT_1_CB(_devcb) \
- devcb = &downcast<namcoio_device &>(*device).set_out_callback<1>(DEVCB_##_devcb);
+ downcast<namcoio_device &>(*device).set_out_callback<1>(DEVCB_##_devcb);
#define MCFG_NAMCO58XX_IN_0_CB(_devcb) \
- devcb = &downcast<namcoio_device &>(*device).set_in_callback<0>(DEVCB_##_devcb);
+ downcast<namcoio_device &>(*device).set_in_callback<0>(DEVCB_##_devcb);
#define MCFG_NAMCO58XX_IN_1_CB(_devcb) \
- devcb = &downcast<namcoio_device &>(*device).set_in_callback<1>(DEVCB_##_devcb);
+ downcast<namcoio_device &>(*device).set_in_callback<1>(DEVCB_##_devcb);
#define MCFG_NAMCO58XX_IN_2_CB(_devcb) \
- devcb = &downcast<namcoio_device &>(*device).set_in_callback<2>(DEVCB_##_devcb);
+ downcast<namcoio_device &>(*device).set_in_callback<2>(DEVCB_##_devcb);
#define MCFG_NAMCO58XX_IN_3_CB(_devcb) \
- devcb = &downcast<namcoio_device &>(*device).set_in_callback<3>(DEVCB_##_devcb);
+ downcast<namcoio_device &>(*device).set_in_callback<3>(DEVCB_##_devcb);
#define MCFG_NAMCO58XX_OUT_0_CB(_devcb) \
- devcb = &downcast<namcoio_device &>(*device).set_out_callback<0>(DEVCB_##_devcb);
+ downcast<namcoio_device &>(*device).set_out_callback<0>(DEVCB_##_devcb);
#define MCFG_NAMCO58XX_OUT_1_CB(_devcb) \
- devcb = &downcast<namcoio_device &>(*device).set_out_callback<1>(DEVCB_##_devcb);
+ downcast<namcoio_device &>(*device).set_out_callback<1>(DEVCB_##_devcb);
#define MCFG_NAMCO59XX_IN_0_CB(_devcb) \
- devcb = &downcast<namcoio_device &>(*device).set_in_callback<0>(DEVCB_##_devcb);
+ downcast<namcoio_device &>(*device).set_in_callback<0>(DEVCB_##_devcb);
#define MCFG_NAMCO59XX_IN_1_CB(_devcb) \
- devcb = &downcast<namcoio_device &>(*device).set_in_callback<1>(DEVCB_##_devcb);
+ downcast<namcoio_device &>(*device).set_in_callback<1>(DEVCB_##_devcb);
#define MCFG_NAMCO59XX_IN_2_CB(_devcb) \
- devcb = &downcast<namcoio_device &>(*device).set_in_callback<2>(DEVCB_##_devcb);
+ downcast<namcoio_device &>(*device).set_in_callback<2>(DEVCB_##_devcb);
#define MCFG_NAMCO59XX_IN_3_CB(_devcb) \
- devcb = &downcast<namcoio_device &>(*device).set_in_callback<3>(DEVCB_##_devcb);
+ downcast<namcoio_device &>(*device).set_in_callback<3>(DEVCB_##_devcb);
#define MCFG_NAMCO59XX_OUT_0_CB(_devcb) \
- devcb = &downcast<namcoio_device &>(*device).set_out_callback<0>(DEVCB_##_devcb);
+ downcast<namcoio_device &>(*device).set_out_callback<0>(DEVCB_##_devcb);
#define MCFG_NAMCO59XX_OUT_1_CB(_devcb) \
- devcb = &downcast<namcoio_device &>(*device).set_out_callback<1>(DEVCB_##_devcb);
+ downcast<namcoio_device &>(*device).set_out_callback<1>(DEVCB_##_devcb);
#endif // MAME_MACHINE_NAMCOIO_H