diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index 6c01dc9d4c0..a72f7e1e4f4 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -3569,6 +3569,8 @@ files {
 	MAME_DIR .. "src/mame/drivers/cd2650.cpp",
 	MAME_DIR .. "src/mame/drivers/cdc721.cpp",
 	MAME_DIR .. "src/mame/drivers/cit101.cpp",
+	MAME_DIR .. "src/mame/machine/cit101_kbd.cpp",
+	MAME_DIR .. "src/mame/machine/cit101_kbd.h",
 	MAME_DIR .. "src/mame/drivers/cit220.cpp",
 	MAME_DIR .. "src/mame/drivers/codata.cpp",
 	MAME_DIR .. "src/mame/drivers/controlid.cpp",
diff --git a/src/devices/machine/keyboard.h b/src/devices/machine/keyboard.h
index 661f8319ecf..247560b3dbb 100644
--- a/src/devices/machine/keyboard.h
+++ b/src/devices/machine/keyboard.h
@@ -61,6 +61,7 @@ protected:
 	virtual void key_repeat(u8 row, u8 column);
 	virtual void key_break(u8 row, u8 column);
 	virtual void will_scan_row(u8 row);
+	virtual void scan_complete();
 
 	bool are_all_keys_up();
 
diff --git a/src/devices/machine/keyboard.ipp b/src/devices/machine/keyboard.ipp
index b72ed00de15..12221dde05c 100644
--- a/src/devices/machine/keyboard.ipp
+++ b/src/devices/machine/keyboard.ipp
@@ -129,6 +129,8 @@ TIMER_CALLBACK_MEMBER(device_matrix_keyboard_interface<ROW_COUNT>::scan_row)
 	}
 
 	m_next_row = (m_next_row + 1) % ARRAY_LENGTH(m_key_rows);
+	if (m_next_row == 0)
+		scan_complete();
 }
 
 
@@ -160,6 +162,12 @@ void device_matrix_keyboard_interface<ROW_COUNT>::will_scan_row(uint8_t row)
 }
 
 
