From c7106b559b0bb09cce15affd7b5695257dcbce24 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Fri, 19 May 2017 11:23:59 +1000 Subject: assert output calback is set for keyboard/terminal (nw) --- src/devices/machine/keyboard.cpp | 1 + src/devices/machine/terminal.h | 2 +- src/mame/etc/template_device.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/devices/machine/keyboard.cpp b/src/devices/machine/keyboard.cpp index ef45c8d5580..ebd199560e3 100644 --- a/src/devices/machine/keyboard.cpp +++ b/src/devices/machine/keyboard.cpp @@ -309,6 +309,7 @@ void generic_keyboard_device::key_repeat(u8 row, u8 column) void generic_keyboard_device::send_key(u8 code) { + assert(!m_keyboard_cb.isnull()); m_keyboard_cb(code); } diff --git a/src/devices/machine/terminal.h b/src/devices/machine/terminal.h index dc430f2a83f..67d24a74b72 100644 --- a/src/devices/machine/terminal.h +++ b/src/devices/machine/terminal.h @@ -53,7 +53,7 @@ protected: 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 void send_key(uint8_t code) { m_keyboard_cb(code); } + virtual void send_key(uint8_t code) { assert(!m_keyboard_cb.isnull()); m_keyboard_cb(code); } optional_device m_palette; required_ioport m_io_term_conf; diff --git a/src/mame/etc/template_device.h b/src/mame/etc/template_device.h index 8499fc44c39..afcf02d44aa 100644 --- a/src/mame/etc/template_device.h +++ b/src/mame/etc/template_device.h @@ -39,7 +39,7 @@ public: protected: // device-level overrides -// virtual void device_validity_check(validity_checker &valid) const; + //virtual void device_validity_check(validity_checker &valid) const override; virtual void device_start() override; virtual void device_reset() override; }; -- cgit v1.2.3