diff options
Diffstat (limited to 'src/devices/cpu/patinhofeio/patinhofeio_cpu.h')
-rw-r--r-- | src/devices/cpu/patinhofeio/patinhofeio_cpu.h | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/src/devices/cpu/patinhofeio/patinhofeio_cpu.h b/src/devices/cpu/patinhofeio/patinhofeio_cpu.h index c1f0dafab7a..b892b5f954b 100644 --- a/src/devices/cpu/patinhofeio/patinhofeio_cpu.h +++ b/src/devices/cpu/patinhofeio/patinhofeio_cpu.h @@ -5,15 +5,6 @@ #pragma once -#define MCFG_PATINHO_RC_READ_CB(_devcb) \ - downcast<patinho_feio_cpu_device &>(*device).set_rc_read_callback(DEVCB_##_devcb); -#define MCFG_PATINHO_BUTTONS_READ_CB(_devcb) \ - downcast<patinho_feio_cpu_device &>(*device).set_buttons_read_callback(DEVCB_##_devcb); -#define MCFG_PATINHO_IODEV_READ_CB(devnumber, _devcb) \ - downcast<patinho_feio_cpu_device &>(*device).set_iodev_read_callback(devnumber, DEVCB_##_devcb); -#define MCFG_PATINHO_IODEV_WRITE_CB(devnumber, _devcb) \ - downcast<patinho_feio_cpu_device &>(*device).set_iodev_write_callback(devnumber, DEVCB_##_devcb); - /* register IDs */ enum { @@ -53,11 +44,11 @@ public: // construction/destruction patinho_feio_cpu_device(const machine_config &mconfig, const char *_tag, device_t *_owner, uint32_t _clock); - template <class Object> devcb_base &set_rc_read_callback(Object &&cb) { return m_rc_read_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_buttons_read_callback(Object &&cb) { return m_buttons_read_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_iodev_read_callback(int devnumber, Object &&cb) { return m_iodev_read_cb[devnumber].set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_iodev_write_callback(int devnumber, Object &&cb) { return m_iodev_write_cb[devnumber].set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_iodev_status_callback(int devnumber, Object &&cb) { return m_iodev_status_cb[devnumber].set_callback(std::forward<Object>(cb)); } + auto rc_read() { return m_rc_read_cb.bind(); } + auto buttons_read() { return m_buttons_read_cb.bind(); } + template <std::size_t DevNumber> auto iodev_read() { return m_iodev_read_cb[DevNumber].bind(); } + template <std::size_t DevNumber> auto iodev_write() { return m_iodev_write_cb[DevNumber].bind(); } + template <std::size_t DevNumber> auto iodev_status() { return m_iodev_status_cb[DevNumber].bind(); } void transfer_byte_from_external_device(uint8_t channel, uint8_t data); void set_iodev_status(uint8_t channel, bool status) { m_iodev_status[channel] = status; } |