diff options
Diffstat (limited to 'src/devices/bus/epson_sio/epson_sio.h')
-rw-r--r-- | src/devices/bus/epson_sio/epson_sio.h | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/src/devices/bus/epson_sio/epson_sio.h b/src/devices/bus/epson_sio/epson_sio.h index 189e36c5bdf..5d93c42ba74 100644 --- a/src/devices/bus/epson_sio/epson_sio.h +++ b/src/devices/bus/epson_sio/epson_sio.h @@ -12,40 +12,35 @@ #pragma once - -//************************************************************************** -// INTERFACE CONFIGURATION MACROS -//************************************************************************** - -#define MCFG_EPSON_SIO_ADD(_tag, _def_slot) \ - MCFG_DEVICE_ADD(_tag, EPSON_SIO, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(epson_sio_devices, _def_slot, false) - -#define MCFG_EPSON_SIO_RX(_rx) \ - downcast<epson_sio_device *>(device)->set_rx_callback(DEVCB_##_rx); - -#define MCFG_EPSON_SIO_PIN(_pin) \ - downcast<epson_sio_device *>(device)->set_pin_callback(DEVCB_##_pin); - - //************************************************************************** // TYPE DEFINITIONS //************************************************************************** class device_epson_sio_interface; +// supported devices +void epson_sio_devices(device_slot_interface &device); class epson_sio_device : public device_t, public device_slot_interface { public: // construction/destruction - epson_sio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + epson_sio_device(machine_config const &mconfig, char const *tag, device_t *owner, char const *dflt) + : epson_sio_device(mconfig, tag, owner, (uint32_t)0) + { + option_reset(); + epson_sio_devices(*this); + set_default_option(dflt); + set_fixed(false); + } + + epson_sio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); virtual ~epson_sio_device(); // callbacks - template <class Object> devcb_base &set_rx_callback(Object &&rx) { return m_write_rx.set_callback(std::forward<Object>(rx)); } - template <class Object> devcb_base &set_pin_callback(Object &&pin) { return m_write_pin.set_callback(std::forward<Object>(pin)); } + auto rx_callback() { return m_write_rx.bind(); } + auto pin_callback() { return m_write_pin.bind(); } // called from owner DECLARE_WRITE_LINE_MEMBER( tx_w ); @@ -88,9 +83,4 @@ protected: // device type definition DECLARE_DEVICE_TYPE(EPSON_SIO, epson_sio_device) - -// supported devices -void epson_sio_devices(device_slot_interface &device); - - #endif // MAME_BUS_EPSON_SIO_EPSON_SIO_H |