From d474634169b36166ca45f92b1921d4243ef20138 Mon Sep 17 00:00:00 2001 From: shattered Date: Thu, 12 Nov 2020 14:27:07 +0000 Subject: ie15: update logging, use device_matrix_keyboard_interface (#7463) --- src/devices/machine/ie15_kbd.h | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) (limited to 'src/devices/machine/ie15_kbd.h') diff --git a/src/devices/machine/ie15_kbd.h b/src/devices/machine/ie15_kbd.h index 9b7a4d802e4..3302bbda8a2 100644 --- a/src/devices/machine/ie15_kbd.h +++ b/src/devices/machine/ie15_kbd.h @@ -5,7 +5,9 @@ #pragma once -class ie15_keyboard_device : public device_t +#include "machine/keyboard.h" + +class ie15_keyboard_device : public device_t, protected device_matrix_keyboard_interface<4U> { public: enum @@ -27,41 +29,34 @@ public: IE_KB_DK_BIT = 5, IE_KB_PCH_BIT = 6, IE_KB_NR_BIT = 7, - - IE_KB_SI = 0x0f, - IE_KB_SO = 0x0e }; - ie15_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); auto keyboard_cb() { return m_keyboard_cb.bind(); } + auto sdv_cb() { return m_sdv_cb.bind(); } + + void set_ruslat(bool state) { m_ruslat = state; } + + DECLARE_INPUT_CHANGED_MEMBER(dip_changed); protected: ie15_keyboard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); 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 const tiny_rom_entry *device_rom_region() const override; - virtual void send_key(uint16_t code) { m_keyboard_cb(offs_t(0), code); } + virtual void key_make(uint8_t row, uint8_t column) override; - required_ioport_array<4> m_io_kbd; required_ioport m_io_kbdc; - emu_timer *m_timer; - private: - virtual uint16_t keyboard_handler(uint16_t last_code, uint8_t *scan_line); - uint8_t row_number(uint32_t code); - uint16_t m_last_code; - uint8_t m_scan_line; - uint8_t m_ruslat; + bool m_ruslat; uint8_t *m_rom; devcb_write16 m_keyboard_cb; + devcb_write_line m_sdv_cb; }; DECLARE_DEVICE_TYPE(IE15_KEYBOARD, ie15_keyboard_device) -- cgit v1.2.3-70-g09d2