From 8b5e6f363e86de2fe1f99449146885480d29c82c Mon Sep 17 00:00:00 2001 From: Dirk Best Date: Sat, 27 Feb 2021 14:31:24 +0100 Subject: rc759: Fix cassette error, add keyboard --- scripts/target/mame/mess.lua | 2 + src/mame/drivers/rc759.cpp | 73 +++++------- src/mame/machine/rc759_kbd.cpp | 261 +++++++++++++++++++++++++++++++++++++++++ src/mame/machine/rc759_kbd.h | 55 +++++++++ 4 files changed, 345 insertions(+), 46 deletions(-) create mode 100644 src/mame/machine/rc759_kbd.cpp create mode 100644 src/mame/machine/rc759_kbd.h diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua index 841ee009def..c8d4d01e1f6 100644 --- a/scripts/target/mame/mess.lua +++ b/scripts/target/mame/mess.lua @@ -3369,6 +3369,8 @@ createMESSProjects(_target, _subtarget, "regnecentralen") files { MAME_DIR .. "src/mame/drivers/rc702.cpp", MAME_DIR .. "src/mame/drivers/rc759.cpp", + MAME_DIR .. "src/mame/machine/rc759_kbd.cpp", + MAME_DIR .. "src/mame/machine/rc759_kbd.h", } createMESSProjects(_target, _subtarget, "ritam") diff --git a/src/mame/drivers/rc759.cpp b/src/mame/drivers/rc759.cpp index 4867bb84cf7..b5b7b1c5a56 100644 --- a/src/mame/drivers/rc759.cpp +++ b/src/mame/drivers/rc759.cpp @@ -1,32 +1,27 @@ -// license:GPL-2.0+ -// copyright-holders:Dirk Best +// license: GPL-2.0+ +// copyright-holders: Dirk Best /*************************************************************************** Regnecentralen RC759 Piccoline - Status: Error 32 (cassette data error) - ***************************************************************************/ #include "emu.h" - #include "cpu/i86/i186.h" -#include "imagedev/cassette.h" -#include "imagedev/floppy.h" #include "machine/i8255.h" -#include "machine/keyboard.h" #include "machine/mm58167.h" #include "machine/nvram.h" #include "machine/pic8259.h" #include "machine/ram.h" #include "machine/wd_fdc.h" +#include "machine/rc759_kbd.h" #include "sound/sn76496.h" #include "sound/spkrdev.h" #include "video/i82730.h" - #include "bus/centronics/ctronics.h" #include "bus/isbx/isbx.h" - +#include "imagedev/cassette.h" +#include "imagedev/floppy.h" #include "screen.h" #include "speaker.h" @@ -56,11 +51,11 @@ public: m_floppy1(*this, "fdc:1"), m_vram(*this, "vram"), m_config(*this, "config"), + m_kbd(*this, "kbd"), m_cas_enabled(0), m_cas_data(0), m_drq_source(0), m_nvram_bank(0), m_gfx_mode(0), - m_keyboard_enable(0), m_keyboard_key(0x00), m_centronics_strobe(0), m_centronics_init(0), m_centronics_select_in(0), m_centronics_busy(0), m_centronics_ack(0), m_centronics_fault(0), m_centronics_perror(0), m_centronics_select(0), m_centronics_data(0xff) @@ -131,6 +126,7 @@ private: required_device m_floppy1; required_shared_ptr m_vram; required_ioport m_config; + required_device m_kbd; std::vector m_nvram_mem; @@ -139,8 +135,6 @@ private: int m_drq_source; int m_nvram_bank; int m_gfx_mode; - int m_keyboard_enable; - uint8_t m_keyboard_key; int m_centronics_strobe; int m_centronics_init; @@ -158,24 +152,6 @@ private: // I/O //************************************************************************** -void rc759_state::keyb_put(u8 data) -{ - m_keyboard_key = data; - m_pic->ir1_w(1); -} - -uint8_t rc759_state::keyboard_r() -{ - logerror("keyboard_r\n"); - - m_pic->ir1_w(0); - - if (m_keyboard_enable) - return m_keyboard_key; - else - return 0x00; -} - uint8_t rc759_state::ppi_porta_r() { uint8_t data = 0; @@ -209,15 +185,19 @@ uint8_t rc759_state::ppi_portb_r() void rc759_state::ppi_portc_w(uint8_t data) { - m_cas_enabled = BIT(data, 0); - m_cas->change_state(BIT(data, 1) ? CASSETTE_MOTOR_DISABLED : CASSETTE_MOTOR_ENABLED, CASSETTE_MASK_MOTOR); - m_drq_source = (data >> 2) & 0x03; - m_nvram_bank = (data >> 4) & 0x03; - m_gfx_mode = BIT(data, 6); - m_keyboard_enable = BIT(data, 7); + // 7------- keyboard enable + // -6------ gfx mode + // --54---- nvram bank + // ----32-- drq source + // ------1- cassette motor + // -------0 cassette enable - logerror("ppi_portc_w: cas_enabled: %d, cas_motor: %d, drq_source: %d, nvram_bank: %d, gfx_mode: %d, keyb_enable: %d\n", - m_cas_enabled, BIT(data, 1), m_drq_source, m_nvram_bank, m_gfx_mode, m_keyboard_enable); + m_kbd->enable_w(BIT(data, 7)); + m_gfx_mode = BIT(data, 6); + m_nvram_bank = (data >> 4) & 0x03; + m_drq_source = (data >> 2) & 0x03; + m_cas->change_state(BIT(data, 1) ? CASSETTE_MOTOR_DISABLED : CASSETTE_MOTOR_ENABLED, CASSETTE_MASK_MOTOR); + m_cas_enabled = BIT(data, 0); } WRITE_LINE_MEMBER( rc759_state::centronics_busy_w ) @@ -406,11 +386,12 @@ void rc759_state::rtc_w(offs_t offset, uint8_t data) WRITE_LINE_MEMBER( rc759_state::i186_timer0_w ) { + m_cas_data = 1; + if (m_cas_enabled) - { - m_cas_data = state; - m_cas->output(state ? -1.0 : 1.0); - } + m_cas_data = state ? 0 : 1; + + m_cas->output(m_cas_data ? -1.0 : 1.0); } WRITE_LINE_MEMBER( rc759_state::i186_timer1_w ) @@ -480,7 +461,7 @@ void rc759_state::rc759_io(address_map &map) { map.unmap_value_high(); map(0x000, 0x003).mirror(0x0c).rw(m_pic, FUNC(pic8259_device::read), FUNC(pic8259_device::write)).umask16(0x00ff); - map(0x020, 0x020).r(FUNC(rc759_state::keyboard_r)); + map(0x020, 0x020).r(m_kbd, FUNC(rc759_kbd_hle_device::read)); map(0x056, 0x057).noprw(); // in reality, access to sound and rtc is a bit more involved map(0x05a, 0x05a).w(m_snd, FUNC(sn76489a_device::write)); map(0x05c, 0x05c).rw(FUNC(rc759_state::rtc_r), FUNC(rc759_state::rtc_w)); @@ -568,8 +549,8 @@ void rc759_state::rc759(machine_config &config) m_txt->sint().set(m_pic, FUNC(pic8259_device::ir4_w)); // keyboard - generic_keyboard_device &keyb(GENERIC_KEYBOARD(config, "keyb", 0)); - keyb.set_keyboard_callback(FUNC(rc759_state::keyb_put)); + RC759_KBD_HLE(config, m_kbd); + m_kbd->int_handler().set(m_pic, FUNC(pic8259_device::ir1_w)); // sound SPEAKER(config, "mono").front_center(); diff --git a/src/mame/machine/rc759_kbd.cpp b/src/mame/machine/rc759_kbd.cpp new file mode 100644 index 00000000000..eca1958bb17 --- /dev/null +++ b/src/mame/machine/rc759_kbd.cpp @@ -0,0 +1,261 @@ +// license: GPL-2.0+ +// copyright-holders: Dirk Best +/*************************************************************************** + + Regnecentralen RC759 Piccoline Keyboard (HLE) + +***************************************************************************/ + +#include "emu.h" +#include "rc759_kbd.h" +#include "machine/keyboard.ipp" + + +//************************************************************************** +// DEVICE DEFINITIONS +//************************************************************************** + +DEFINE_DEVICE_TYPE(RC759_KBD_HLE, rc759_kbd_hle_device, "rc759_kbd_hle", "RC759 Keyboard (HLE)") + + +//------------------------------------------------- +// input_ports - device-specific input ports +//------------------------------------------------- + +static INPUT_PORTS_START( keyboard ) + PORT_START("row_0") + PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_UNUSED) /* 00 */ + PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 01 */ PORT_CODE(KEYCODE_TAB) PORT_CHAR(0x09) + PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 02 */ PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!') + PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 03 */ PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('"') + PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 04 */ PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR(0xa7) // § + PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 05 */ PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$') + PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 06 */ PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%') + PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 07 */ PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('&') + PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 08 */ PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'') // or ´? + PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 09 */ PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(') + PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 10 */ PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')') + PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 11 */ PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHAR('-') + PORT_BIT(0x1000, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 12 */ PORT_CODE(KEYCODE_MINUS) PORT_CHAR('_') PORT_CHAR('=') + PORT_BIT(0x2000, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 13 */ PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('`') PORT_CHAR('@') + PORT_BIT(0x4000, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 14 */ PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(0x08) + PORT_BIT(0x8000, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 15 */ PORT_CODE(KEYCODE_LALT) PORT_NAME("Alt") + + PORT_START("row_1") + PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 16 */ PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q') + PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 17 */ PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W') + PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 18 */ PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E') + PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 19 */ PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R') + PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 20 */ PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T') + PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 21 */ PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y') + PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 22 */ PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U') + PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 23 */ PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I') + PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 24 */ PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O') + PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 25 */ PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P') + PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 26 */ PORT_CODE(KEYCODE_COLON) PORT_CHAR(0xe6) PORT_CHAR(0xc6) // æ Æ + PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 27 */ PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR(0xe5) PORT_CHAR(0xc5) // å Å + PORT_BIT(0x1000, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 28 */ PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13) + PORT_BIT(0x2000, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 29 */ PORT_CODE(KEYCODE_LCONTROL) PORT_CHAR(UCHAR_SHIFT_2) + PORT_BIT(0x4000, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 30 */ PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A') + PORT_BIT(0x8000, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 31 */ PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S') + + PORT_START("row_2") + PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 32 */ PORT_CODE(KEYCODE_D) PORT_CHAR('d') PORT_CHAR('D') + PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 33 */ PORT_CODE(KEYCODE_F) PORT_CHAR('f') PORT_CHAR('F') + PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 34 */ PORT_CODE(KEYCODE_G) PORT_CHAR('g') PORT_CHAR('G') + PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 35 */ PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H') + PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 36 */ PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J') + PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 37 */ PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K') + PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 38 */ PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L') + PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 39 */ PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(';') PORT_CHAR('+') + PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 40 */ PORT_CODE(KEYCODE_CAPSLOCK) PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK)) PORT_TOGGLE + PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 41 */ PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR(':') PORT_CHAR('*') + PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 42 */ PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1) PORT_NAME("Left Shift") + PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 43 */ PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(0xf8) PORT_CHAR(0xd8) // ø Ø + PORT_BIT(0x1000, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 44 */ PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z') + PORT_BIT(0x2000, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 45 */ PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X') + PORT_BIT(0x4000, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 46 */ PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C') + PORT_BIT(0x8000, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 47 */ PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V') + + PORT_START("row_3") + PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 48 */ PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B') + PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 49 */ PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N') + PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 50 */ PORT_CODE(KEYCODE_M) PORT_CHAR('m') PORT_CHAR('M') + PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 51 */ PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<') + PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 52 */ PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>') + PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 53 */ PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?') + PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 54 */ PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1) PORT_NAME("Right Shift") + PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 55 */ PORT_CODE(KEYCODE_ESC) PORT_CHAR(UCHAR_MAMEKEY(ESC)) + PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 56 */ PORT_CODE(KEYCODE_BACKSLASH2) PORT_CHAR(0xfc) PORT_CHAR(0xdc) // ü Ü + PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 57 */ PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') + PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 58 */ PORT_CODE(KEYCODE_PRTSCR) PORT_NAME("Print") + PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 59 */ PORT_CODE(KEYCODE_F1) PORT_CHAR(UCHAR_MAMEKEY(F1)) + PORT_BIT(0x1000, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 60 */ PORT_CODE(KEYCODE_F2) PORT_CHAR(UCHAR_MAMEKEY(F2)) + PORT_BIT(0x2000, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 61 */ PORT_CODE(KEYCODE_F3) PORT_CHAR(UCHAR_MAMEKEY(F3)) + PORT_BIT(0x4000, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 62 */ PORT_CODE(KEYCODE_F4) PORT_CHAR(UCHAR_MAMEKEY(F4)) + PORT_BIT(0x8000, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 63 */ PORT_CODE(KEYCODE_F5) PORT_CHAR(UCHAR_MAMEKEY(F5)) + + PORT_START("row_4") + PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 64 */ PORT_CODE(KEYCODE_F6) PORT_CHAR(UCHAR_MAMEKEY(F6)) + PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 65 */ PORT_CODE(KEYCODE_F7) PORT_CHAR(UCHAR_MAMEKEY(F7)) + PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 66 */ PORT_CODE(KEYCODE_F8) PORT_CHAR(UCHAR_MAMEKEY(F8)) + PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 67 */ PORT_CODE(KEYCODE_F9) PORT_CHAR(UCHAR_MAMEKEY(F9)) + PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 68 */ PORT_CODE(KEYCODE_F10) PORT_CHAR(UCHAR_MAMEKEY(F10)) + PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 69 */ PORT_CODE(KEYCODE_F11) PORT_CHAR(UCHAR_MAMEKEY(F11)) + PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 70 */ PORT_CODE(KEYCODE_F12) PORT_CHAR(UCHAR_MAMEKEY(F12)) + PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 71 */ PORT_CODE(KEYCODE_INSERT) PORT_CHAR(UCHAR_MAMEKEY(INSERT)) PORT_NAME("Tegn Ind") + PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 72 */ PORT_CODE(KEYCODE_PGUP) PORT_NAME("A1") + PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 73 */ PORT_CODE(KEYCODE_PGDN) PORT_NAME("A2") + PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 74 */ PORT_CODE(KEYCODE_END) PORT_NAME("A3") + PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 75 */ PORT_CODE(KEYCODE_NUMLOCK) PORT_NAME("A4") + PORT_BIT(0x1000, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 76 */ PORT_CODE(KEYCODE_SCRLOCK) PORT_NAME("(((O)))") // Bell? + PORT_BIT(0x2000, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 77 */ PORT_CODE(KEYCODE_LEFT) PORT_CHAR(UCHAR_MAMEKEY(LEFT)) + PORT_BIT(0x4000, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 78 */ PORT_CODE(KEYCODE_RIGHT) PORT_CHAR(UCHAR_MAMEKEY(RIGHT)) + PORT_BIT(0x8000, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 79 */ PORT_CODE(KEYCODE_UP) PORT_CHAR(UCHAR_MAMEKEY(UP)) + + PORT_START("row_5") + PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 80 */ PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN)) + PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 81 */ PORT_CODE(KEYCODE_HOME) PORT_CHAR(UCHAR_MAMEKEY(HOME)) PORT_NAME("\xe2\x86\x96") // ↖ + PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 82 */ PORT_CODE(KEYCODE_DEL) PORT_CHAR(UCHAR_MAMEKEY(DEL)) PORT_NAME("Slet Tegn") + PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 83 */ PORT_CODE(KEYCODE_7_PAD) PORT_CHAR(UCHAR_MAMEKEY(7_PAD)) + PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 84 */ PORT_CODE(KEYCODE_8_PAD) PORT_CHAR(UCHAR_MAMEKEY(8_PAD)) + PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 85 */ PORT_CODE(KEYCODE_9_PAD) PORT_CHAR(UCHAR_MAMEKEY(9_PAD)) + PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 86 */ PORT_CODE(KEYCODE_MINUS_PAD) PORT_CHAR(UCHAR_MAMEKEY(MINUS_PAD)) + PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 87 */ PORT_CODE(KEYCODE_PLUS_PAD) PORT_CHAR(UCHAR_MAMEKEY(PLUS_PAD)) + PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 88 */ PORT_CODE(KEYCODE_4_PAD) PORT_CHAR(UCHAR_MAMEKEY(4_PAD)) + PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 89 */ PORT_CODE(KEYCODE_5_PAD) PORT_CHAR(UCHAR_MAMEKEY(5_PAD)) + PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 90 */ PORT_CODE(KEYCODE_6_PAD) PORT_CHAR(UCHAR_MAMEKEY(6_PAD)) + PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 91 */ PORT_CODE(KEYCODE_ASTERISK) PORT_NAME("Keypad ,") + PORT_BIT(0x1000, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 92 */ PORT_CODE(KEYCODE_SLASH_PAD) PORT_NAME("Keypad Tab") + PORT_BIT(0x2000, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 93 */ PORT_CODE(KEYCODE_1_PAD) PORT_CHAR(UCHAR_MAMEKEY(1_PAD)) + PORT_BIT(0x4000, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 94 */ PORT_CODE(KEYCODE_2_PAD) PORT_CHAR(UCHAR_MAMEKEY(2_PAD)) + PORT_BIT(0x8000, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 95 */ PORT_CODE(KEYCODE_3_PAD) PORT_CHAR(UCHAR_MAMEKEY(3_PAD)) + + PORT_START("row_6") + PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 96 */ PORT_CODE(KEYCODE_ENTER_PAD) PORT_CHAR(UCHAR_MAMEKEY(ENTER_PAD)) + PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 97 */ PORT_CODE(KEYCODE_0_PAD) PORT_CHAR(UCHAR_MAMEKEY(0_PAD)) + PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD) /* 98 */ PORT_CODE(KEYCODE_COMMA_PAD) PORT_CHAR(UCHAR_MAMEKEY(COMMA_PAD)) +INPUT_PORTS_END + +ioport_constructor rc759_kbd_hle_device::device_input_ports() const +{ + return INPUT_PORTS_NAME( keyboard ); +} + + +//************************************************************************** +// LIVE DEVICE +//************************************************************************** + +//------------------------------------------------- +// rc759_kbd_hle_device - constructor +//------------------------------------------------- + +rc759_kbd_hle_device::rc759_kbd_hle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : + device_t(mconfig, RC759_KBD_HLE, tag, owner, clock), + device_matrix_keyboard_interface(mconfig, *this, "row_0", "row_1", "row_2", "row_3", "row_4", "row_5", "row_6"), + m_int_handler(*this) +{ +} + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void rc759_kbd_hle_device::device_start() +{ + // resolve callbacks + m_int_handler.resolve_safe(); + + // register for save states + save_item(NAME(m_data)); + save_item(NAME(m_enabled)); +} + +//------------------------------------------------- +// device_reset - device-specific reset +//------------------------------------------------- + +void rc759_kbd_hle_device::device_reset() +{ + m_int_handler(0); + m_data = 0x00; + m_enabled = false; + + reset_key_state(); + start_processing(attotime::from_hz(1200)); + typematic_stop(); +} + +//------------------------------------------------- +// key_make - handle a key being pressed +//------------------------------------------------- + +void rc759_kbd_hle_device::key_make(uint8_t row, uint8_t column) +{ + uint8_t code = row * 16 + column; + + // send the code + if (m_enabled) + { + m_data = code; + m_int_handler(1); + } + + // no typematic for modifier keys + if (code != 15 && code != 29 && code != 40 && code != 42 && code != 54) + typematic_start(row, column, attotime::from_msec(750), attotime::from_msec(50)); +} + +//------------------------------------------------- +// key_break - handle a key being released +//------------------------------------------------- + +void rc759_kbd_hle_device::key_break(uint8_t row, uint8_t column) +{ + uint8_t code = row * 16 + column; + + // send the break code + if (m_enabled) + { + m_data = 0x80 | code; + m_int_handler(1); + } + + if (typematic_is(row, column)) + typematic_stop(); +} + +//------------------------------------------------- +// key_repeat - handle a key being repeated +//------------------------------------------------- + +void rc759_kbd_hle_device::key_repeat(u8 row, u8 column) +{ + uint8_t code = row * 16 + column; + + if (m_enabled) + { + m_data = code; + m_int_handler(1); + } +} + +//------------------------------------------------- +// read - return current key data +//------------------------------------------------- + +uint8_t rc759_kbd_hle_device::read() +{ + m_int_handler(0); + return m_data; +} + +//------------------------------------------------- +// enable_w - enable or disable keyboard +//------------------------------------------------- + +void rc759_kbd_hle_device::enable_w(int state) +{ + m_enabled = bool(state); +} diff --git a/src/mame/machine/rc759_kbd.h b/src/mame/machine/rc759_kbd.h new file mode 100644 index 00000000000..2689afc8a8f --- /dev/null +++ b/src/mame/machine/rc759_kbd.h @@ -0,0 +1,55 @@ +// license: GPL-2.0+ +// copyright-holders: Dirk Best +/*************************************************************************** + + Regnecentralen RC759 Piccoline Keyboard (HLE) + +***************************************************************************/ + +#ifndef MAME_MACHINE_RC759_KBD_H +#define MAME_MACHINE_RC759_KBD_H + +#pragma once + +#include "machine/keyboard.h" + + +//************************************************************************** +// TYPE DEFINITIONS +//************************************************************************** + +// ======================> rc759_kbd_hle_device + +class rc759_kbd_hle_device : public device_t, protected device_matrix_keyboard_interface<7> +{ +public: + // construction/destruction + rc759_kbd_hle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); + + // callbacks + auto int_handler() { return m_int_handler.bind(); } + + uint8_t read(); + void enable_w(int state); + +protected: + // device_t overrides + virtual ioport_constructor device_input_ports() const override; + virtual void device_start() override; + virtual void device_reset() override; + + // device_matrix_keyboard_interface overrides + virtual void key_make(uint8_t row, uint8_t column) override; + virtual void key_break(uint8_t row, uint8_t column) override; + virtual void key_repeat(uint8_t row, uint8_t column) override; + +private: + devcb_write_line m_int_handler; + uint8_t m_data; + bool m_enabled; +}; + +// device type definition +DECLARE_DEVICE_TYPE(RC759_KBD_HLE, rc759_kbd_hle_device) + +#endif // MAME_MACHINE_RC759_KBD_H -- cgit v1.2.3