From 5a037bccb2d43b4562cca698703703f82451c971 Mon Sep 17 00:00:00 2001 From: AJR Date: Sat, 22 Apr 2023 14:58:42 -0400 Subject: wicat: Add MCU dump and LLE of keyboard; update layout to include keyboard LEDs [AJR, Bitsavers] * im6402: Remove ugly hack to force bits into receiver and make it work the normal way instead --- scripts/src/machine.lua | 12 ++ src/devices/machine/im6402.cpp | 21 +-- src/devices/machine/im6402.h | 3 +- src/devices/machine/keytronic_l2207.cpp | 312 ++++++++++++++++++++++++++++++++ src/devices/machine/keytronic_l2207.h | 75 ++++++++ src/mame/kyocera/kyocera.cpp | 6 +- src/mame/layout/wicat.lay | 153 ++++++++++++++++ src/mame/skeleton/wicat.cpp | 235 ++++++------------------ src/mame/wang/wangpc.cpp | 13 +- src/mame/wang/wangpckb.cpp | 10 +- 10 files changed, 626 insertions(+), 214 deletions(-) create mode 100644 src/devices/machine/keytronic_l2207.cpp create mode 100644 src/devices/machine/keytronic_l2207.h diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua index d79cf1f0ee3..1155df5b3c7 100644 --- a/scripts/src/machine.lua +++ b/scripts/src/machine.lua @@ -1924,6 +1924,18 @@ if (MACHINES["KB3600"]~=null) then } end +--------------------------------------------------- +-- +--@src/devices/machine/keytronic_l2207.h,MACHINES["KEYTRONIC_L2207"] = true +--------------------------------------------------- + +if (MACHINES["KEYTRONIC_L2207"]~=null) then + files { + MAME_DIR .. "src/devices/machine/keytronic_l2207.cpp", + MAME_DIR .. "src/devices/machine/keytronic_l2207.h", + } +end + --------------------------------------------------- -- --@src/devices/machine/kr1601rr1.h,MACHINES["KR1601RR1"] = true diff --git a/src/devices/machine/im6402.cpp b/src/devices/machine/im6402.cpp index 6a52867bdbd..09c57a4b858 100644 --- a/src/devices/machine/im6402.cpp +++ b/src/devices/machine/im6402.cpp @@ -179,15 +179,6 @@ void im6402_device::tra_complete() } -//------------------------------------------------- -// rcv_callback - -//------------------------------------------------- - -void im6402_device::rcv_callback() -{ -} - - //------------------------------------------------- // rcv_complete - //------------------------------------------------- @@ -391,10 +382,12 @@ void im6402_device::epe_w(int state) m_epe = state; } -void im6402_device::write_rri(int state) + +//------------------------------------------------- +// rri_w - receiver register input +//------------------------------------------------- + +void im6402_device::rri_w(int state) { - // HACK derive clock from data line as wangpckb sends bytes instantly to make up for mcs51 serial implementation - receive_register_update_bit(state); - rx_clock_w(1); - rx_clock_w(0); + rx_w(state); } diff --git a/src/devices/machine/im6402.h b/src/devices/machine/im6402.h index d36853353c2..b7918abcfcb 100644 --- a/src/devices/machine/im6402.h +++ b/src/devices/machine/im6402.h @@ -74,7 +74,7 @@ public: int fe_r() { return m_fe; } int oe_r() { return m_oe; } - void write_rri(int state); // receiver register input + void rri_w(int state); void rrc_w(int state); void trc_w(int state); void rrd_w(int state); @@ -96,7 +96,6 @@ protected: // device_serial_interface overrides virtual void tra_callback() override; virtual void tra_complete() override; - virtual void rcv_callback() override; virtual void rcv_complete() override; private: diff --git a/src/devices/machine/keytronic_l2207.cpp b/src/devices/machine/keytronic_l2207.cpp new file mode 100644 index 00000000000..75e4fd9a063 --- /dev/null +++ b/src/devices/machine/keytronic_l2207.cpp @@ -0,0 +1,312 @@ +// license:BSD-3-Clause +// copyright-holders:AJR +/********************************************************************** + + Keytronic L2207 83-key keyboard + + This was sold by Keytronic as a generic VT100-lookalike ASCII + keyboard. Its normal configuration communicates via 300 baud + asynchronous TTL-level serial, but populating a few additional + components and using an alternate connector gives it a parallel + interface for outputs. The PCB additionally supports a "minimum" + interface that eliminates the MCU and provides a raw interface to + the capacitive key matrix ASICs (22-950-003 decoder & 22-908-003 + detector, as described in U.S. Patent 4,277,780) and LED latch. + + Keys generating non-ASCII codes: + + No Scroll B0 + 0 (keypad) B1 + . (keypad) B2 + 1 (keypad) C0 + 2 (keypad) C1 + 3 (keypad) C2 + Enter (keypad) C3 + 4 (keypad) D0 + 5 (keypad) D1 + 6 (keypad) D2 + , (keypad) D3 + Break E0 + 7 (keypad) E1 + 8 (keypad) E2 + 9 (keypad) E3 + - (keypad) E4 + Ctrl+3 E5 + ↑ F1 + ↓ F2 + ← F3 + → F4 + PF1 F6 + PF2 F7 + PF3 F8 + PF4 F9 + Set-Up FE + + Several other codes (A0-A5, D4, D6, F0, F5) are assigned to + 9 additional switches which are not normally populated. The + presently dumped firmware also sends AA in response to the + undocumented test command below. + + List of commands (delivered through serial input): + + D7 D6 D5 D4 D3 D2 D1 D0 + + l8 l7 l6 l5 l4 l3 l2 1 Set LED data + - - - - - - 1 0 Short beep + - - - - - 1 0 0 Long beep + - - - - 1 0 0 0 Key click off + - - - 1 0 0 0 0 Test? (undocumented) + - - - 0 0 0 0 0 Key click on + + An alternate version of this keyboard, whose solder side is + labeled "PCB-251 / KTC A65-02675-051." has differently styled + keytops and a different EPROM but is otherwise identical in layout + and functionality. + +**********************************************************************/ + +#include "emu.h" +#include "keytronic_l2207.h" + +#include "speaker.h" + +DEFINE_DEVICE_TYPE(KEYTRONIC_L2207, keytronic_l2207_device, "keytronic_l2207", "Keytronic L2207 serial keyboard") + +keytronic_l2207_device::keytronic_l2207_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + : device_t(mconfig, KEYTRONIC_L2207, tag, owner, clock) + , m_mcu(*this, "mcu") + , m_beeper(*this, "beeper") + , m_keys(*this, "KEYS%d", 0U) + , m_leds(*this, "kbd_led%d", 1U) + , m_all_caps(*this, "all_caps") + , m_ser_out_callback(*this) + , m_p1_in(0xff) + , m_p2_out(0) + , m_beeper_latch(false) +{ +} + +void keytronic_l2207_device::device_resolve_objects() +{ + m_leds.resolve(); + m_all_caps.resolve(); + m_ser_out_callback.resolve_safe(); +} + +void keytronic_l2207_device::device_start() +{ + save_item(NAME(m_p1_in)); + save_item(NAME(m_p2_out)); + save_item(NAME(m_beeper_latch)); +} + +WRITE_LINE_MEMBER(keytronic_l2207_device::ser_in_w) +{ + m_mcu->set_input_line(MCS48_INPUT_IRQ, state ? CLEAR_LINE : ASSERT_LINE); +} + +u8 keytronic_l2207_device::led_latch_r() +{ + if (!machine().side_effects_disabled()) + { + u8 led_data = m_mcu->p1_r(); + + if (BIT(m_p2_out, 6)) + m_beeper->level_w(BIT(led_data, 0)); + m_beeper_latch = BIT(led_data, 0); + + m_leds[0] = !BIT(led_data, 1); + for (int n = 1; n < 8; n++) + m_leds[n] = BIT(led_data, n); + } + + return 0; +} + +u8 keytronic_l2207_device::p1_r() +{ + return m_p1_in; +} + +void keytronic_l2207_device::p2_w(u8 data) +{ + if (BIT(data, 5) != BIT(m_p2_out, 5)) + m_ser_out_callback(BIT(data, 5)); + + if (!BIT(data, 4)) + m_p1_in = 0xff; + else if (!BIT(m_p2_out, 4)) + { + u8 j = m_mcu->p1_r() & 0x0f; + if (j < 12) + m_p1_in = m_keys[j]->read(); + } + + if (m_beeper_latch && BIT(data, 6) != BIT(m_p2_out, 6)) + m_beeper->level_w(BIT(data, 6)); + + m_all_caps = BIT(data, 7); + + m_p2_out = data; +} + +void keytronic_l2207_device::prog_map(address_map &map) +{ + map.global_mask(0x7ff); + map(0x000, 0x7ff).rom().region("eprom", 0); +} + +void keytronic_l2207_device::ext_map(address_map &map) +{ + map(0x00, 0xff).r(FUNC(keytronic_l2207_device::led_latch_r)).nopw(); // WR connected for parallel interface only +} + +static INPUT_PORTS_START(keytronic_l2207) + PORT_START("KEYS0") + PORT_BIT(0x0d, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Set-Up") PORT_CHAR(UCHAR_MAMEKEY(F1)) PORT_CODE(KEYCODE_ESC) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Ctrl") PORT_CHAR(UCHAR_SHIFT_2) PORT_CODE(KEYCODE_LCONTROL) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Caps Lock") PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK)) PORT_CODE(KEYCODE_CAPSLOCK) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Right Shift") PORT_CHAR(UCHAR_MAMEKEY(RSHIFT)) PORT_CODE(KEYCODE_RSHIFT) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Left Shift") PORT_CHAR(UCHAR_SHIFT_1) PORT_CODE(KEYCODE_LSHIFT) + + PORT_START("KEYS1") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Esc") PORT_CHAR(0x1b) PORT_CODE(KEYCODE_TILDE) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('1') PORT_CHAR('!') PORT_CODE(KEYCODE_1) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Tab") PORT_CHAR(0x09) PORT_CODE(KEYCODE_TAB) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Q") PORT_CHAR('q') PORT_CHAR('Q') PORT_CHAR(0x11) PORT_CODE(KEYCODE_Q) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("A") PORT_CHAR('a') PORT_CHAR('A') PORT_CHAR(0x01) PORT_CODE(KEYCODE_A) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("S") PORT_CHAR('s') PORT_CHAR('S') PORT_CHAR(0x13) PORT_CODE(KEYCODE_S) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("No Scrl") PORT_CODE(KEYCODE_LALT) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED) + + PORT_START("KEYS2") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('2') PORT_CHAR('@') PORT_CODE(KEYCODE_2) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(u8"3 # £") PORT_CHAR('3') PORT_CHAR('#', 0x00a3) PORT_CODE(KEYCODE_3) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("W") PORT_CHAR('w') PORT_CHAR('W') PORT_CHAR(0x17) PORT_CODE(KEYCODE_W) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("E") PORT_CHAR('e') PORT_CHAR('E') PORT_CHAR(0x05) PORT_CODE(KEYCODE_E) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("D") PORT_CHAR('d') PORT_CHAR('D') PORT_CHAR(0x04) PORT_CODE(KEYCODE_D) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F") PORT_CHAR('f') PORT_CHAR('F') PORT_CHAR(0x06) PORT_CODE(KEYCODE_F) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Z") PORT_CHAR('z') PORT_CHAR('Z') PORT_CHAR(0x1a) PORT_CODE(KEYCODE_Z) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("X") PORT_CHAR('x') PORT_CHAR('X') PORT_CHAR(0x18) PORT_CODE(KEYCODE_X) + + PORT_START("KEYS3") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('4') PORT_CHAR('$') PORT_CODE(KEYCODE_4) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('5') PORT_CHAR('%') PORT_CODE(KEYCODE_5) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("R") PORT_CHAR('r') PORT_CHAR('R') PORT_CHAR(0x12) PORT_CODE(KEYCODE_R) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("T") PORT_CHAR('t') PORT_CHAR('T') PORT_CHAR(0x14) PORT_CODE(KEYCODE_T) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("G Bell") PORT_CHAR('g') PORT_CHAR('G') PORT_CHAR(0x07) PORT_CODE(KEYCODE_G) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("H") PORT_CHAR('h') PORT_CHAR('H') PORT_CODE(KEYCODE_H) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("C") PORT_CHAR('c') PORT_CHAR('C') PORT_CHAR(0x03) PORT_CODE(KEYCODE_C) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("V") PORT_CHAR('v') PORT_CHAR('V') PORT_CHAR(0x16) PORT_CODE(KEYCODE_V) + + PORT_START("KEYS4") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('6') PORT_CHAR('^') PORT_CODE(KEYCODE_6) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('7') PORT_CHAR('&') PORT_CODE(KEYCODE_7) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Y") PORT_CHAR('y') PORT_CHAR('y') PORT_CHAR(0x19) PORT_CODE(KEYCODE_Y) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("U") PORT_CHAR('u') PORT_CHAR('u') PORT_CHAR(0x15) PORT_CODE(KEYCODE_U) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("J") PORT_CHAR('j') PORT_CHAR('j') PORT_CODE(KEYCODE_J) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("K") PORT_CHAR('k') PORT_CHAR('k') PORT_CHAR(0x0b) PORT_CODE(KEYCODE_K) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("B") PORT_CHAR('b') PORT_CHAR('b') PORT_CHAR(0x02) PORT_CODE(KEYCODE_B) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("N") PORT_CHAR('n') PORT_CHAR('n') PORT_CHAR(0x0e) PORT_CODE(KEYCODE_N) + + PORT_START("KEYS5") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('8') PORT_CHAR('*') PORT_CODE(KEYCODE_8) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('9') PORT_CHAR('(') PORT_CODE(KEYCODE_9) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("I") PORT_CHAR('i') PORT_CHAR('I') PORT_CODE(KEYCODE_I) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("O") PORT_CHAR('o') PORT_CHAR('O') PORT_CHAR(0x0f) PORT_CODE(KEYCODE_O) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("L") PORT_CHAR('l') PORT_CHAR('L') PORT_CHAR(0x0c) PORT_CODE(KEYCODE_L) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(';') PORT_CHAR(':') PORT_CODE(KEYCODE_COLON) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("M") PORT_CHAR('m') PORT_CHAR('M') PORT_CODE(KEYCODE_M) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(',') PORT_CHAR('<') PORT_CODE(KEYCODE_COMMA) + + PORT_START("KEYS6") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('0') PORT_CHAR(')') PORT_CODE(KEYCODE_0) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('-') PORT_CHAR('_') PORT_CODE(KEYCODE_MINUS) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("P") PORT_CHAR('p') PORT_CHAR('P') PORT_CHAR(0x10) PORT_CODE(KEYCODE_P) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('[') PORT_CHAR('{') PORT_CODE(KEYCODE_OPENBRACE) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('\'') PORT_CHAR('"') PORT_CODE(KEYCODE_QUOTE) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Return") PORT_CHAR(0x0d) PORT_CODE(KEYCODE_ENTER) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('.') PORT_CHAR('>') PORT_CODE(KEYCODE_STOP) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('/') PORT_CHAR('?') PORT_CODE(KEYCODE_SLASH) + + PORT_START("KEYS7") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('=') PORT_CHAR('+') PORT_CODE(KEYCODE_EQUALS) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('`') PORT_CHAR('~') PORT_CODE(KEYCODE_BACKSLASH) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(']') PORT_CHAR('}') PORT_CODE(KEYCODE_CLOSEBRACE) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('\\') PORT_CHAR('|') PORT_CODE(KEYCODE_PGUP) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(1_PAD)) PORT_CODE(KEYCODE_1_PAD) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(0_PAD)) PORT_CODE(KEYCODE_0_PAD) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Line Feed") PORT_CHAR(0x0a) PORT_CODE(KEYCODE_PGDN) + + PORT_START("KEYS8") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Back Space") PORT_CHAR(0x08) PORT_CODE(KEYCODE_BACKSPACE) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Break") PORT_CODE(KEYCODE_INSERT) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Del") PORT_CHAR(UCHAR_MAMEKEY(DEL)) PORT_CODE(KEYCODE_DEL) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(4_PAD)) PORT_CODE(KEYCODE_4_PAD) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(2_PAD)) PORT_CODE(KEYCODE_2_PAD) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(3_PAD)) PORT_CODE(KEYCODE_3_PAD) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(DEL_PAD)) PORT_CODE(KEYCODE_DEL_PAD) + + PORT_START("KEYS9") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(7_PAD)) PORT_CODE(KEYCODE_7_PAD) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(8_PAD)) PORT_CODE(KEYCODE_8_PAD) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(5_PAD)) PORT_CODE(KEYCODE_5_PAD) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(6_PAD)) PORT_CODE(KEYCODE_6_PAD) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("PF2") PORT_CHAR(UCHAR_MAMEKEY(F2)) PORT_CODE(KEYCODE_F2) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("PF1") PORT_CHAR(UCHAR_MAMEKEY(F1)) PORT_CODE(KEYCODE_F1) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(LEFT)) PORT_CODE(KEYCODE_LEFT) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(DOWN)) PORT_CODE(KEYCODE_DOWN) + + PORT_START("KEYS10") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(9_PAD)) PORT_CODE(KEYCODE_9_PAD) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(MINUS_PAD)) PORT_CODE(KEYCODE_MINUS_PAD) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(COMMA_PAD)) PORT_CODE(KEYCODE_PLUS_PAD) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("PF4") PORT_CHAR(UCHAR_MAMEKEY(F4)) PORT_CODE(KEYCODE_F4) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("PF3") PORT_CHAR(UCHAR_MAMEKEY(F3)) PORT_CODE(KEYCODE_F3) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(RIGHT)) PORT_CODE(KEYCODE_RIGHT) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(UP)) PORT_CODE(KEYCODE_UP) + + PORT_START("KEYS11") + PORT_BIT(0x5f, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(ENTER_PAD)) PORT_CODE(KEYCODE_ENTER_PAD) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(' ') PORT_CODE(KEYCODE_SPACE) +INPUT_PORTS_END + +ioport_constructor keytronic_l2207_device::device_input_ports() const +{ + return INPUT_PORTS_NAME(keytronic_l2207); +} + +void keytronic_l2207_device::device_add_mconfig(machine_config &config) +{ + I8035(config, m_mcu, 3.579545_MHz_XTAL); // P8035HL + 48-00300-010 XTAL + m_mcu->set_addrmap(AS_PROGRAM, &keytronic_l2207_device::prog_map); + m_mcu->set_addrmap(AS_IO, &keytronic_l2207_device::ext_map); + m_mcu->p1_in_cb().set(FUNC(keytronic_l2207_device::p1_r)); + m_mcu->p2_out_cb().set(FUNC(keytronic_l2207_device::p2_w)); + m_mcu->t0_in_cb().set_constant(1); // tied to EA + m_mcu->t1_in_cb().set_constant(0); // pulled up for inverted parallel output + m_mcu->bus_out_cb().set_nop(); // WR connected for parallel interface only + m_mcu->prog_out_cb().set_nop(); // STB on parallel connector + + SPEAKER(config, "mono").front_center(); // 48-00125-000 + flyback diode + SPEAKER_SOUND(config, m_beeper).add_route(ALL_OUTPUTS, "mono", 0.5); +} + +ROM_START(keytronic_l2207) + ROM_REGION(0x800, "eprom", 0) + ROM_SYSTEM_BIOS(0, "a65_02207", "A65-02207-051/2510") // from Wicat System 150 + ROMX_LOAD("w150_ns2758.bin", 0x000, 0x400, CRC(f65e1ca5) SHA1(7919385fe8badbb610b793a3f5e4077982094aaa), ROM_BIOS(0)) + ROM_RELOAD(0x400, 0x400) + ROM_SYSTEM_BIOS(1, "a65_02675", "A65-02675-051") + ROMX_LOAD("key_05__162092859__8-23-82.bin", 0x000, 0x800, CRC(970b11a3) SHA1(a1c9c505eb3ccf132307b2ac0e04b0326f50621e), ROM_BIOS(1)) // MM2716Q +ROM_END + +const tiny_rom_entry *keytronic_l2207_device::device_rom_region() const +{ + return ROM_NAME(keytronic_l2207); +} diff --git a/src/devices/machine/keytronic_l2207.h b/src/devices/machine/keytronic_l2207.h new file mode 100644 index 00000000000..d01d9faf128 --- /dev/null +++ b/src/devices/machine/keytronic_l2207.h @@ -0,0 +1,75 @@ +// license:BSD-3-Clause +// copyright-holders:AJR +/********************************************************************** + + Keytronic L2207 83-key keyboard + +**********************************************************************/ + +#ifndef MAME_MACHINE_KEYTRONIC_L2207_H +#define MAME_MACHINE_KEYTRONIC_L2207_H + +#pragma once + +#include "cpu/mcs48/mcs48.h" +#include "sound/spkrdev.h" + + +//************************************************************************** +// TYPE DEFINITIONS +//************************************************************************** + +// ======================> keytronic_l2207_device + +class keytronic_l2207_device : public device_t +{ +public: + // device type constructor + keytronic_l2207_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); + + static constexpr feature_type imperfect_features() { return feature::SOUND; } + + // callback configuration + auto ser_out_callback() { return m_ser_out_callback.bind(); } + + // serial line input + DECLARE_WRITE_LINE_MEMBER(ser_in_w); + +protected: + // device-level overrides + virtual void device_resolve_objects() override; + virtual void device_start() 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; + +private: + // MCU handlers + u8 led_latch_r(); + u8 p1_r(); + void p2_w(u8 data); + + // address maps + void prog_map(address_map &map); + void ext_map(address_map &map); + + // object finders + required_device m_mcu; + required_device m_beeper; + required_ioport_array<12> m_keys; + output_finder<8> m_leds; + output_finder<> m_all_caps; + + // output callback + devcb_write_line m_ser_out_callback; + + // internal state + u8 m_p1_in; + u8 m_p2_out; + bool m_beeper_latch; +}; + +// device type declarations +DECLARE_DEVICE_TYPE(KEYTRONIC_L2207, keytronic_l2207_device) + +#endif // MAME_MACHINE_KEYTRONIC_L2207_H diff --git a/src/mame/kyocera/kyocera.cpp b/src/mame/kyocera/kyocera.cpp index efe7eb4030d..bc86a1d87c7 100644 --- a/src/mame/kyocera/kyocera.cpp +++ b/src/mame/kyocera/kyocera.cpp @@ -1361,7 +1361,7 @@ void kc85_state::kc85(machine_config &config) m_uart->dr_callback().set_inputline(m_maincpu, I8085_RST65_LINE); rs232_port_device &rs232(RS232_PORT(config, RS232_TAG, default_rs232_devices, nullptr)); - rs232.rxd_handler().set(m_uart, FUNC(im6402_device::write_rri)); + rs232.rxd_handler().set(m_uart, FUNC(im6402_device::rri_w)); CENTRONICS(config, m_centronics, centronics_devices, "printer"); m_centronics->busy_handler().set(FUNC(kc85_state::write_centronics_busy)); @@ -1412,7 +1412,7 @@ void pc8201_state::pc8201(machine_config &config) m_uart->dr_callback().set_inputline(m_maincpu, I8085_RST65_LINE); rs232_port_device &rs232(RS232_PORT(config, RS232_TAG, default_rs232_devices, nullptr)); - rs232.rxd_handler().set(m_uart, FUNC(im6402_device::write_rri)); + rs232.rxd_handler().set(m_uart, FUNC(im6402_device::rri_w)); CENTRONICS(config, m_centronics, centronics_devices, "printer"); m_centronics->busy_handler().set(FUNC(pc8201_state::write_centronics_busy)); @@ -1472,7 +1472,7 @@ void trsm100_state::trsm100(machine_config &config) m_uart->dr_callback().set_inputline(m_maincpu, I8085_RST65_LINE); rs232_port_device &rs232(RS232_PORT(config, RS232_TAG, default_rs232_devices, nullptr)); - rs232.rxd_handler().set(m_uart, FUNC(im6402_device::write_rri)); + rs232.rxd_handler().set(m_uart, FUNC(im6402_device::rx_w)); CENTRONICS(config, m_centronics, centronics_devices, "printer"); diff --git a/src/mame/layout/wicat.lay b/src/mame/layout/wicat.lay index 8b4e26a0457..b3ed31549c3 100644 --- a/src/mame/layout/wicat.lay +++ b/src/mame/layout/wicat.lay @@ -12,6 +12,81 @@ LED layout for Wicat WS-150 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -35,6 +110,84 @@ LED layout for Wicat WS-150 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/skeleton/wicat.cpp b/src/mame/skeleton/wicat.cpp index 5f574e76fc2..fa9a5217a64 100644 --- a/src/mame/skeleton/wicat.cpp +++ b/src/mame/skeleton/wicat.cpp @@ -28,6 +28,7 @@ Wicat - various systems. #include "machine/am9517a.h" #include "machine/im6402.h" #include "machine/input_merger.h" +#include "machine/keytronic_l2207.h" #include "machine/mm58174.h" #include "machine/scn_pci.h" #include "machine/wd_fdc.h" @@ -56,14 +57,12 @@ public: m_videoirq(*this, "videoirq"), m_crtc(*this, "video"), m_videodma(*this, "videodma"), - m_videouart0(*this, "videouart0"), - m_videouart1(*this, "videouart1"), - m_videouart(*this, "videouart"), + m_videouart(*this, "videouart%u", 0U), + m_kbduart(*this, "kbduart"), m_videosram(*this, "vsram"), m_palette(*this, "palette"), m_chargen(*this, "g2char"), - m_fdc(*this,"fdc"), - m_keyboard(*this, "kb%i", 0U) + m_fdc(*this,"fdc") { } @@ -72,7 +71,6 @@ public: private: virtual void machine_start() override; virtual void machine_reset() override; - virtual void driver_start() override; void main_mem(address_map &map); void video_io(address_map &map); @@ -80,13 +78,6 @@ private: void wd1000_io(address_map &map); void wd1000_mem(address_map &map); - TIMER_CALLBACK_MEMBER(poll_kb); - TIMER_CALLBACK_MEMBER(kb_serial_tick); - - uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { return 0; } - - void send_key(uint8_t val); - uint16_t memmap_r(); void memmap_w(uint16_t data); DECLARE_WRITE_LINE_MEMBER(adir_w); @@ -95,8 +86,8 @@ private: void via_b_w(uint8_t data); void videosram_store_w(uint8_t data); void videosram_recall_w(uint8_t data); - uint8_t video_timer_r(offs_t offset); - void video_timer_w(offs_t offset, uint8_t data); + uint8_t video_uart_status_r(); + uint8_t video_kbduart_r(); uint8_t vram_r(offs_t offset); void vram_w(offs_t offset, uint8_t data); uint8_t video_status_r(); @@ -120,24 +111,16 @@ private: required_device m_videoirq; required_device m_crtc; required_device m_videodma; - required_device m_videouart0; - required_device m_videouart1; - required_device m_videouart; + required_device_array m_videouart; + required_device m_kbduart; required_device m_videosram; required_device m_palette; required_memory_region m_chargen; required_device m_fdc; - required_ioport_array<8> m_keyboard; - - emu_timer* m_kb_timer; - emu_timer* m_kb_serial_timer; uint8_t m_portA; uint8_t m_portB; bool m_crtc_irq; - uint16_t m_kb_data; - uint8_t m_kb_bit; - uint32_t m_kb_keys[8]; }; @@ -176,9 +159,10 @@ void wicat_state::video_mem(address_map &map) void wicat_state::video_io(address_map &map) { // these are largely wild guesses... - map(0x0000, 0x0003).rw(FUNC(wicat_state::video_timer_r), FUNC(wicat_state::video_timer_w)).umask16(0xff00); // some sort of timer? - map(0x0100, 0x0107).rw(m_videouart0, FUNC(scn2651_device::read), FUNC(scn2651_device::write)).umask16(0xff00); // INS2651 UART #1 - map(0x0200, 0x0207).rw(m_videouart1, FUNC(scn2651_device::read), FUNC(scn2651_device::write)).umask16(0xff00); // INS2651 UART #2 + map(0x0000, 0x0000).r(FUNC(wicat_state::video_uart_status_r)); + map(0x0002, 0x0002).r(FUNC(wicat_state::video_kbduart_r)).w(m_kbduart, FUNC(im6402_device::write)); + map(0x0100, 0x0107).rw(m_videouart[0], FUNC(scn2651_device::read), FUNC(scn2651_device::write)).umask16(0xff00); // INS2651 UART #1 + map(0x0200, 0x0207).rw(m_videouart[1], FUNC(scn2651_device::read), FUNC(scn2651_device::write)).umask16(0xff00); // INS2651 UART #2 map(0x0304, 0x0304).r(FUNC(wicat_state::video_status_r)); map(0x0400, 0x047f).rw(m_videosram, FUNC(x2210_device::read), FUNC(x2210_device::write)).umask16(0xff00); // XD2210 4-bit NOVRAM map(0x0500, 0x0500).w(FUNC(wicat_state::videosram_recall_w)); @@ -208,67 +192,6 @@ void wicat_state::wd1000_io(address_map &map) /* Input ports */ static INPUT_PORTS_START( wicat ) - PORT_START("kb0") - PORT_BIT(0x00000080,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Tab") PORT_CODE(KEYCODE_TAB) PORT_CHAR(7) - PORT_BIT(0x00000100,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Backspace") PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8) - PORT_BIT(0x00002000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Retrn") PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13) - - PORT_START("kb1") - PORT_BIT(0x00000001,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Space") PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') - PORT_BIT(0x00010000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("0") PORT_CODE(KEYCODE_0) PORT_CHAR('0') - PORT_BIT(0x00020000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("1") PORT_CODE(KEYCODE_1) PORT_CHAR('1') - PORT_BIT(0x00040000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("2") PORT_CODE(KEYCODE_2) PORT_CHAR('2') - PORT_BIT(0x00080000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("3") PORT_CODE(KEYCODE_3) PORT_CHAR('3') - PORT_BIT(0x00100000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("4") PORT_CODE(KEYCODE_4) PORT_CHAR('4') - PORT_BIT(0x00200000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("5") PORT_CODE(KEYCODE_5) PORT_CHAR('5') - PORT_BIT(0x00400000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("6") PORT_CODE(KEYCODE_6) PORT_CHAR('6') - PORT_BIT(0x00800000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("7") PORT_CODE(KEYCODE_7) PORT_CHAR('7') - PORT_BIT(0x01000000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("8") PORT_CODE(KEYCODE_8) PORT_CHAR('8') - PORT_BIT(0x02000000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("9") PORT_CODE(KEYCODE_9) PORT_CHAR('9') - - PORT_START("kb2") - PORT_BIT(0x00000001,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("@") PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('@') - - PORT_START("kb3") - PORT_BIT(0x00000002,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("A") PORT_CODE(KEYCODE_A) PORT_CHAR('A') - PORT_BIT(0x00000004,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("B") PORT_CODE(KEYCODE_B) PORT_CHAR('B') - PORT_BIT(0x00000008,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("C") PORT_CODE(KEYCODE_C) PORT_CHAR('C') - PORT_BIT(0x00000010,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("D") PORT_CODE(KEYCODE_D) PORT_CHAR('D') - PORT_BIT(0x00000020,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("E") PORT_CODE(KEYCODE_E) PORT_CHAR('E') - PORT_BIT(0x00000040,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F") PORT_CODE(KEYCODE_F) PORT_CHAR('F') - PORT_BIT(0x00000080,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("G") PORT_CODE(KEYCODE_G) PORT_CHAR('G') - PORT_BIT(0x00000100,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("H") PORT_CODE(KEYCODE_H) PORT_CHAR('H') - PORT_BIT(0x00000200,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("I") PORT_CODE(KEYCODE_I) PORT_CHAR('I') - PORT_BIT(0x00000400,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("J") PORT_CODE(KEYCODE_J) PORT_CHAR('J') - PORT_BIT(0x00000800,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("K") PORT_CODE(KEYCODE_K) PORT_CHAR('K') - PORT_BIT(0x00001000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("L") PORT_CODE(KEYCODE_L) PORT_CHAR('L') - PORT_BIT(0x00002000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("M") PORT_CODE(KEYCODE_M) PORT_CHAR('M') - PORT_BIT(0x00004000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("N") PORT_CODE(KEYCODE_N) PORT_CHAR('N') - PORT_BIT(0x00008000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("O") PORT_CODE(KEYCODE_O) PORT_CHAR('O') - PORT_BIT(0x00010000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("P") PORT_CODE(KEYCODE_P) PORT_CHAR('P') - PORT_BIT(0x00020000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Q") PORT_CODE(KEYCODE_Q) PORT_CHAR('Q') - PORT_BIT(0x00040000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("R") PORT_CODE(KEYCODE_R) PORT_CHAR('R') - PORT_BIT(0x00080000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("S") PORT_CODE(KEYCODE_S) PORT_CHAR('S') - PORT_BIT(0x00100000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("T") PORT_CODE(KEYCODE_T) PORT_CHAR('T') - PORT_BIT(0x00200000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("U") PORT_CODE(KEYCODE_U) PORT_CHAR('U') - PORT_BIT(0x00400000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("V") PORT_CODE(KEYCODE_V) PORT_CHAR('V') - PORT_BIT(0x00800000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("W") PORT_CODE(KEYCODE_W) PORT_CHAR('W') - PORT_BIT(0x01000000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("X") PORT_CODE(KEYCODE_X) PORT_CHAR('X') - PORT_BIT(0x02000000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Y") PORT_CODE(KEYCODE_Y) PORT_CHAR('Y') - PORT_BIT(0x04000000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Z") PORT_CODE(KEYCODE_Z) PORT_CHAR('Z') - PORT_BIT(0x80000000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Unknown (7F)") PORT_CODE(KEYCODE_F4) - - PORT_START("kb4") - - PORT_START("kb5") - PORT_BIT(0x00000400,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Unknown (AA)") PORT_CODE(KEYCODE_F2) - PORT_BIT(0x00010000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Unknown (B0)") PORT_CODE(KEYCODE_F3) - - PORT_START("kb6") - - PORT_START("kb7") - PORT_BIT(0x40000000,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Set-up (FE)") PORT_CODE(KEYCODE_F1) - INPUT_PORTS_END static void wicat_floppies(device_slot_interface &device) @@ -276,12 +199,6 @@ static void wicat_floppies(device_slot_interface &device) device.option_add("525qd", FLOPPY_525_QD); } -void wicat_state::driver_start() -{ - m_kb_timer = timer_alloc(FUNC(wicat_state::poll_kb), this); - m_kb_serial_timer = timer_alloc(FUNC(wicat_state::kb_serial_tick), this); -} - void wicat_state::machine_start() { } @@ -289,62 +206,19 @@ void wicat_state::machine_start() void wicat_state::machine_reset() { // on the terminal board /DCD on both INS2651s are tied to GND - m_videouart0->dcd_w(0); - m_videouart1->dcd_w(0); + m_videouart[0]->dcd_w(0); + m_videouart[1]->dcd_w(0); for (int i = 0; i < 6; i++) m_uart[i]->dcd_w(0); // initialise im6402 (terminal board) - m_videouart->cls1_w(1); - m_videouart->cls2_w(1); - m_videouart->pi_w(1); - m_videouart->sbs_w(0); - m_videouart->crl_w(1); + m_kbduart->cls1_w(1); + m_kbduart->cls2_w(1); + m_kbduart->pi_w(1); + m_kbduart->sbs_w(0); + m_kbduart->crl_w(1); - m_kb_timer->adjust(attotime::zero,0,attotime::from_msec(50)); m_crtc_irq = false; - for(auto & elem : m_kb_keys) - elem = 0; -} - -TIMER_CALLBACK_MEMBER(wicat_state::kb_serial_tick) -{ - m_videouart->write_rri((m_kb_data >> (m_kb_bit)) & 0x01); - m_kb_bit++; - if(m_kb_bit > 10) - { - m_kb_serial_timer->reset(); - } -} - -TIMER_CALLBACK_MEMBER(wicat_state::poll_kb) -{ - uint8_t val = 0; - - for(uint8_t line=0; line<8; line++) - { - uint32_t data = m_keyboard[line]->read(); - for(uint8_t x=0;x<32;x++) - { - if((data & (1<adjust(attotime::zero,0,attotime::from_hz(1200)); } WRITE_LINE_MEMBER(wicat_state::adir_w) @@ -535,29 +409,19 @@ void wicat_state::videosram_recall_w(uint8_t data) } } -uint8_t wicat_state::video_timer_r(offs_t offset) +uint8_t wicat_state::video_uart_status_r() { - uint8_t ret = 0x00; - - if(offset == 0x00) - return (m_videouart->dr_r() << 4) | (m_videouart->tbre_r() && m_videoctrl->q6_r() ? 0x08 : 0x00); - if(offset == 0x01) - { - if (!machine().side_effects_disabled()) - { - m_videouart->drr_w(1); - m_videouart->drr_w(0); - } - return m_videouart->read(); - } - return ret; + return (m_kbduart->dr_r() << 4) | (m_kbduart->tbre_r() && m_videoctrl->q6_r() ? 0x08 : 0x00); } -void wicat_state::video_timer_w(offs_t offset, uint8_t data) +uint8_t wicat_state::video_kbduart_r() { - logerror("I/O port 0x%04x write %02x\n",offset,data); - if(offset == 0x01) - m_videouart->write(data); + if (!machine().side_effects_disabled()) + { + m_kbduart->drr_w(1); + m_kbduart->drr_w(0); + } + return m_kbduart->read(); } uint8_t wicat_state::video_status_r() @@ -618,10 +482,10 @@ void wicat_state::wicat(machine_config &config) // internal terminal SCN2661C(config, m_uart[0], 5.0688_MHz_XTAL); // connected to terminal board - m_uart[0]->txd_handler().set(m_videouart0, FUNC(scn2651_device::rxd_w)); + m_uart[0]->txd_handler().set(m_videouart[0], FUNC(scn2651_device::rxd_w)); m_uart[0]->rxrdy_handler().set_inputline(m_maincpu, M68K_IRQ_2); - m_uart[0]->rts_handler().set(m_videouart0, FUNC(scn2651_device::cts_w)); - m_uart[0]->dtr_handler().set(m_videouart0, FUNC(scn2651_device::dsr_w)); + m_uart[0]->rts_handler().set(m_videouart[0], FUNC(scn2651_device::cts_w)); + m_uart[0]->dtr_handler().set(m_videouart[0], FUNC(scn2651_device::dsr_w)); // RS232C ports (x5) const char *serial_names[5] = { "serial1", "serial2", "serial3", "serial4", "serial5" }; @@ -673,7 +537,7 @@ void wicat_state::wicat(machine_config &config) m_videoctrl->q_out_cb<7>().set("dmairq", FUNC(input_merger_device::in_w<1>)); // Q1-Q5 are all used but unknown - AM9517A(config, m_videodma, 8_MHz_XTAL); // clock is a bit of guess + AM9517A(config, m_videodma, 8_MHz_XTAL / 2); // AMD AM9517-4PC m_videodma->out_hreq_callback().set(FUNC(wicat_state::dma_hrq_w)); m_videodma->out_eop_callback().set("dmairq", FUNC(input_merger_device::in_w<0>)); m_videodma->in_memr_callback().set(FUNC(wicat_state::vram_r)); @@ -682,25 +546,28 @@ void wicat_state::wicat(machine_config &config) INPUT_MERGER_ALL_HIGH(config, "dmairq").output_handler().set_inputline(m_videocpu, z8002_device::NMI_LINE); - IM6402(config, m_videouart, 0); - m_videouart->set_rrc(0); - m_videouart->set_trc(1200); - m_videouart->dr_callback().set(m_videoirq, FUNC(input_merger_device::in_w<2>)); - m_videouart->tbre_callback().set("tbreirq", FUNC(input_merger_device::in_w<0>)); + IM6402(config, m_kbduart, 0); // IM6402-1IPL + m_kbduart->set_rrc(5068800 / 1056); // 74LS393 output? + m_kbduart->set_trc(5068800 / 1056); + m_kbduart->tro_callback().set("keyboard", FUNC(keytronic_l2207_device::ser_in_w)); + m_kbduart->dr_callback().set(m_videoirq, FUNC(input_merger_device::in_w<2>)); + m_kbduart->tbre_callback().set("tbreirq", FUNC(input_merger_device::in_w<0>)); + + KEYTRONIC_L2207(config, "keyboard").ser_out_callback().set(m_kbduart, FUNC(im6402_device::rri_w)); INPUT_MERGER_ALL_HIGH(config, "tbreirq").output_handler().set(m_videoirq, FUNC(input_merger_device::in_w<3>)); - // terminal (2x INS2651, 1x IM6042 - one of these is for the keyboard, another communicates with the main board, the third is unknown) - SCN2651(config, m_videouart0, 5.0688_MHz_XTAL); - m_videouart0->txd_handler().set(m_uart[0], FUNC(scn2651_device::rxd_w)); - m_videouart0->rxrdy_handler().set(m_videoirq, FUNC(input_merger_device::in_w<0>)); - m_videouart0->rts_handler().set(m_uart[0], FUNC(scn2651_device::cts_w)); - m_videouart0->dtr_handler().set(m_uart[0], FUNC(scn2651_device::dsr_w)); + // terminal (2x INS2651, 1x IM6402 - one of these is for the keyboard, another communicates with the main board, the third is unknown) + SCN2651(config, m_videouart[0], 5.0688_MHz_XTAL); + m_videouart[0]->txd_handler().set(m_uart[0], FUNC(scn2651_device::rxd_w)); + m_videouart[0]->rxrdy_handler().set(m_videoirq, FUNC(input_merger_device::in_w<0>)); + m_videouart[0]->rts_handler().set(m_uart[0], FUNC(scn2651_device::cts_w)); + m_videouart[0]->dtr_handler().set(m_uart[0], FUNC(scn2651_device::dsr_w)); - SCN2651(config, m_videouart1, 5.0688_MHz_XTAL); - //m_videouart1->set_rxc(19200); - //m_videouart1->set_txc(19200); - m_videouart1->rxrdy_handler().set(m_videoirq, FUNC(input_merger_device::in_w<4>)); + SCN2651(config, m_videouart[1], 5.0688_MHz_XTAL); + //m_videouart[1]->set_rxc(19200); + //m_videouart[1]->set_txc(19200); + m_videouart[1]->rxrdy_handler().set(m_videoirq, FUNC(input_merger_device::in_w<4>)); X2210(config, "vsram"); // XD2210 @@ -824,4 +691,4 @@ ROM_END /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS -COMP( 1982, wicat, 0, 0, wicat, wicat, wicat_state, empty_init, "Millennium Systems", "Wicat System 150", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) +COMP( 1982, wicat, 0, 0, wicat, wicat, wicat_state, empty_init, "Millennium Systems", "Wicat System 150", MACHINE_NOT_WORKING ) diff --git a/src/mame/wang/wangpc.cpp b/src/mame/wang/wangpc.cpp index f882687984e..6c10bec49cd 100644 --- a/src/mame/wang/wangpc.cpp +++ b/src/mame/wang/wangpc.cpp @@ -173,6 +173,7 @@ private: uint8_t ppi_pb_r(); uint8_t ppi_pc_r(); void ppi_pc_w(uint8_t data); + DECLARE_WRITE_LINE_MEMBER( pit0_w ); DECLARE_WRITE_LINE_MEMBER( pit2_w ); DECLARE_WRITE_LINE_MEMBER( uart_dr_w ); DECLARE_WRITE_LINE_MEMBER( uart_tbre_w ); @@ -445,7 +446,7 @@ void wangpc_state::timer0_irq_clr_w(uint8_t data) { //if (LOG) logerror("%s: Timer 0 IRQ clear\n", machine().describe_context()); - m_pic->ir0_w(CLEAR_LINE); + m_pic->ir0_w(0); } @@ -1012,6 +1013,12 @@ void wangpc_state::ppi_pc_w(uint8_t data) m_centronics->write_init(BIT(data, 2)); } +WRITE_LINE_MEMBER( wangpc_state::pit0_w ) +{ + if (state) + m_pic->ir0_w(1); +} + WRITE_LINE_MEMBER( wangpc_state::pit2_w ) { if (state) @@ -1271,7 +1278,7 @@ void wangpc_state::wangpc(machine_config &config) PIT8253(config, m_pit, 0); m_pit->set_clk<0>(500000); - m_pit->out_handler<0>().set(m_pic, FUNC(pic8259_device::ir0_w)); + m_pit->out_handler<0>().set(FUNC(wangpc_state::pit0_w)); m_pit->set_clk<1>(2000000); m_pit->set_clk<2>(500000); m_pit->out_handler<2>().set(FUNC(wangpc_state::pit2_w)); @@ -1312,7 +1319,7 @@ void wangpc_state::wangpc(machine_config &config) rs232.dsr_handler().set(m_epci, FUNC(scn_pci_device::dsr_w)); rs232.dcd_handler().set(m_epci, FUNC(scn_pci_device::dcd_w)); - WANGPC_KEYBOARD(config, "wangpckb").txd_handler().set(m_uart, FUNC(im6402_device::write_rri)); + WANGPC_KEYBOARD(config, "wangpckb").txd_handler().set(m_uart, FUNC(im6402_device::rri_w)); // bus WANGPC_BUS(config, m_bus, 0); diff --git a/src/mame/wang/wangpckb.cpp b/src/mame/wang/wangpckb.cpp index 7e77c60829a..0f4bfa0d72e 100644 --- a/src/mame/wang/wangpckb.cpp +++ b/src/mame/wang/wangpckb.cpp @@ -392,7 +392,7 @@ void wangpc_keyboard_device::device_start() set_data_frame(1, 8, PARITY_NONE, STOP_BITS_2); set_rcv_rate(62500); - //set_tra_rate(62500); + set_tra_rate(62500); save_item(NAME(m_keylatch)); save_item(NAME(m_rxd)); @@ -422,7 +422,7 @@ void wangpc_keyboard_device::tra_callback() if (LOG) logerror("KB '%s' Transmit Bit %u\n", tag(), bit); - m_txd_handler(transmit_register_get_data_bit()); + m_txd_handler(bit); } @@ -495,12 +495,6 @@ void wangpc_keyboard_device::mcs51_tx_callback(uint8_t data) if (LOG) logerror("KB '%s' CPU Transmit Data %02x\n", tag(), data); transmit_register_setup(data); - - // HACK bang the bits out immediately - while (!is_transmit_register_empty()) - { - m_txd_handler(transmit_register_get_data_bit()); - } } -- cgit v1.2.3