+template <uint8_t ROW_COUNT>
+void device_matrix_keyboard_interface<ROW_COUNT>::scan_complete()
+{
+}
+
+
 template <uint8_t ROW_COUNT>
 bool device_matrix_keyboard_interface<ROW_COUNT>::are_all_keys_up()
 {
diff --git a/src/mame/drivers/cit101.cpp b/src/mame/drivers/cit101.cpp
index b926b8d944e..877d94e0907 100644
--- a/src/mame/drivers/cit101.cpp
+++ b/src/mame/drivers/cit101.cpp
@@ -2,7 +2,7 @@
 // copyright-holders:AJR
 /***********************************************************************************************************************************
 
-Skeleton driver for first-generation C. Itoh video terminals.
+Preliminary driver for first-generation C. Itoh video terminals.
 
 CIT-101 (released December 1980)
     C. Itoh's first terminal, based on DEC VT100. ANSI X3.64 and V52 compatible.
@@ -41,6 +41,14 @@ CIG-267
     Plug-in color graphics card for CIT-161.
     Compatible with Tektronix 4027A.
 
+Special SET-UP control codes:
+* CTRL+S: Save settings to NVR
+* CTRL+R: Recall settings from NVR
+* CTRL+D: Restore default NVR settings
+* CTRL+A: Set answerback message
+* CTRL+X: Enable/disable Bidirectional Auxiliary I/O Channel and SET-UP D Mode
+          (undocumented; SET-UP B Mode only)
+
 ************************************************************************************************************************************/
 
 #include "emu.h"
@@ -53,6 +61,8 @@ CIG-267
 #include "machine/i8255.h"
 #include "screen.h"
 
+#include "machine/cit101_kbd.h"
+
 
 class cit101_state : public driver_device
 {
@@ -78,6 +88,9 @@ private:
 	DECLARE_READ8_MEMBER(e0_latch_r);
 	DECLARE_WRITE8_MEMBER(e0_latch_w);
 
+	DECLARE_WRITE8_MEMBER(screen_control_w);
+	DECLARE_WRITE8_MEMBER(brightness_w);
+
 	DECLARE_WRITE8_MEMBER(nvr_address_w);
 	DECLARE_READ8_MEMBER(nvr_data_r);
 	DECLARE_WRITE8_MEMBER(nvr_data_w);
@@ -99,19 +112,23 @@ private:
 
 void cit101_state::machine_start()
 {
+	subdevice<i8251_device>("comuart")->write_cts(0);
+	subdevice<i8251_device>("kbduart")->write_cts(0);
+
 	save_item(NAME(m_e0_latch));
 }
 
 u32 cit101_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
 {
-	// TODO: 9 for 132-column mode
-	int char_width = 10;
+	const int char_width = BIT(m_extraram[0], 1) ? 10 : 9;
+	const u16 ptrbase = m_mainram[0];
 
 	for (int y = cliprect.top(); y <= cliprect.bottom(); y++)
 	{
-		int row = (y / 10) + 1;
-		int line = y % 10;
-		u16 rowaddr = m_mainram[row * 2] | (m_extraram[row * 2] & 0x3f) << 8;
+		const int row = y / 10;
+		u16 rowaddr = m_mainram[row * 2 + ptrbase + 1] | (m_extraram[row * 2 + ptrbase + 1] & 0x3f) << 8;
+		const u16 rowattr = m_mainram[row * 2 + ptrbase] | m_extraram[row * 2 + ptrbase] << 8;
+		const int line = ((y % 10) / (BIT(rowattr, 8) ? 2 : 1) + (rowattr & 0x000f)) & 0xf;
 
 		int c = 0;
 		u8 attr = m_extraram[rowaddr];
@@ -125,18 +142,22 @@ u32 cit101_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, con
 			if (x >= cliprect.left() && x <= cliprect.right())
 				bitmap.pix32(y, x) = BIT(char_data, 7) ? rgb_t::white() : rgb_t::black();
 
-			if (++c < char_width)
-				char_data = (char_data << 1) | (char_data & 1);
-			else
+			c++;
+			if (!BIT(rowattr, 9) || !BIT(c, 0))
 			{
-				c = 0;
-				rowaddr++;
-				attr = m_extraram[rowaddr];
-				char_data = m_chargen[(m_mainram[rowaddr] << 4) | line];
-				if (line == 9 && BIT(attr, 0))
-					char_data ^= 0xff;
-				if (BIT(attr, 1))
-					char_data ^= 0xff;
+				if (c < (BIT(rowattr, 9) ? char_width << 1 : char_width))
+					char_data = (char_data << 1) | (char_data & 1);
+				else
+				{
+					c = 0;
+					rowaddr++;
+					attr = m_extraram[rowaddr];
+					char_data = m_chargen[(m_mainram[rowaddr] << 4) | line];
+					if (line == 9 && BIT(attr, 0))
+						char_data ^= 0xff;
+					if (BIT(attr, 1))
+						char_data ^= 0xff;
+				}
 			}
 		}
 	}
@@ -168,6 +189,33 @@ WRITE8_MEMBER(cit101_state::e0_latch_w)
 	m_e0_latch = data;
 }
 
+WRITE8_MEMBER(cit101_state::screen_control_w)
+{
+	if ((m_extraram[0] & 0x06) != (data & 0x06))
+	{
+		const int height = BIT(data, 2) ? 312 : 260;
+		const attoseconds_t frame_period = HZ_TO_ATTOSECONDS(BIT(data, 2) ? 50 : 60);
+		if (BIT(data, 1))
+		{
+			const rectangle visarea(0, 799, 0, 239);
+			m_screen->set_unscaled_clock(14.976_MHz_XTAL);
+			m_screen->configure(960, height, visarea, frame_period);
+		}
+		else
+		{
+			const rectangle visarea(0, 1187, 0, 239);
+			m_screen->set_unscaled_clock(22.464_MHz_XTAL);
+			m_screen->configure(1440, height, visarea, frame_period);
+		}
+	}
+
+	m_extraram[0] = data;
+}
+
+WRITE8_MEMBER(cit101_state::brightness_w)
+{
+}
+
 WRITE8_MEMBER(cit101_state::nvr_address_w)
 {
 	m_nvr->set_address(data & 0x3f);
@@ -194,6 +242,7 @@ void cit101_state::mem_map(address_map &map)
 	map(0x0000, 0x3fff).rom().region("maincpu", 0);
 	map(0x4000, 0x7fff).ram().share("mainram");
 	map(0x8000, 0xbfff).ram().share("extraram"); // only 4 bits wide?
+	map(0x8000, 0x8000).w(this, FUNC(cit101_state::screen_control_w));
 	map(0xc000, 0xdfff).rw(this, FUNC(cit101_state::c000_ram_r), FUNC(cit101_state::c000_ram_w));
 	map(0xfc00, 0xfc00).rw("auxuart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w));
 	map(0xfc01, 0xfc01).rw("auxuart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w));
@@ -215,7 +264,7 @@ void cit101_state::io_map(address_map &map)
 	map(0x40, 0x40).rw("kbduart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w));
 	map(0x41, 0x41).rw("kbduart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w));
 	map(0x60, 0x63).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write));
-	map(0xa0, 0xa0).nopw(); // ?
+	map(0xa0, 0xa0).w(this, FUNC(cit101_state::brightness_w));
 	map(0xe0, 0xe0).rw(this, FUNC(cit101_state::e0_latch_r), FUNC(cit101_state::e0_latch_w));
 }
 
@@ -230,8 +279,8 @@ MACHINE_CONFIG_START(cit101_state::cit101)
 	MCFG_CPU_IO_MAP(io_map)
 
 	MCFG_SCREEN_ADD("screen", RASTER)
-	MCFG_SCREEN_RAW_PARAMS(14.976_MHz_XTAL, 960, 0, 800, 260, 0, 240)
-	//MCFG_SCREEN_RAW_PARAMS(22.464_MHz_XTAL, 1440, 0, 1188, 260, 0, 240)
+	//MCFG_SCREEN_RAW_PARAMS(14.976_MHz_XTAL, 960, 0, 800, 260, 0, 240)
+	MCFG_SCREEN_RAW_PARAMS(22.464_MHz_XTAL, 1440, 0, 1188, 260, 0, 240)
 	MCFG_SCREEN_UPDATE_DRIVER(cit101_state, screen_update)
 	MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", I8085_RST75_LINE))
 
@@ -245,26 +294,28 @@ MACHINE_CONFIG_START(cit101_state::cit101)
 	MCFG_RS232_PORT_ADD("comm", default_rs232_devices, nullptr)
 	MCFG_RS232_RXD_HANDLER(DEVWRITELINE("comuart", i8251_device, write_rxd))
 	MCFG_RS232_DSR_HANDLER(DEVWRITELINE("comuart", i8251_device, write_dsr))
-	MCFG_RS232_CTS_HANDLER(DEVWRITELINE("comuart", i8251_device, write_cts))
+	// CTS can be disabled in SET-UP Mode C
+	// DSR, CD, SI, RI are examined only during the modem test, not "always ignored" as the User's Manual claims
 
 	MCFG_DEVICE_ADD("auxuart", I8251, 6.144_MHz_XTAL / 2)
 	MCFG_I8251_TXD_HANDLER(DEVWRITELINE("printer", rs232_port_device, write_txd))
-	MCFG_I8251_DTR_HANDLER(DEVWRITELINE("printer", rs232_port_device, write_dtr))
-	MCFG_I8251_RTS_HANDLER(DEVWRITELINE("printer", rs232_port_device, write_rts))
 	MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("uartint", input_merger_device, in_w<1>))
 	MCFG_I8251_TXRDY_HANDLER(DEVWRITELINE("uartint", input_merger_device, in_w<3>))
 
 	MCFG_RS232_PORT_ADD("printer", default_rs232_devices, nullptr)
 	MCFG_RS232_RXD_HANDLER(DEVWRITELINE("auxuart", i8251_device, write_rxd))
-	MCFG_RS232_DSR_HANDLER(DEVWRITELINE("auxuart", i8251_device, write_dsr))
 	MCFG_RS232_CTS_HANDLER(DEVWRITELINE("auxuart", i8251_device, write_cts))
 
 	MCFG_INPUT_MERGER_ANY_HIGH("uartint")
 	MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("maincpu", I8085_RST55_LINE))
 
 	MCFG_DEVICE_ADD("kbduart", I8251, 6.144_MHz_XTAL / 2)
+	MCFG_I8251_TXD_HANDLER(DEVWRITELINE("keyboard", cit101_hle_keyboard_device, write_rxd))
 	MCFG_I8251_RXRDY_HANDLER(INPUTLINE("maincpu", I8085_RST65_LINE))
 
+	MCFG_DEVICE_ADD("keyboard", CIT101_HLE_KEYBOARD, 0)
+	MCFG_CIT101_HLE_KEYBOARD_TXD_CALLBACK(DEVWRITELINE("kbduart", i8251_device, write_rxd))
+
 	MCFG_DEVICE_ADD("pit0", PIT8253, 0)
 	MCFG_PIT8253_CLK0(6.144_MHz_XTAL / 4)
 	MCFG_PIT8253_CLK1(6.144_MHz_XTAL / 4)
@@ -319,4 +370,4 @@ ROM_START( cit101 )
 	ROM_LOAD( "5g_=7f00=.bin", 0x160, 0x020, NO_DUMP ) // position labeled TBP18S030
 ROM_END
 
-COMP( 1980, cit101, 0, 0, cit101, cit101, cit101_state, 0, "C. Itoh Electronics", "CIT-101", MACHINE_IS_SKELETON )
+COMP( 1980, cit101, 0, 0, cit101, cit101, cit101_state, 0, "C. Itoh Electronics", "CIT-101", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
diff --git a/src/mame/machine/cit101_kbd.cpp b/src/mame/machine/cit101_kbd.cpp
new file mode 100644
index 00000000000..f628cdf877d
--- /dev/null
+++ b/src/mame/machine/cit101_kbd.cpp
@@ -0,0 +1,298 @@
+// license:BSD-3-Clause
+// copyright-holders:AJR
+/**********************************************************************
+
+    CIT-101 85-key keyboard
+
+    This serial keyboard appears to transmit and receive signals over
+    a single bidirectional wire at 4800 bits per second. Unlike the
+    VT100 keyboard whose layout it mimics (indicator LEDs included),
+    the CIT-101 keyboard transmits standard ASCII codes for most keys,
+    and the complexity of decoding these strongly suggests that this
+    must be done by some sort of MCU. There are also a few special
+    characters with the 8th bit set, including the numeric keypad,
+    the cursor keys, the Return key and the all-important no-key code.
+
+    TODO: identify and dump MCU for low-level emulation
+    TODO: indicator LEDs
+    TODO: make repeat key do something
+    TODO: CTRL+G doesn't seem to generate a beep
+
+**********************************************************************/
+
+#include "emu.h"
+#include "cit101_kbd.h"
+#include "speaker.h"
+
+#include "machine/keyboard.ipp"
+
+//**************************************************************************
+//  HLE KEYBOARD DEVICE
+//**************************************************************************
+
+DEFINE_DEVICE_TYPE(CIT101_HLE_KEYBOARD, cit101_hle_keyboard_device, "cit101_hle_kbd", "CIT-101 HLE Keyboard")
+
+cit101_hle_keyboard_device::cit101_hle_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: device_t(mconfig, CIT101_HLE_KEYBOARD, tag, owner, clock)
+	, device_matrix_keyboard_interface(mconfig, *this, "KEYS0", "KEYS1", "KEYS2", "KEYS3")
+	, device_buffered_serial_interface(mconfig, *this)
+	, m_modifiers(*this, "MODIFIERS")
+	, m_beeper(*this, "beeper")
+	, m_txd_callback(*this)
+	, m_command{0, 1}
+{
+}
+
+INPUT_PORTS_START(cit101_hle_keyboard)
+	PORT_START("MODIFIERS")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_SHIFT_2) PORT_CODE(KEYCODE_LCONTROL)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_SHIFT_1) PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT)
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_TOGGLE PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK)) PORT_CODE(KEYCODE_CAPSLOCK)
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Repeat") PORT_CODE(KEYCODE_RCONTROL)
+
+	PORT_START("KEYS0")
+	PORT_BIT(0x00000003, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x00000004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(']') PORT_CHAR('}') PORT_CODE(KEYCODE_CLOSEBRACE)
+	PORT_BIT(0x00000008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('\\') PORT_CHAR('|') PORT_CODE(KEYCODE_BACKSLASH)
+	PORT_BIT(0x00000010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('[') PORT_CHAR('{') PORT_CODE(KEYCODE_OPENBRACE)
+	PORT_BIT(0x00000020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Z") PORT_CHAR('z') PORT_CHAR('Z') PORT_CHAR(0x1a) PORT_CODE(KEYCODE_Z)
+	PORT_BIT(0x00000040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Y") PORT_CHAR('y') PORT_CHAR('Y') PORT_CHAR(0x19) PORT_CODE(KEYCODE_Y)
+	PORT_BIT(0x00000080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("X") PORT_CHAR('x') PORT_CHAR('X') PORT_CHAR(0x18) PORT_CODE(KEYCODE_X)
+	PORT_BIT(0x00000100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("W") PORT_CHAR('W') PORT_CHAR('W') PORT_CHAR(0x17) PORT_CODE(KEYCODE_W)
+	PORT_BIT(0x00000200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("V") PORT_CHAR('v') PORT_CHAR('V') PORT_CHAR(0x16) PORT_CODE(KEYCODE_V)
+	PORT_BIT(0x00000400, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("U") PORT_CHAR('u') PORT_CHAR('U') PORT_CHAR(0x15) PORT_CODE(KEYCODE_U)
+	PORT_BIT(0x00000800, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("T") PORT_CHAR('t') PORT_CHAR('T') PORT_CHAR(0x14) PORT_CODE(KEYCODE_T)
+	PORT_BIT(0x00001000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("S") PORT_CHAR('s') PORT_CHAR('S') PORT_CHAR(0x13) PORT_CODE(KEYCODE_S)
+	PORT_BIT(0x00002000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("R") PORT_CHAR('r') PORT_CHAR('R') PORT_CHAR(0x12) PORT_CODE(KEYCODE_R)
+	PORT_BIT(0x00004000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Q") PORT_CHAR('q') PORT_CHAR('Q') PORT_CHAR(0x11) PORT_CODE(KEYCODE_Q)
+	PORT_BIT(0x00008000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("P") PORT_CHAR('p') PORT_CHAR('P') PORT_CHAR(0x10) PORT_CODE(KEYCODE_P)
+	PORT_BIT(0x00010000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("O") PORT_CHAR('o') PORT_CHAR('O') PORT_CHAR(0x0f) PORT_CODE(KEYCODE_O)
+	PORT_BIT(0x00020000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("N") PORT_CHAR('n') PORT_CHAR('N') PORT_CHAR(0x0e) PORT_CODE(KEYCODE_N)
+	PORT_BIT(0x00040000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("M") PORT_CHAR('m') PORT_CHAR('M') PORT_CODE(KEYCODE_M)
+	PORT_BIT(0x00080000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("L") PORT_CHAR('l') PORT_CHAR('L') PORT_CHAR(0x0c) PORT_CODE(KEYCODE_L)
+	PORT_BIT(0x00100000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("K") PORT_CHAR('k') PORT_CHAR('K') PORT_CHAR(0x0b) PORT_CODE(KEYCODE_K)
+	PORT_BIT(0x00200000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("J") PORT_CHAR('j') PORT_CHAR('J') PORT_CODE(KEYCODE_J)
+	PORT_BIT(0x00400000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("I") PORT_CHAR('i') PORT_CHAR('I') PORT_CODE(KEYCODE_I)
+	PORT_BIT(0x00800000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("H") PORT_CHAR('h') PORT_CHAR('H') PORT_CODE(KEYCODE_H)
+	PORT_BIT(0x01000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("G (Bell)") PORT_CHAR('g') PORT_CHAR('G') PORT_CHAR(0x07) PORT_CODE(KEYCODE_G)
+	PORT_BIT(0x02000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("F") PORT_CHAR('f') PORT_CHAR('F') PORT_CHAR(0x06) PORT_CODE(KEYCODE_F)
+	PORT_BIT(0x04000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("E") PORT_CHAR('e') PORT_CHAR('E') PORT_CHAR(0x05) PORT_CODE(KEYCODE_E)
+	PORT_BIT(0x08000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("D") PORT_CHAR('d') PORT_CHAR('D') PORT_CHAR(0x04) PORT_CODE(KEYCODE_D)
+	PORT_BIT(0x10000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("C") PORT_CHAR('c') PORT_CHAR('C') PORT_CHAR(0x03) PORT_CODE(KEYCODE_C)
+	PORT_BIT(0x20000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("B") PORT_CHAR('b') PORT_CHAR('B') PORT_CHAR(0x02) PORT_CODE(KEYCODE_B)
+	PORT_BIT(0x40000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("A") PORT_CHAR('a') PORT_CHAR('A') PORT_CHAR(0x01) PORT_CODE(KEYCODE_A)
+	PORT_BIT(0x80000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('`') PORT_CHAR('~') PORT_CODE(KEYCODE_TILDE)
+
+	PORT_START("KEYS1")
+	PORT_BIT(0x00000003, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x00000004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('=') PORT_CHAR('+') PORT_CODE(KEYCODE_EQUALS)
+	PORT_BIT(0x00000008, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x00000010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(';') PORT_CHAR(':') PORT_CODE(KEYCODE_COLON)
+	PORT_BIT(0x00000020, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x00000040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('9') PORT_CHAR('(') PORT_CODE(KEYCODE_9)
+	PORT_BIT(0x00000080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('8') PORT_CHAR('*') PORT_CODE(KEYCODE_8)
+	PORT_BIT(0x00000100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('7') PORT_CHAR('&') PORT_CODE(KEYCODE_7)
+	PORT_BIT(0x00000200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('6') PORT_CHAR('^') PORT_CODE(KEYCODE_6)
+	PORT_BIT(0x00000400, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('5') PORT_CHAR('%') PORT_CODE(KEYCODE_5)
+	PORT_BIT(0x00000800, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('4') PORT_CHAR('$') PORT_CODE(KEYCODE_4)
+	PORT_BIT(0x00001000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("3 # \xc3\xa3") PORT_CHAR('3') PORT_CHAR('#', 0xa3) PORT_CODE(KEYCODE_3)
+	PORT_BIT(0x00002000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('2') PORT_CHAR('@') PORT_CODE(KEYCODE_2)
+	PORT_BIT(0x00004000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('1') PORT_CHAR('!') PORT_CODE(KEYCODE_1)
+	PORT_BIT(0x00008000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('0') PORT_CHAR(')') PORT_CODE(KEYCODE_0)
+	PORT_BIT(0x00010000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('/') PORT_CHAR('?') PORT_CODE(KEYCODE_SLASH)
+	PORT_BIT(0x00020000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('.') PORT_CHAR('>') PORT_CODE(KEYCODE_STOP)
+	PORT_BIT(0x00040000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('-') PORT_CHAR('_') PORT_CODE(KEYCODE_MINUS)
+	PORT_BIT(0x00080000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(',') PORT_CHAR('<') PORT_CODE(KEYCODE_COMMA)
+	PORT_BIT(0x00f00000, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x01000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('\'') PORT_CHAR('"') PORT_CODE(KEYCODE_QUOTE)
+	PORT_BIT(0x7e000000, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x80000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(' ') PORT_CODE(KEYCODE_SPACE)
+
+	PORT_START("KEYS2")
+	PORT_BIT(0x00000001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Delete") PORT_CHAR(0x7f) PORT_CODE(KEYCODE_DEL)
+	PORT_BIT(0x0000000e, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x00000010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(0x1b) PORT_CODE(KEYCODE_ESC)
+	PORT_BIT(0x001fffe0, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x00200000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Line Feed") PORT_CHAR(0x0a) PORT_CODE(KEYCODE_RALT)
+	PORT_BIT(0x00400000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(0x09) PORT_CODE(KEYCODE_TAB)
+	PORT_BIT(0x00800000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Back Space") PORT_CHAR(0x08) PORT_CODE(KEYCODE_BACKSPACE)
+	PORT_BIT(0xff000000, IP_ACTIVE_HIGH, IPT_UNUSED)
+
+	PORT_START("KEYS3")
+	PORT_BIT(0x00000001, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x00000002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Test Key 2")
+	PORT_BIT(0x00000004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Test Key 1")
+	PORT_BIT(0x00000008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("No Scroll") PORT_CHAR(UCHAR_MAMEKEY(SCRLOCK)) PORT_CODE(KEYCODE_LALT)
+	PORT_BIT(0x00000010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Break") PORT_CHAR(UCHAR_MAMEKEY(PAUSE)) PORT_CODE(KEYCODE_END)
+	PORT_BIT(0x00000020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Clr Home") PORT_CHAR(UCHAR_MAMEKEY(HOME)) PORT_CODE(KEYCODE_HOME)
+	PORT_BIT(0x00000040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(9_PAD)) PORT_CODE(KEYCODE_9_PAD)
+	PORT_BIT(0x00000080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(8_PAD)) PORT_CODE(KEYCODE_8_PAD)
+	PORT_BIT(0x00000100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(7_PAD)) PORT_CODE(KEYCODE_7_PAD)
+	PORT_BIT(0x00000200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(6_PAD)) PORT_CODE(KEYCODE_6_PAD)
+	PORT_BIT(0x00000400, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(5_PAD)) PORT_CODE(KEYCODE_5_PAD)
+	PORT_BIT(0x00000800, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(4_PAD)) PORT_CODE(KEYCODE_4_PAD)
+	PORT_BIT(0x00001000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(3_PAD)) PORT_CODE(KEYCODE_3_PAD)
+	PORT_BIT(0x00002000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(2_PAD)) PORT_CODE(KEYCODE_2_PAD)
+	PORT_BIT(0x00004000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(1_PAD)) PORT_CODE(KEYCODE_1_PAD)
+	PORT_BIT(0x00008000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(0_PAD)) PORT_CODE(KEYCODE_0_PAD)
+	PORT_BIT(0x00010000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(ENTER_PAD)) PORT_CODE(KEYCODE_ENTER_PAD)
+	PORT_BIT(0x00020000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(DEL_PAD)) PORT_CODE(KEYCODE_DEL_PAD)
+	PORT_BIT(0x00040000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(MINUS_PAD)) PORT_CODE(KEYCODE_MINUS_PAD)
+	PORT_BIT(0x00080000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Keypad ,") PORT_CODE(KEYCODE_PLUS_PAD)
+	PORT_BIT(0x00100000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("PF4") PORT_CHAR(UCHAR_MAMEKEY(F4)) PORT_CODE(KEYCODE_F4)
+	PORT_BIT(0x00200000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("PF3") PORT_CHAR(UCHAR_MAMEKEY(F3)) PORT_CODE(KEYCODE_F3)
+	PORT_BIT(0x00400000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("PF2") PORT_CHAR(UCHAR_MAMEKEY(F2)) PORT_CODE(KEYCODE_F2)
+	PORT_BIT(0x00800000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("PF1") PORT_CHAR(UCHAR_MAMEKEY(F1)) PORT_CODE(KEYCODE_F1)
+	PORT_BIT(0x01000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(LEFT)) PORT_CODE(KEYCODE_LEFT)
+	PORT_BIT(0x02000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(RIGHT)) PORT_CODE(KEYCODE_RIGHT)
+	PORT_BIT(0x04000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(DOWN)) PORT_CODE(KEYCODE_DOWN)
+	PORT_BIT(0x08000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(UP)) PORT_CODE(KEYCODE_UP)
+	PORT_BIT(0x10000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Return") PORT_CHAR(0x0d) PORT_CODE(KEYCODE_ENTER)
+	PORT_BIT(0x20000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Set-Up") PORT_CHAR(UCHAR_MAMEKEY(F5)) PORT_CODE(KEYCODE_F5)
+	PORT_BIT(0x40000000, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x80000000, IP_ACTIVE_HIGH, IPT_UNUSED) // actually used for special stop code
+INPUT_PORTS_END
+
+MACHINE_CONFIG_START(cit101_hle_keyboard_device::device_add_mconfig)
+	MCFG_SPEAKER_STANDARD_MONO("mono")
+	MCFG_SOUND_ADD("beeper", BEEP, 786)
+	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+MACHINE_CONFIG_END
+
+ioport_constructor cit101_hle_keyboard_device::device_input_ports() const
+{
+	return INPUT_PORTS_NAME(cit101_hle_keyboard);
+}
+
+void cit101_hle_keyboard_device::device_resolve_objects()
+{
+	m_txd_callback.resolve_safe();
+}
+
+void cit101_hle_keyboard_device::device_start()
+{
+	// keyboard USART configured for mode 8Eh
+	set_data_frame(1, 8, PARITY_NONE, STOP_BITS_1_5);
+	set_rate(4800);
+
+	save_item(NAME(m_command));
+}
+
+void cit101_hle_keyboard_device::device_reset()
+{
+	stop_processing();
+}
+
+void cit101_hle_keyboard_device::tra_callback()
+{
+	m_txd_callback(transmit_register_get_data_bit());
+}
+
+WRITE_LINE_MEMBER(cit101_hle_keyboard_device::write_rxd)
+{
+	rx_w(state);
+}
+
+void cit101_hle_keyboard_device::received_byte(u8 byte)
+{
+	if (m_command[BIT(byte, 0)] != byte)
+	{
+		logerror("Command byte %d = %02X\n", BIT(byte, 0), byte);
+
+		// probably not correct
+		if (!BIT(byte, 0))
+			m_beeper->set_state(BIT(byte, 2));
+
+		m_command[BIT(byte, 0)] = byte;
+	}
+
+	start_processing(attotime::from_hz(76800)); // guess
+}
+
+void cit101_hle_keyboard_device::send_key(u8 code)
+{
+	transmit_byte(code);
+}
+
+void cit101_hle_keyboard_device::send_translated(u8 row, u8 column)
+{
+	const ioport_value modifiers = m_modifiers->read();
+
+	logerror("Key row %d column %d\n", row, column);
+	switch (row)
+	{
+	case 0:
+		if (column < 5)
+			send_key((BIT(modifiers, 0) ? 0x1f : BIT(modifiers, 1) ? 0x7f : 0x5f) - column);
+		else if (column < 31)
+			send_key((BIT(modifiers, 0) ? 0x1f : BIT(modifiers, 1) || BIT(modifiers, 2) ? 0x5f : 0x7f) - column);
+		else
+			send_key(BIT(modifiers, 1) ? '~' : 0x7f - column);
+		break;
+	case 1:
+		if (!BIT(modifiers, 1) || column == 31)
+			send_key((column == 31 && BIT(modifiers, 0) ? 0x1f : 0x3f) - column);
+		else switch (0x3f - column)
+		{
+		case '=':
+			send_key('+');
+			break;
+		case ';':
+			send_key(':');
+			break;
+		case '9':
+			send_key('(');
+			break;
+		case '8':
+			send_key('*');
+			break;
+		case '7':
+			send_key('&');
+			break;
+		case '6':
+			send_key('^');
+			break;
+		case '2':
+			send_key('@');
+			break;
+		case '0':
+			send_key(')');
+			break;
+		case '-':
+			send_key('_');
+			break;
+		case '\'':
+			send_key('"');
+			break;
+		default:
+			send_key(0x2f ^ column);
+			break;
+		}
+		break;
+	case 2:
+		send_key(0x1f - column);
+		break;
+	case 3:
+		send_key((0x9f - column) | (BIT(modifiers, 0) ? 0x40 : 0) | (BIT(modifiers, 1) ? 0x20 : 0));
+		break;
+	}
+}
+
+void cit101_hle_keyboard_device::key_make(u8 row, u8 column)
+{
+	send_translated(row, column);
+}
+
+void cit101_hle_keyboard_device::key_repeat(u8 row, u8 column)
+{
+	send_translated(row, column);
+}
+
+void cit101_hle_keyboard_device::scan_complete()
+{
+	if (are_all_keys_up())
+	{
+		send_key(0x80);
+		stop_processing();
+	}
+}
diff --git a/src/mame/machine/cit101_kbd.h b/src/mame/machine/cit101_kbd.h
new file mode 100644
index 00000000000..5818c4c6033
--- /dev/null
+++ b/src/mame/machine/cit101_kbd.h
@@ -0,0 +1,72 @@
+// license:BSD-3-Clause
+// copyright-holders:AJR
+/**********************************************************************
+
+    CIT-101 85-key keyboard
+
+**********************************************************************/
+
+#ifndef MAME_MACHINE_CIT101_KBD_H
+#define MAME_MACHINE_CIT101_KBD_H
+
+#pragma once
+
+#include "machine/keyboard.h"
+#include "sound/beep.h"
+
+
+//**************************************************************************
+//  CONFIGURATION MACROS
+//**************************************************************************
+
+#define MCFG_CIT101_HLE_KEYBOARD_TXD_CALLBACK(_devcb) \
+	devcb = &downcast<cit101_hle_keyboard_device &>(*device).set_txd_callback(DEVCB_##_devcb);
+
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+// ======================> cit101_hle_keyboard_device
+
+class cit101_hle_keyboard_device : public device_t, public device_matrix_keyboard_interface<4U>, public device_buffered_serial_interface<16U>
+{
+public:
+	// construction/destruction
+	cit101_hle_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+
+	// configuration
+	template <class Object> devcb_base &set_txd_callback(Object &&cb) { return m_txd_callback.set_callback(std::forward<Object>(cb)); }
+
+	DECLARE_WRITE_LINE_MEMBER(write_rxd);
+
+protected:
+	// device_t overrides
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual ioport_constructor device_input_ports() const override;
+	virtual void device_resolve_objects() override;
+	virtual void device_start() override;
+	virtual void device_reset() override;
+
+	// device_buffered_serial_interface overrides
+	virtual void tra_callback() override;
+	virtual void received_byte(u8 byte) override;
+
+	// device_matrix_keyboard_interface overrides
+	virtual void key_make(u8 row, u8 column) override;
+	virtual void key_repeat(u8 row, u8 column) override;
+	virtual void scan_complete() override;
+
+	void send_translated(u8 row, u8 column);
+	void send_key(u8 code);
+private:
+	required_ioport m_modifiers;
+	required_device<beep_device> m_beeper;
+	devcb_write_line m_txd_callback;
+	u8 m_command[2];
+};
+
+// device type definition
+DECLARE_DEVICE_TYPE(CIT101_HLE_KEYBOARD, cit101_hle_keyboard_device)
+
+#endif