summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2019-07-01 23:58:52 -0400
committer AJR <ajrhacker@users.noreply.github.com>2019-07-02 00:01:31 -0400
commit63eb97a7abcfe78c94606129a14e8781ac68c857 (patch)
treee6fe5dd56521f53cb2a6bb72e5b5752ef8e9de51
parent8e34fa3d929063daaae68a62016fdb381f1ef626 (diff)
wy100: Add keyboard, preliminary character display and serial ports
wy50kb: Fix mistaken identification of F4 key
-rw-r--r--src/mame/drivers/wy100.cpp182
-rw-r--r--src/mame/machine/wy50kb.cpp252
-rw-r--r--src/mame/machine/wy50kb.h26
3 files changed, 416 insertions, 44 deletions
diff --git a/src/mame/drivers/wy100.cpp b/src/mame/drivers/wy100.cpp
index 83a92b2a41e..17d1a7c2057 100644
--- a/src/mame/drivers/wy100.cpp
+++ b/src/mame/drivers/wy100.cpp
@@ -4,15 +4,25 @@
Skeleton driver for Wyse WY-100 video terminal.
- The WY-100 was Wyse Technology's first product. An unusual feature of
- this terminal's keyboard is three banks of user-accessible DIP switches.
+ The WY-100 was Wyse Technology's first product.
+
+ Of the two 8276 CRTCs, one is used solely to keep track of which characters
+ are protected, which is the only transparent attribute supported.
+
+ Known emulation bugs:
+ - Return key often gets corrupted when looped back
+ - Frequent screen glitches when writing to the display
+ - Key click is missing
+ - No dimming of protected characters
*******************************************************************************/
#include "emu.h"
+#include "bus/rs232/rs232.h"
#include "cpu/mcs48/mcs48.h"
#include "machine/bankdev.h"
#include "machine/mc2661.h"
+#include "machine/wy50kb.h"
#include "video/i8275.h"
#include "screen.h"
@@ -22,9 +32,11 @@ public:
wy100_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
, m_maincpu(*this, "maincpu")
- , m_bankdev(*this, "bankdev")
+ , m_rambank(*this, "rambank")
, m_crtc(*this, "crtc%u", 1U)
, m_pci(*this, "pci")
+ , m_modem(*this, "modem")
+ , m_printer(*this, "aux")
, m_chargen(*this, "chargen")
{
}
@@ -37,67 +49,151 @@ protected:
private:
I8275_DRAW_CHARACTER_MEMBER(draw_character);
- DECLARE_WRITE8_MEMBER(crtc_w);
- uint8_t pci_r(offs_t offset);
- void pci_w(offs_t offset, uint8_t data);
+ DECLARE_WRITE_LINE_MEMBER(brdy_w);
DECLARE_WRITE_LINE_MEMBER(rxrdy_w);
- void p2_w(uint8_t data);
+ DECLARE_WRITE_LINE_MEMBER(txd_w);
+ void p2_w(u8 data);
DECLARE_READ_LINE_MEMBER(t1_r);
+ u8 memory_r(offs_t offset);
+ void memory_w(offs_t offset, u8 data);
void prg_map(address_map &map);
void io_map(address_map &map);
void bank_map(address_map &map);
required_device<mcs48_cpu_device> m_maincpu;
- required_device<address_map_bank_device> m_bankdev;
+ required_device<address_map_bank_device> m_rambank;
required_device_array<i8276_device, 2> m_crtc;
required_device<mc2661_device> m_pci;
+ required_device<rs232_port_device> m_modem;
+ required_device<rs232_port_device> m_printer;
required_region_ptr<u8> m_chargen;
+ bool m_brdy;
bool m_rxrdy;
+ bool m_bs_enable;
+ bool m_txd;
+ bool m_printer_select;
};
void wy100_state::machine_start()
{
+ m_brdy = false;
m_rxrdy = false;
+ m_bs_enable = false;
+ m_txd = true;
+ m_printer_select = false;
+ save_item(NAME(m_brdy));
save_item(NAME(m_rxrdy));
+ save_item(NAME(m_bs_enable));
+ save_item(NAME(m_txd));
+ save_item(NAME(m_printer_select));
}
-I8275_DRAW_CHARACTER_MEMBER(wy100_state::draw_character)
+WRITE_LINE_MEMBER(wy100_state::brdy_w)
{
+ m_brdy = state;
}
-WRITE8_MEMBER(wy100_state::crtc_w)
+WRITE_LINE_MEMBER(wy100_state::rxrdy_w)
{
- m_crtc[0]->write(space, offset >> 8, data);
- m_crtc[1]->write(space, offset >> 8, data);
+ m_rxrdy = state;
}
-uint8_t wy100_state::pci_r(offs_t offset)
+I8275_DRAW_CHARACTER_MEMBER(wy100_state::draw_character)
{
- return m_pci->read(offset >> 8);
+ // LTEN attribute output is not used (GPA1 generates underline instead)
+ u8 dots = 0;
+ if (!vsp)
+ {
+ if (BIT(gpa, 1) && (linecount & 0xb) == 0xa)
+ dots = 0xff;
+ else if (!BIT(gpa, 0))
+ dots = m_chargen[(charcode << 4) | linecount];
+ }
+ if (rvv)
+ dots ^= 0xff;
+
+ // TODO: dim protected characters
+ const rgb_t fg = rgb_t::white();
+ const rgb_t bg = rgb_t::black();
+ for (int i = 0; i < 10; i++)
+ bitmap.pix32(y, x + i) = BIT(dots, i < 1 || i > 8 ? 7 : 8 - i) ? fg : bg;
}
-void wy100_state::pci_w(offs_t offset, uint8_t data)
+WRITE_LINE_MEMBER(wy100_state::txd_w)
{
- m_pci->write(offset >> 8, data);
+ m_txd = state;
+ if (m_printer_select)
+ m_printer->write_txd(state);
+ else
+ m_modem->write_txd(state);
}
-WRITE_LINE_MEMBER(wy100_state::rxrdy_w)
+void wy100_state::p2_w(u8 data)
{
- m_rxrdy = state;
+ m_rambank->set_bank(data & 0x1f);
+ if (!BIT(data, 6))
+ m_bs_enable = false;
+ if (BIT(data, 7) && !m_printer_select)
+ {
+ m_printer_select = true;
+ m_printer->write_txd(m_txd);
+ m_modem->write_txd(1);
+ }
+ else if (!BIT(data, 7) && m_printer_select)
+ {
+ m_printer_select = false;
+ m_modem->write_txd(m_txd);
+ m_printer->write_txd(1);
+ }
}
-void wy100_state::p2_w(uint8_t data)
+READ_LINE_MEMBER(wy100_state::t1_r)
{
- m_bankdev->set_bank(data & 0x7f);
+ return !m_rxrdy;
}
-READ_LINE_MEMBER(wy100_state::t1_r)
+u8 wy100_state::memory_r(offs_t offset)
{
- return m_rxrdy;
+ u8 p2 = m_maincpu->p2_r();
+ u8 data = BIT(p2, 5) ? m_pci->read(p2 & 3) : m_rambank->read8(offset);
+ if (BIT(p2, 5))
+ logerror("%s: Reading %02X from PCI register %d\n", machine().describe_context(), data, p2 & 3);
+ if (m_bs_enable && !machine().side_effects_disabled())
+ {
+ address_space &space = machine().dummy_space();
+ u8 chardata = (data & 0xe0) == 0x80 ? data : data & 0x7f;
+ m_crtc[0]->dack_w(space, 0, chardata);
+ m_crtc[1]->dack_w(space, 0, (chardata & 0xfe) | (BIT(data, 7) ? 0x00 : 0x01));
+ }
+ return data;
+}
+
+void wy100_state::memory_w(offs_t offset, u8 data)
+{
+ u8 p2 = m_maincpu->p2_r();
+
+ // CRTC access is write-only
+ if (!BIT(p2, 6))
+ {
+ address_space &space = machine().dummy_space();
+ m_crtc[0]->write(space, p2 & 1, data);
+ m_crtc[1]->write(space, p2 & 1, data);
+ }
+ else if (m_brdy)
+ m_bs_enable = true;
+
+ if (BIT(p2, 5))
+ {
+ logerror("%s: Writing %02X to PCI register %d\n", machine().describe_context(), data, p2 & 3);
+
+ m_pci->write(p2 & 3, data);
+ }
+
+ m_rambank->write8(offset, data);
}
void wy100_state::prg_map(address_map &map)
@@ -107,15 +203,14 @@ void wy100_state::prg_map(address_map &map)
void wy100_state::io_map(address_map &map)
{
- map(0x00, 0xff).m(m_bankdev, FUNC(address_map_bank_device::amap8));
+ map(0x00, 0xff).rw(FUNC(wy100_state::memory_r), FUNC(wy100_state::memory_w));
}
void wy100_state::bank_map(address_map &map)
{
- map(0x0000, 0x0000).mirror(0x10ff).select(0x100).w(FUNC(wy100_state::crtc_w));
- map(0x4000, 0x4000).mirror(0xff).nopw();
- map(0x4c00, 0x5fff).ram();
- map(0x6000, 0x63ff).rw(FUNC(wy100_state::pci_r), FUNC(wy100_state::pci_w));
+ map(0x0000, 0x0bff).nopw();
+ map(0x0c00, 0x0fff).ram(); // buffer RAM (P2114A-6 at 4-5A)
+ map(0x1000, 0x1fff).ram(); // display RAM (P2114A-6 at 6-9A, optionally also at 10-13A)
}
@@ -128,19 +223,29 @@ void wy100_state::wy100(machine_config &config)
I8039(config, m_maincpu, 10.1376_MHz_XTAL); // INS8039N-11
m_maincpu->set_addrmap(AS_PROGRAM, &wy100_state::prg_map);
m_maincpu->set_addrmap(AS_IO, &wy100_state::io_map);
+ m_maincpu->p1_out_cb().set("keyboard", FUNC(wy100_keyboard_device::scan_w)).mask(0x7f).invert();
m_maincpu->p2_out_cb().set(FUNC(wy100_state::p2_w));
+ m_maincpu->t0_in_cb().set("keyboard", FUNC(wy100_keyboard_device::sense_r)).invert();
+ m_maincpu->t1_in_cb().set(FUNC(wy100_state::t1_r));
+
+ WY100_KEYBOARD(config, "keyboard");
- ADDRESS_MAP_BANK(config, m_bankdev);
- m_bankdev->set_addrmap(0, &wy100_state::bank_map);
- m_bankdev->set_data_width(8);
- m_bankdev->set_addr_width(15);
- m_bankdev->set_stride(0x100);
+ ADDRESS_MAP_BANK(config, m_rambank);
+ m_rambank->set_addrmap(0, &wy100_state::bank_map);
+ m_rambank->set_data_width(8);
+ m_rambank->set_addr_width(13);
+ m_rambank->set_stride(0x100);
MC2661(config, m_pci, 10.1376_MHz_XTAL / 2); // INS2651N
m_pci->rxrdy_handler().set(FUNC(wy100_state::rxrdy_w));
+ m_pci->rts_handler().set(m_modem, FUNC(rs232_port_device::write_rts));
+ m_pci->dtr_handler().set(m_modem, FUNC(rs232_port_device::write_dtr));
+ m_pci->txd_handler().set(FUNC(wy100_state::txd_w));
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
screen.set_raw(18.48_MHz_XTAL, 1000, 0, 800, 308, 0, 286);
+ //screen.set_raw(18.48_MHz_XTAL, 1100, 0, 800, 336, 0, 312);
+ screen.set_color(rgb_t::green());
screen.set_screen_update("crtc1", FUNC(i8276_device::screen_update));
for (auto &crtc : m_crtc)
@@ -150,7 +255,16 @@ void wy100_state::wy100(machine_config &config)
crtc->set_character_width(10);
}
m_crtc[0]->set_display_callback(FUNC(wy100_state::draw_character), this);
- //m_crtc[0]->vrtc_wr_callback().set_inputline(m_maincpu, MCS48_INPUT_IRQ);
+ m_crtc[0]->drq_wr_callback().set_inputline(m_maincpu, MCS48_INPUT_IRQ);
+ m_crtc[0]->drq_wr_callback().append(FUNC(wy100_state::brdy_w));
+
+ RS232_PORT(config, m_modem, default_rs232_devices, "loopback");
+ m_modem->dcd_handler().set(m_pci, FUNC(mc2661_device::dcd_w));
+ m_modem->cts_handler().set(m_pci, FUNC(mc2661_device::cts_w));
+ m_modem->rxd_handler().set(m_pci, FUNC(mc2661_device::rx_w));
+
+ RS232_PORT(config, m_printer, default_rs232_devices, nullptr);
+ m_printer->dsr_handler().set(m_pci, FUNC(mc2661_device::dsr_w));
}
@@ -163,4 +277,4 @@ ROM_START(wy100)
ROM_END
-COMP(1981, wy100, 0, 0, wy100, wy100, wy100_state, empty_init, "Wyse Technology", "WY-100", MACHINE_IS_SKELETON)
+COMP(1981, wy100, 0, 0, wy100, wy100, wy100_state, empty_init, "Wyse Technology", "WY-100", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND)
diff --git a/src/mame/machine/wy50kb.cpp b/src/mame/machine/wy50kb.cpp
index ba964aa378f..38f61610127 100644
--- a/src/mame/machine/wy50kb.cpp
+++ b/src/mame/machine/wy50kb.cpp
@@ -7,6 +7,13 @@
select bits (S6-S3), 3 row select bits (S2-S0) and one active-low return
line. The WY-1100 WysePC has a very similar key matrix.
+ It should be noted that the Caps Lock key has no associated LED or physical
+ toggle; the lock state is displayed on the terminal's status line instead.
+
+ The keyboard for the WY-100 uses the same protocol. As well as 105 keys,
+ the matrix of this keyboard includes 3 embedded DIP switches, which can be
+ accessed by the user opening a panel in the top row.
+
1 Ground
2 Ground
3 +5 Volts
@@ -26,14 +33,25 @@
#include "machine/wy50kb.h"
DEFINE_DEVICE_TYPE(WY50_KEYBOARD, wy50_keyboard_device, "wy50kb", "WY-50 Keyboard")
+DEFINE_DEVICE_TYPE(WY100_KEYBOARD, wy100_keyboard_device, "wy100kb", "WY-100 Keyboard")
-wy50_keyboard_device::wy50_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
- : device_t(mconfig, WY50_KEYBOARD, tag, owner, clock)
+wyse_parallel_keyboard_device::wyse_parallel_keyboard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner)
+ : device_t(mconfig, type, tag, owner, 0U)
, m_key_matrix(*this, "COL%u", 0U)
, m_address(0)
{
}
+wy50_keyboard_device::wy50_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+ : wyse_parallel_keyboard_device(mconfig, WY50_KEYBOARD, tag, owner)
+{
+}
+
+wy100_keyboard_device::wy100_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+ : wyse_parallel_keyboard_device(mconfig, WY100_KEYBOARD, tag, owner)
+{
+}
+
static INPUT_PORTS_START(wy50kb)
PORT_START("COL0")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('u') PORT_CHAR('U') PORT_CODE(KEYCODE_U)
@@ -79,7 +97,7 @@ static INPUT_PORTS_START(wy50kb)
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(F5)) PORT_CODE(KEYCODE_F5)
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(F16)) PORT_CODE(KEYCODE_F16)
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(F12)) PORT_CODE(KEYCODE_F12)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(F3)) PORT_CODE(KEYCODE_F4)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(F4)) PORT_CODE(KEYCODE_F4)
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(F9)) PORT_CODE(KEYCODE_F9)
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(F3)) PORT_CODE(KEYCODE_F3)
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(F7)) PORT_CODE(KEYCODE_F7)
@@ -171,17 +189,239 @@ ioport_constructor wy50_keyboard_device::device_input_ports() const
return INPUT_PORTS_NAME(wy50kb);
}
-void wy50_keyboard_device::device_start()
+static INPUT_PORTS_START(wy100kb)
+ PORT_START("COL0")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('u') PORT_CHAR('U') PORT_CODE(KEYCODE_U)
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(UP)) PORT_CODE(KEYCODE_UP) // 93
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(HOME)) PORT_CODE(KEYCODE_HOME) // 1E unshifted, FB shifted
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('8') PORT_CHAR('*') PORT_CODE(KEYCODE_8)
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Set Tab") // B1 unshifted, B2 shifted
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(DOWN)) PORT_CODE(KEYCODE_DOWN) // 0A
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(',') PORT_CHAR('<') PORT_CODE(KEYCODE_COMMA)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('h') PORT_CHAR('H') PORT_CODE(KEYCODE_H)
+
+ PORT_START("COL1")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('y') PORT_CHAR('Y') PORT_CODE(KEYCODE_Y)
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Scrl " UTF8_UP) PORT_CHAR(UCHAR_MAMEKEY(PGUP)) PORT_CODE(KEYCODE_PGUP) // F6
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(RIGHT)) PORT_CODE(KEYCODE_RIGHT) // 0C
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('7') PORT_CHAR('&') PORT_CODE(KEYCODE_7)
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Page") // E8 shifted, CB unshifted
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Scrl " UTF8_DOWN) PORT_CHAR(UCHAR_MAMEKEY(PGDN)) PORT_CODE(KEYCODE_PGDN) // F7
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('m') PORT_CHAR('M') PORT_CODE(KEYCODE_M)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('g') PORT_CHAR('G') PORT_CODE(KEYCODE_G)
+
+ PORT_START("COL2")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('t') PORT_CHAR('T') PORT_CODE(KEYCODE_T)
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(4_PAD)) PORT_CODE(KEYCODE_4_PAD)
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(1_PAD)) PORT_CODE(KEYCODE_1_PAD)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('6') PORT_CHAR('^') PORT_CODE(KEYCODE_6)
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(7_PAD)) PORT_CODE(KEYCODE_7_PAD)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(0_PAD)) PORT_CODE(KEYCODE_0_PAD)
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('n') PORT_CHAR('N') PORT_CODE(KEYCODE_N)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('f') PORT_CHAR('F') PORT_CODE(KEYCODE_F)
+
+ PORT_START("COL3")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(0x09) PORT_CODE(KEYCODE_TAB) // 09 unshifted, C9 shifted
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Space Bar") PORT_CHAR(' ') PORT_CODE(KEYCODE_SPACE)
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Back Space") PORT_CHAR(0x08) PORT_CODE(KEYCODE_BACKSPACE) // 08
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('1') PORT_CHAR('!') PORT_CODE(KEYCODE_1)
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Page Erase") PORT_CODE(KEYCODE_F16) // D9 unshifted, F9 shifted
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Send Page") PORT_CODE(KEYCODE_F1) // B5 unshifted, B7 shifted
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('z') PORT_CHAR('Z') PORT_CODE(KEYCODE_Z)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Esc") PORT_CHAR(0x1b) PORT_CODE(KEYCODE_LALT) // 1B; to left of Caps Lock
+
+ PORT_START("COL4")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(F1)) PORT_CODE(KEYCODE_F5) // 80 unshifted, 88 shifted
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(F6)) PORT_CODE(KEYCODE_F10) // 85 unshifted, 8B shifted
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(F8)) PORT_CODE(KEYCODE_F12) // 87 unshifted, 8F shifted
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Print") PORT_CODE(KEYCODE_F4) // C0 unshifted, D0 shifted
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(F5)) PORT_CODE(KEYCODE_F9) // 84 unshifted, 8C shifted
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Send Msg") PORT_CODE(KEYCODE_F3) // D3 unshifted, F3 shifted
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(F3)) PORT_CODE(KEYCODE_F7) // 82 unshifted, 8A shifted
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(F2)) PORT_CODE(KEYCODE_F6) // 81 unshifted, 89 shifted
+
+ PORT_START("COL5")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('r') PORT_CHAR('R') PORT_CODE(KEYCODE_R)
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(DEL_PAD)) PORT_CODE(KEYCODE_DEL_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('5') PORT_CHAR('%') PORT_CODE(KEYCODE_5)
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(6_PAD)) PORT_CODE(KEYCODE_6_PAD)
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(2_PAD)) PORT_CODE(KEYCODE_2_PAD)
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('b') PORT_CHAR('B') PORT_CODE(KEYCODE_B)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('l') PORT_CHAR('L') PORT_CODE(KEYCODE_L)
+
+ PORT_START("COL6")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('e') PORT_CHAR('E') PORT_CODE(KEYCODE_E)
+ 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_CHAR('4') PORT_CHAR('$') PORT_CODE(KEYCODE_4)
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Reset") // 91 unshifted, C2 shifted
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(ENTER_PAD)) PORT_CODE(KEYCODE_ENTER_PAD) // 95 unshifted, 94 shifted
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('v') PORT_CHAR('V') PORT_CODE(KEYCODE_V)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('d') PORT_CHAR('D') PORT_CODE(KEYCODE_D)
+
+ PORT_START("COL7")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('q') PORT_CHAR('Q') PORT_CODE(KEYCODE_Q)
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Ctrl") PORT_CHAR(UCHAR_MAMEKEY(LCONTROL)) PORT_CODE(KEYCODE_LCONTROL)
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK)) PORT_CODE(KEYCODE_CAPSLOCK) // 92
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('2') PORT_CHAR('@') PORT_CODE(KEYCODE_2)
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Break") PORT_CODE(KEYCODE_ESC) // 96
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Send Line") PORT_CODE(KEYCODE_F2) // B4 unshifted, B6 shifted
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('x') PORT_CHAR('X') PORT_CODE(KEYCODE_X)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('a') PORT_CHAR('A') PORT_CODE(KEYCODE_A)
+
+ PORT_START("COL8")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('p') PORT_CHAR('P') PORT_CODE(KEYCODE_P)
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Return") PORT_CHAR(0x0d) PORT_CODE(KEYCODE_ENTER) // 9E
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('[') PORT_CHAR('{') PORT_CODE(KEYCODE_OPENBRACE)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('-') PORT_CHAR('_') PORT_CODE(KEYCODE_MINUS)
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('`') PORT_CHAR('~') PORT_CODE(KEYCODE_BACKSLASH) // between = and Back Space
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(']') PORT_CHAR('}') PORT_CODE(KEYCODE_CLOSEBRACE)
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('\'') PORT_CHAR('"') PORT_CODE(KEYCODE_QUOTE)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(';') PORT_CHAR(':') PORT_CODE(KEYCODE_COLON)
+
+ PORT_START("COL9")
+ PORT_DIPNAME(0x01, 0x01, "Refresh Rate") PORT_DIPLOCATION("DS3:2")
+ PORT_DIPSETTING(0x00, "50 Hz")
+ PORT_DIPSETTING(0x01, "60 Hz")
+ PORT_DIPNAME(0x02, 0x02, "Screen Background") PORT_DIPLOCATION("DS3:5")
+ PORT_DIPSETTING(0x02, "Black")
+ PORT_DIPSETTING(0x00, "Green")
+ PORT_DIPNAME(0x04, 0x04, "Cursor") PORT_DIPLOCATION("DS3:6")
+ PORT_DIPSETTING(0x00, "Non-blinking")
+ PORT_DIPSETTING(0x04, "Blinking")
+ PORT_DIPNAME(0x08, 0x00, "Memory Pages") PORT_DIPLOCATION("DS3:1")
+ PORT_DIPSETTING(0x08, "1 (1920 characters)")
+ PORT_DIPSETTING(0x00, "2 (3840 characters)")
+ PORT_DIPNAME(0x10, 0x10, DEF_STR(Unknown)) PORT_DIPLOCATION("DS3:3")
+ PORT_DIPSETTING(0x10, DEF_STR(Off))
+ PORT_DIPSETTING(0x00, DEF_STR(On))
+ PORT_DIPNAME(0x20, 0x20, DEF_STR(Unknown)) PORT_DIPLOCATION("DS3:4")
+ PORT_DIPSETTING(0x20, DEF_STR(Off))
+ PORT_DIPSETTING(0x00, DEF_STR(On))
+ PORT_DIPNAME(0x40, 0x40, "Duplex") PORT_DIPLOCATION("DS3:7")
+ PORT_DIPSETTING(0x40, "Full Duplex")
+ PORT_DIPSETTING(0x00, "Half Duplex")
+ PORT_DIPNAME(0x80, 0x80, "Conversation Mode") PORT_DIPLOCATION("DS3:8")
+ PORT_DIPSETTING(0x80, "Conversation Mode")
+ PORT_DIPSETTING(0x00, "Block Mode")
+
+ PORT_START("COL10")
+ PORT_DIPNAME(0x03, 0x03, "Parity") PORT_DIPLOCATION("DS2:2,4")
+ PORT_DIPSETTING(0x01, "Odd")
+ PORT_DIPSETTING(0x00, "Even")
+ PORT_DIPSETTING(0x03, "Space")
+ PORT_DIPSETTING(0x02, "Mark")
+ PORT_DIPNAME(0x04, 0x04, "Stop Bits") PORT_DIPLOCATION("DS2:3")
+ PORT_DIPSETTING(0x04, "1")
+ PORT_DIPSETTING(0x00, "2")
+ PORT_DIPNAME(0x08, 0x00, "Data Bits") PORT_DIPLOCATION("DS2:1")
+ PORT_DIPSETTING(0x08, "7")
+ PORT_DIPSETTING(0x00, "8")
+ PORT_DIPNAME(0xf0, 0x70, "Communications Baud Rate") PORT_DIPLOCATION("DS2:5,6,7,8")
+ PORT_DIPSETTING(0x00, "50")
+ PORT_DIPSETTING(0x80, "75")
+ PORT_DIPSETTING(0x40, "110")
+ PORT_DIPSETTING(0xc0, "134.5")
+ PORT_DIPSETTING(0x20, "150")
+ PORT_DIPSETTING(0xa0, "300")
+ PORT_DIPSETTING(0x60, "600")
+ PORT_DIPSETTING(0xe0, "1200")
+ PORT_DIPSETTING(0x10, "1800")
+ PORT_DIPSETTING(0x90, "2000")
+ PORT_DIPSETTING(0x50, "2400")
+ PORT_DIPSETTING(0xd0, "3600")
+ PORT_DIPSETTING(0x30, "4800")
+ PORT_DIPSETTING(0xb0, "7200")
+ PORT_DIPSETTING(0x70, "9600")
+
+ PORT_START("COL11")
+ PORT_DIPNAME(0x01, 0x01, "EOL & EOT Sequences") PORT_DIPLOCATION("DS1:2")
+ PORT_DIPSETTING(0x01, "US, CR")
+ PORT_DIPSETTING(0x00, "CR/LF/NULL, ETX")
+ PORT_DIPNAME(0x02, 0x02, "Enter & Return Keys") PORT_DIPLOCATION("DS1:4")
+ PORT_DIPSETTING(0x02, "TAB, CR/LF")
+ PORT_DIPSETTING(0x00, "CR Only")
+ PORT_DIPNAME(0x04, 0x04, "Auto New Line") PORT_DIPLOCATION("DS1:3")
+ PORT_DIPSETTING(0x00, DEF_STR(Off))
+ PORT_DIPSETTING(0x04, DEF_STR(On))
+ PORT_DIPNAME(0x08, 0x08, "Editing Keys") PORT_DIPLOCATION("DS1:1")
+ PORT_DIPSETTING(0x08, "Local")
+ PORT_DIPSETTING(0x00, "Duplex")
+ PORT_DIPNAME(0xf0, 0x70, "Printer Baud Rate") PORT_DIPLOCATION("DS1:5,6,7,8")
+ PORT_DIPSETTING(0x00, "50")
+ PORT_DIPSETTING(0x80, "75")
+ PORT_DIPSETTING(0x40, "110")
+ PORT_DIPSETTING(0xc0, "134.5")
+ PORT_DIPSETTING(0x20, "150")
+ PORT_DIPSETTING(0xa0, "300")
+ PORT_DIPSETTING(0x60, "600")
+ PORT_DIPSETTING(0xe0, "1200")
+ PORT_DIPSETTING(0x10, "1800")
+ PORT_DIPSETTING(0x90, "2000")
+ PORT_DIPSETTING(0x50, "2400")
+ PORT_DIPSETTING(0xd0, "3600")
+ PORT_DIPSETTING(0x30, "4800")
+ PORT_DIPSETTING(0xb0, "7200")
+ PORT_DIPSETTING(0x70, "9600")
+
+ PORT_START("COL12")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('w') PORT_CHAR('W') PORT_CODE(KEYCODE_W)
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(F4)) PORT_CODE(KEYCODE_F8) // 83 unshifted, 8B shifted
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Shift") PORT_CHAR(UCHAR_SHIFT_1) PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('3') PORT_CHAR('#') PORT_CODE(KEYCODE_3)
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Line Feed") PORT_CHAR(0x0a) // 0A
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("New Line") PORT_CODE(KEYCODE_RCONTROL) // 1F; to right of Right Shift
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('c') PORT_CHAR('C') PORT_CODE(KEYCODE_C)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('s') PORT_CHAR('S') PORT_CODE(KEYCODE_S)
+
+ PORT_START("COL13")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Line Insert") PORT_CODE(KEYCODE_F13) // C5
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(9_PAD)) PORT_CODE(KEYCODE_9_PAD)
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(3_PAD)) PORT_CODE(KEYCODE_3_PAD)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('=') PORT_CHAR('+') PORT_CODE(KEYCODE_EQUALS)
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Line Delete") PORT_CODE(KEYCODE_F14) // D2
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(8_PAD)) PORT_CODE(KEYCODE_8_PAD)
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Line Erase") PORT_CODE(KEYCODE_F15) // D4 unshifted, F4 shifted
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(F7)) PORT_CODE(KEYCODE_F11) // 86 unshifted, 8E shifted
+
+ PORT_START("COL14")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('i') PORT_CHAR('I') PORT_CODE(KEYCODE_I)
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Ins Char Del Char") PORT_CHAR(UCHAR_MAMEKEY(INSERT)) PORT_CHAR(UCHAR_MAMEKEY(DEL)) PORT_CODE(KEYCODE_DEL) // D1 unshifted, D5 shifted
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(LEFT)) PORT_CODE(KEYCODE_LEFT) // 08
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('9') PORT_CHAR('(') PORT_CODE(KEYCODE_9)
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Scrn Edit") // CE unshifted, CF shifted
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Ins/Rep") PORT_CODE(KEYCODE_INSERT) // F2 unshifted, F1 shifted
+ 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('j') PORT_CHAR('J') PORT_CODE(KEYCODE_J)
+
+ PORT_START("COL15")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('o') PORT_CHAR('O') PORT_CODE(KEYCODE_O)
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Funct") PORT_CODE(KEYCODE_RCONTROL) // 9F; to right of New Line
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("EOM SOM") // B9 unshifted, B8 shifted
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('0') PORT_CHAR(')') PORT_CODE(KEYCODE_0)
+ PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Rub Out") // 7F; to right of Line Feed
+ PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('\\') PORT_CHAR('|') PORT_CODE(KEYCODE_BACKSLASH2) // to right of Return
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('/') PORT_CHAR('?') PORT_CODE(KEYCODE_SLASH)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('k') PORT_CHAR('K') PORT_CODE(KEYCODE_K)
+INPUT_PORTS_END
+
+ioport_constructor wy100_keyboard_device::device_input_ports() const
+{
+ return INPUT_PORTS_NAME(wy100kb);
+}
+
+void wyse_parallel_keyboard_device::device_start()
{
save_item(NAME(m_address));
}
-void wy50_keyboard_device::scan_w(u8 address)
+void wyse_parallel_keyboard_device::scan_w(u8 address)
{
m_address = address;
}
-READ_LINE_MEMBER(wy50_keyboard_device::sense_r)
+READ_LINE_MEMBER(wyse_parallel_keyboard_device::sense_r)
{
return BIT(m_key_matrix[(m_address >> 3) & 15].read_safe(0xff), m_address & 7);
}
diff --git a/src/mame/machine/wy50kb.h b/src/mame/machine/wy50kb.h
index 8b9afbe0490..399596432f8 100644
--- a/src/mame/machine/wy50kb.h
+++ b/src/mame/machine/wy50kb.h
@@ -6,16 +6,15 @@
#pragma once
-class wy50_keyboard_device : public device_t
+class wyse_parallel_keyboard_device : public device_t
{
public:
- wy50_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
-
void scan_w(u8 address);
DECLARE_READ_LINE_MEMBER(sense_r);
protected:
- virtual ioport_constructor device_input_ports() const override;
+ wyse_parallel_keyboard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner);
+
virtual void device_start() override;
private:
@@ -24,6 +23,25 @@ private:
u8 m_address;
};
+class wy50_keyboard_device : public wyse_parallel_keyboard_device
+{
+public:
+ wy50_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
+
+protected:
+ virtual ioport_constructor device_input_ports() const override;
+};
+
+class wy100_keyboard_device : public wyse_parallel_keyboard_device
+{
+public:
+ wy100_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
+
+protected:
+ virtual ioport_constructor device_input_ports() const override;
+};
+
DECLARE_DEVICE_TYPE(WY50_KEYBOARD, wy50_keyboard_device)
+DECLARE_DEVICE_TYPE(WY100_KEYBOARD, wy100_keyboard_device)
#endif // MAME_MACHINE_WY50KB_H