diff options
Diffstat (limited to 'src/devices/machine/terminal.h')
-rw-r--r-- | src/devices/machine/terminal.h | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/src/devices/machine/terminal.h b/src/devices/machine/terminal.h index dab8bd40578..51783b2bc6c 100644 --- a/src/devices/machine/terminal.h +++ b/src/devices/machine/terminal.h @@ -23,35 +23,27 @@ class generic_terminal_device : public device_t public: generic_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - template <class FunctionClass> - void set_keyboard_callback(void (FunctionClass::*callback)(u8 character), const char *name) + template <typename... T> + void set_keyboard_callback(T &&... args) { - set_keyboard_callback(generic_keyboard_device::output_delegate(callback, name, nullptr, static_cast<FunctionClass *>(nullptr))); + m_keyboard_cb.set(std::forward<T>(args)...); } - // FIXME: this should be aware of current device for resolving the tag - template <class FunctionClass> - void set_keyboard_callback(const char *devname, void (FunctionClass::*callback)(u8 character), const char *name) - { - set_keyboard_callback(generic_keyboard_device::output_delegate(callback, name, devname, static_cast<FunctionClass *>(nullptr))); - } - void set_keyboard_callback(generic_keyboard_device::output_delegate callback) { m_keyboard_cb = callback; } void write(u8 data) { term_write(data); } void kbd_put(u8 data); protected: - enum { BELL_TIMER_ID = 20'000 }; - generic_terminal_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, unsigned w, unsigned h); virtual void term_write(uint8_t data); - virtual void device_start() override; - virtual void device_reset() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - virtual ioport_constructor device_input_ports() const override; - virtual void device_add_mconfig(machine_config &config) override; - virtual void send_key(uint8_t code) { if (!m_keyboard_cb.isnull()) m_keyboard_cb(code); } + virtual void device_start() override ATTR_COLD; + virtual void device_reset() override ATTR_COLD; + virtual ioport_constructor device_input_ports() const override ATTR_COLD; + virtual void device_add_mconfig(machine_config &config) override ATTR_COLD; + virtual void send_key(uint8_t code) { m_keyboard_cb(code); } + + TIMER_CALLBACK_MEMBER(bell_off); required_ioport m_io_term_conf; |