diff --git a/src/mame/nec/bungo.cpp b/src/mame/nec/bungo.cpp
index 16e9c0a2121..8751cbfc793 100644
--- a/src/mame/nec/bungo.cpp
+++ b/src/mame/nec/bungo.cpp
@@ -127,8 +127,17 @@ void bungo_mini5sx_state::mini5sx_config(machine_config &config)
 	m_maincpu->set_addrmap(AS_IO, &bungo_mini5sx_state::mini5sx_io);
 //  m_maincpu->set_irq_acknowledge_callback("pic8259_master", FUNC(pic8259_device::inta_cb));
 
-	PC9801_KBD(config, m_keyb, 53);
-//  m_keyb->irq_wr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ1);
+	I8251(config, m_sio_kbd, 0);
+//  m_sio_kbd->txd_handler().set("keyb", FUNC(pc9801_kbd_device::input_txd));
+//  m_sio_kbd->rxrdy_handler().set_inputline(m_maincpu, INPUT_LINE_IRQ1);
+
+//  clock_device &kbd_clock(CLOCK(config, "kbd_clock", 19'200));
+//  kbd_clock.signal_handler().set(m_sio_kbd, FUNC(i8251_device::write_rxc));
+//  kbd_clock.signal_handler().append(m_sio_kbd, FUNC(i8251_device::write_txc));
+
+	// TODO: should be PC-98 based with no numpad and some extra keys.
+	PC9801_KBD(config, m_keyb, 0);
+//  m_keyb->rxd_callback().set("sio_kbd", FUNC(i8251_device::write_rxd));
 
 	I8255(config, m_ppi_sys, 0);
 //  m_ppi_sys->in_pa_callback().set(m_ppi_sys, FUNC(i8255_device::pa_r));
@@ -136,7 +145,7 @@ void bungo_mini5sx_state::mini5sx_config(machine_config &config)
 //  m_ppi_sys->in_pc_callback().set_constant(0xa0); // 0x80 cpu triple fault reset flag?
 //  m_ppi_sys->out_pc_callback().set(FUNC(pc98lt_state::ppi_sys_beep_portc_w));
 
-	// TODO: unverified, known to have a serial port
+	// TODO: unverified, known to have a 8-pin "sheet feeder" port
 	pc9801_serial(config);
 
 	I8255(config, m_ppi_prn, 0);
diff --git a/src/mame/nec/pc9801.cpp b/src/mame/nec/pc9801.cpp
index ad7bbdaacc8..42483c520c1 100644
--- a/src/mame/nec/pc9801.cpp
+++ b/src/mame/nec/pc9801.cpp
@@ -638,9 +638,9 @@ void pc9801_state::pc9801_common_io(address_map &map)
 	map(0x0000, 0x001f).rw(FUNC(pc9801_state::pic_r), FUNC(pc9801_state::pic_w)).umask16(0x00ff); // i8259 PIC (bit 3 ON slave / master) / i8237 DMA
 	map(0x0020, 0x002f).w(FUNC(pc9801_state::rtc_w)).umask16(0x00ff);
 	map(0x0030, 0x0037).rw(m_ppi_sys, FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0xff00);
-	map(0x0030, 0x0033).rw(m_sio, FUNC(i8251_device::read), FUNC(i8251_device::write)).umask16(0x00ff); //i8251 RS232c / i8255 system port
+	map(0x0030, 0x0033).rw(m_sio_rs, FUNC(i8251_device::read), FUNC(i8251_device::write)).umask16(0x00ff); //i8251 RS232c / i8255 system port
 	map(0x0040, 0x0047).rw(m_ppi_prn, FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff);
-	map(0x0040, 0x0047).rw(m_keyb, FUNC(pc9801_kbd_device::rx_r), FUNC(pc9801_kbd_device::tx_w)).umask16(0xff00); //i8255 printer port / i8251 keyboard
+	map(0x0040, 0x0043).rw(m_sio_kbd, FUNC(i8251_device::read), FUNC(i8251_device::write)).umask16(0xff00); //i8255 printer port / i8251 keyboard
 	map(0x0050, 0x0057).lr8(NAME([] (offs_t offset) { return 0xff; })).umask16(0xff00);
 	map(0x0050, 0x0053).w(FUNC(pc9801_state::nmi_ctrl_w)).umask16(0x00ff); // NMI FF / host FDD 2d (PC-80S31K)
 	map(0x0060, 0x0063).rw(m_hgdc[0], FUNC(upd7220_device::read), FUNC(upd7220_device::write)).umask16(0x00ff); //upd7220 character ports / <undefined>
@@ -651,7 +651,7 @@ void pc9801_state::pc9801_common_io(address_map &map)
 	// (can be accessed only thru the $3fdb alias)
 	map(0x0070, 0x0077).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask16(0xff00);
 	map(0x0070, 0x007f).rw(FUNC(pc9801_state::txt_scrl_r), FUNC(pc9801_state::txt_scrl_w)).umask16(0x00ff); //display registers / i8253 pit
-//  map(0x0090, 0x0093).rw(m_sio, FUNC(i8251_device::read), FUNC(i8251_device::write)).umask16(0xff00); // CMT SIO (optional, C-Bus)
+//  map(0x0090, 0x0093).rw(m_sio_cmt, FUNC(i8251_device::read), FUNC(i8251_device::write)).umask16(0xff00); // CMT SIO (optional, C-Bus)
 	map(0x7fd8, 0x7fdf).rw(m_ppi_mouse, FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0xff00);
 }
 
@@ -1030,6 +1030,10 @@ void pc9801vm_state::pc9801rs_video_ff_w(offs_t offset, uint8_t data)
  * ---- --x- Graph LIO BIOS select (?), on 9801VX21
  * ---- ---x Mate A: selects high-reso mode
  *           ^ unknown otherwise
+ *
+ * TODO: why BIOS has to read it twice during cold boot?
+ * Later 9821 machines will add a mov bh,al on second read, is there some kind of side
+ * effect for reading?
  */
 u8 pc9801vm_state::dma_access_ctrl_r(offs_t offset)
 {
@@ -2077,7 +2081,9 @@ MACHINE_RESET_MEMBER(pc9801vm_state,pc9801rs)
 	m_fdc_mode = 3;
 	fdc_set_density_mode(true); // 2HD
 	// 0xfb on PC98XL
-	m_dma_access_ctrl = 0xfe;
+	// TODO: breaks UART setup for pc9801rs
+	// m_dma_access_ctrl = 0xfe;
+	m_dma_access_ctrl = 0;
 	m_ide_sel = 0;
 	m_maincpu->set_input_line(INPUT_LINE_A20, m_gate_a20);
 
@@ -2143,8 +2149,20 @@ void pc9801_atapi_devices(device_slot_interface &device)
 
 void pc9801_state::pc9801_keyboard(machine_config &config)
 {
-	PC9801_KBD(config, m_keyb, 53);
-	m_keyb->irq_wr_callback().set(m_pic1, FUNC(pic8259_device::ir1_w));
+	I8251(config, m_sio_kbd, 0);
+	m_sio_kbd->txd_handler().set("keyb", FUNC(pc9801_kbd_device::input_txd));
+	m_sio_kbd->dtr_handler().set("keyb", FUNC(pc9801_kbd_device::input_rty));
+	m_sio_kbd->rts_handler().set("keyb", FUNC(pc9801_kbd_device::input_kbde));
+	m_sio_kbd->write_cts(0);
+	m_sio_kbd->write_dsr(0);
+	m_sio_kbd->rxrdy_handler().set(m_pic1, FUNC(pic8259_device::ir1_w));
+
+	clock_device &kbd_clock(CLOCK(config, "kbd_clock", 19'200));
+	kbd_clock.signal_handler().set(m_sio_kbd, FUNC(i8251_device::write_rxc));
+	kbd_clock.signal_handler().append(m_sio_kbd, FUNC(i8251_device::write_txc));
+
+	PC9801_KBD(config, m_keyb, 0);
+	m_keyb->rxd_callback().set("sio_kbd", FUNC(i8251_device::write_rxd));
 }
 
 void pc9801_state::pit_clock_config(machine_config &config, const XTAL clock)
@@ -2251,18 +2269,18 @@ void pc9801vm_state::pc9801_ide(machine_config &config)
 void pc98_base_state::pc9801_serial(machine_config &config)
 {
 	// clocked by PIT channel 2
-	I8251(config, m_sio, 0);
-	m_sio->txd_handler().set("serial", FUNC(rs232_port_device::write_txd));
-	m_sio->rts_handler().set("serial", FUNC(rs232_port_device::write_rts));
-	m_sio->dtr_handler().set("serial", FUNC(rs232_port_device::write_dtr));
-	m_sio->rxrdy_handler().set([this] (int state) { update_uart_irq<0>(state); });
-	m_sio->txempty_handler().set([this] (int state) { update_uart_irq<1>(state); });
-	m_sio->txrdy_handler().set([this] (int state) { update_uart_irq<2>(state); });
+	I8251(config, m_sio_rs, 0);
+	m_sio_rs->txd_handler().set("serial", FUNC(rs232_port_device::write_txd));
+	m_sio_rs->rts_handler().set("serial", FUNC(rs232_port_device::write_rts));
+	m_sio_rs->dtr_handler().set("serial", FUNC(rs232_port_device::write_dtr));
+	m_sio_rs->rxrdy_handler().set([this] (int state) { update_uart_irq<0>(state); });
+	m_sio_rs->txempty_handler().set([this] (int state) { update_uart_irq<1>(state); });
+	m_sio_rs->txrdy_handler().set([this] (int state) { update_uart_irq<2>(state); });
 
 	rs232_port_device &rs232(RS232_PORT(config, "serial", default_rs232_devices, nullptr));
-	rs232.rxd_handler().set(m_sio, FUNC(i8251_device::write_rxd));
-	rs232.cts_handler().set(m_sio, FUNC(i8251_device::write_cts));
-	rs232.dsr_handler().set(m_sio, FUNC(i8251_device::write_dsr));
+	rs232.rxd_handler().set(m_sio_rs, FUNC(i8251_device::write_rxd));
+	rs232.cts_handler().set(m_sio_rs, FUNC(i8251_device::write_cts));
+	rs232.dsr_handler().set(m_sio_rs, FUNC(i8251_device::write_dsr));
 }
 
 void pc9801_state::pc9801_common(machine_config &config)
@@ -2272,8 +2290,8 @@ void pc9801_state::pc9801_common(machine_config &config)
 	m_pit->out_handler<0>().set(m_pic1, FUNC(pic8259_device::ir0_w));
 	m_pit->set_clk<1>(MAIN_CLOCK_X1); // Memory Refresh
 	m_pit->set_clk<2>(MAIN_CLOCK_X1); // RS-232C
-	m_pit->out_handler<2>().set(m_sio, FUNC(i8251_device::write_txc));
-	m_pit->out_handler<2>().append(m_sio, FUNC(i8251_device::write_rxc));
+	m_pit->out_handler<2>().set(m_sio_rs, FUNC(i8251_device::write_txc));
+	m_pit->out_handler<2>().append(m_sio_rs, FUNC(i8251_device::write_rxc));
 
 	AM9517A(config, m_dmac, 5000000); // unknown clock, TODO: check channels 0 - 1
 	m_dmac->dreq_active_low();
diff --git a/src/mame/nec/pc9801.h b/src/mame/nec/pc9801.h
index 895963ad372..bc5ce4ab2f1 100644
--- a/src/mame/nec/pc9801.h
+++ b/src/mame/nec/pc9801.h
@@ -21,6 +21,7 @@
 #include "machine/am9517a.h"
 #include "machine/bankdev.h"
 #include "machine/buffer.h"
+#include "machine/clock.h"
 #include "machine/i8251.h"
 #include "machine/i8255.h"
 #include "machine/output_latch.h"
@@ -98,7 +99,8 @@ public:
 		, m_ppi_sys(*this, "ppi_sys")
 		, m_ppi_prn(*this, "ppi_prn")
 		, m_beeper(*this, "beeper")
-		, m_sio(*this, "sio")
+		, m_sio_rs(*this, "sio_rs")
+		, m_sio_kbd(*this, "sio_kbd")
 	{
 	}
 
@@ -113,7 +115,8 @@ protected:
 	required_device<i8255_device> m_ppi_sys;
 	required_device<i8255_device> m_ppi_prn;
 	optional_device<beep_device> m_beeper;
-	required_device<i8251_device> m_sio;
+	required_device<i8251_device> m_sio_rs;
+	required_device<i8251_device> m_sio_kbd;
 
 	void rtc_w(uint8_t data);
 	void ppi_sys_beep_portc_w(uint8_t data);
diff --git a/src/mame/nec/pc9801_kbd.cpp b/src/mame/nec/pc9801_kbd.cpp
index 1aaa64d3ae8..9c5e3caef83 100644
--- a/src/mame/nec/pc9801_kbd.cpp
+++ b/src/mame/nec/pc9801_kbd.cpp
@@ -2,27 +2,31 @@
 // copyright-holders:Angelo Salese
 /**************************************************************************************************
 
-    PC-9801 Keyboard simulation
+PC-9801 Keyboard simulation
 
-    Resources:
-    - PC-98Bible;
-    - https://github.com/tmk/tmk_keyboard/wiki/PC-9801-Keyboard;
+Resources:
+- PC-98 Bible;
+- PC-9800 Technical DataBook;
+- https://github.com/tmk/tmk_keyboard/wiki/PC-9801-Keyboard;
 
-    TODO:
-    - key repeat;
-    - Implement actual i8251 interface;
-    - GRPH + SHIFT scancodes;
-    - Subclass keyboard variants (cfr. PC-9801-119 with Windows & Menu keys and PC-9801-115 Bungo);
-    - Verify untested keys:
-      STOP, COPY, and vf-1 through vf-5
-      STOP is correct, verified with branmar2
-    - Problems with natural keyboard (most nonprinting keys don't work);
+TODO:
+- RTY behaviour
+\- triggered in bokosuka when it starts losing a key break along the way.
+- key repeat: alternates break and make keys when typematic kicks in, 30ms per swap?
+\- Most keyboards don't have a method for disabling typematic, depends on RTY?
+- Undumped i8048 MCU;
+- GRPH + SHIFT scancodes;
+- Subclass keyboard variants (cfr. PC-9801-119 with Windows & Menu keys and PC-9801-115 Bungo);
+- Verify untested keys:
+    STOP, COPY, and vf-1 through vf-5
+    STOP is correct, verified with branmar2
+- Problems with natural keyboard (most nonprinting keys don't work);
 
 **************************************************************************************************/
 
 #include "emu.h"
 #include "pc9801_kbd.h"
-
+#include "machine/keyboard.ipp"
 
 //**************************************************************************
 //  GLOBAL VARIABLES
@@ -40,194 +44,16 @@ DEFINE_DEVICE_TYPE(PC9801_KBD, pc9801_kbd_device, "pc9801_kbd", "PC-9801 Keyboar
 //  pc9801_kbd_device - constructor
 //-------------------------------------------------
 
-pc9801_kbd_device::pc9801_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
-	device_t(mconfig, PC9801_KBD, tag, owner, clock),
-	m_write_irq(*this)
+pc9801_kbd_device::pc9801_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, PC9801_KBD, tag, owner, clock)
+	, device_buffered_serial_interface(mconfig, *this)
+	, device_matrix_keyboard_interface(mconfig, *this, "KEY0", "KEY1", "KEY2", "KEY3", "KEY4", "KEY5", "KEY6", "KEY7", "KEY8", "KEY9", "KEYA", "KEYB", "KEYC", "KEYD", "KEYE", "KEYF")
+	, m_tx_cb(*this)
+	, m_kbde_state(0)
+	, m_rty_state(0)
 {
 }
 
-//-------------------------------------------------
-//  input_ports - device-specific input ports
-//-------------------------------------------------
-
-INPUT_CHANGED_MEMBER(pc9801_kbd_device::key_stroke)
-{
-	if (newval && !oldval)
-		m_rx_buf[param & 0x7f] = 1;
-
-	if (oldval && !newval)
-		m_rx_buf[param & 0x7f] = 2;
-}
-
-static INPUT_PORTS_START( pc9801_kbd )
-	PORT_START("KEY0") // 0x00 - 0x07
-	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("ESC") PORT_CODE(KEYCODE_ESC)  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x00)
-	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("1") PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x01)
-	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("2") PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('"')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x02)
-	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("3") PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x03)
-	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("4") PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x04)
-	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("5") PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x05)
-	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("6") PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('&')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x06)
-	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("7") PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x07)
-
-	PORT_START("KEY1") // 0x08 - 0x0f
-	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("8") PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x08)
-	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("9") PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x09)
-	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("0") PORT_CODE(KEYCODE_0) PORT_CHAR('0')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x0a)
-	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("- / =") PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHAR('=')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x0b)
-	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("^ / `") PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('^') PORT_CHAR('`')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x0c)
-	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME(u8"¥ / ¦") PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR(U'¥','\\') PORT_CHAR(U'¦','|')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x0d)
-	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("BACKSPACE") PORT_CODE(KEYCODE_BACKSPACE)  PORT_CHAR(8)  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x0e)
-	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("TAB") PORT_CODE(KEYCODE_TAB) PORT_CHAR(9)  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x0f)
-
-	PORT_START("KEY2") // 0x10 - 0x17
-	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Q") PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x10)
-	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("W") PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x11)
-	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("E") PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x12)
-	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("R") PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x13)
-	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("T") PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x14)
-	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Y") PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x15)
-	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("U") PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x16)
-	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("I") PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x17)
-
-	PORT_START("KEY3") // 0x18 - 0x1f
-	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("O") PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x18)
-	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("P") PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x19)
-	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("@ / ~") PORT_CODE(KEYCODE_TILDE) PORT_CHAR('@') PORT_CHAR('~')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x1a)
-	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("[ / {") PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('[') PORT_CHAR('{')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x1b)
-	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("ENTER") PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x1c)
-	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("A") PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x1d)
-	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("S") PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x1e)
-	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("D") PORT_CODE(KEYCODE_D) PORT_CHAR('d') PORT_CHAR('D')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x1f)
-
-	PORT_START("KEY4") // 0x20 - 0x27
-	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F") PORT_CODE(KEYCODE_F) PORT_CHAR('f') PORT_CHAR('F')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x20)
-	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("G") PORT_CODE(KEYCODE_G) PORT_CHAR('g') PORT_CHAR('G')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x21)
-	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("H") PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x22)
-	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("J") PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x23)
-	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("K") PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x24)
-	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("L") PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x25)
-	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("; / +") PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR('+')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x26)
-	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME(": / *") PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(':') PORT_CHAR('*')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x27)
-
-	PORT_START("KEY5") // 0x28 - 0x2f
-	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("] / }") PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']') PORT_CHAR('}')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x28)
-	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Z") PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x29)
-	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("X") PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x2a)
-	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("C") PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x2b)
-	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("V") PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x2c)
-	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("B") PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x2d)
-	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("N") PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x2e)
-	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("M") PORT_CODE(KEYCODE_M) PORT_CHAR('m') PORT_CHAR('M')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x2f)
-
-	// i feel like PORT_CHAR(UCHAR_MAMEKEY(INVALID)) shouldn't work...
-	PORT_START("KEY6") // 0x30 - 0x37
-	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME(", / <") PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x30)
-	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME(". / >") PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x31)
-	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("/ / ?") PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/')  PORT_CHAR('?') PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x32)
-	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("_") PORT_CHAR(UCHAR_MAMEKEY(INVALID)) PORT_CHAR('_')  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x33)
-	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("SPACE") PORT_CODE(KEYCODE_SPACE)  PORT_CHAR(' ') PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x34)
-	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("XFER")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x35)
-	// "ROLL UP / DOWN" are marked as PgDn / PgUp on key sides on most if not all PC-98 keyboards
-	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("ROLL UP / PgDn") PORT_CODE(KEYCODE_PGDN)  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x36)
-	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("ROLL DOWN / PgUp") PORT_CODE(KEYCODE_PGUP)  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x37)
-
-	PORT_START("KEY7") // 0x38 - 0x3f
-	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("INS") PORT_CODE(KEYCODE_INSERT)  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x38)
-	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("DEL") PORT_CODE(KEYCODE_DEL)  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x39)
-	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Up") PORT_CODE(KEYCODE_UP) PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x3a)
-	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Left") PORT_CODE(KEYCODE_LEFT) PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x3b)
-	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Right") PORT_CODE(KEYCODE_RIGHT) PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x3c)
-	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Down") PORT_CODE(KEYCODE_DOWN) PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x3d)
-	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("HOME / CLR") PORT_CODE(KEYCODE_HOME)  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x3e)
-	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("HELP") PORT_CODE(KEYCODE_END)  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x3f)
-
-	PORT_START("KEY8") // 0x40 - 0x47
-	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("- (PAD)") PORT_CODE(KEYCODE_MINUS_PAD)  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x40)
-	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("/ (PAD)") PORT_CODE(KEYCODE_SLASH_PAD)  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x41)
-	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("7 (PAD)") PORT_CODE(KEYCODE_7_PAD)  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x42)
-	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("8 (PAD)") PORT_CODE(KEYCODE_8_PAD)  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x43)
-	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("9 (PAD)") PORT_CODE(KEYCODE_9_PAD)  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x44)
-	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("* (PAD)") PORT_CODE(KEYCODE_ASTERISK)  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x45)
-	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("4 (PAD)") PORT_CODE(KEYCODE_4_PAD)  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x46)
-	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("5 (PAD)") PORT_CODE(KEYCODE_5_PAD)  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x47)
-
-	PORT_START("KEY9") // 0x48 - 0x4f
-	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("6 (PAD)") PORT_CODE(KEYCODE_6_PAD)  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x48)
-	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("+ (PAD)") PORT_CODE(KEYCODE_PLUS_PAD)  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x49)
-	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("1 (PAD)") PORT_CODE(KEYCODE_1_PAD)  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x4a)
-	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("2 (PAD)") PORT_CODE(KEYCODE_2_PAD)  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x4b)
-	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("3 (PAD)") PORT_CODE(KEYCODE_3_PAD)  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x4c)
-	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("= (PAD)") PORT_CODE(KEYCODE_ENTER_PAD)  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x4d)
-	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("0 (PAD)") PORT_CODE(KEYCODE_0_PAD)  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x4e)
-	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME(", (PAD)")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x4f)
-
-	PORT_START("KEYA") // 0x50 - 0x57
-	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME(". (PAD)") PORT_CODE(KEYCODE_DEL_PAD)  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x50)
-	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("NFER")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x51)
-	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("VF1")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x52)
-	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("VF2")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x53)
-	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("VF3")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x54)
-	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("VF4")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x55)
-	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("VF5")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x56)
-	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 2-8")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x57)
-
-	PORT_START("KEYB") // 0x58 - 0x5f
-	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 3-1")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x58)
-	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 3-2")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x59)
-	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 3-3")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x5a)
-	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 3-4")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x5b)
-	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 3-5")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x5c)
-	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 3-6")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x5d)
-	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 3-7")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x5e)
-	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 3-8")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x5f)
-
-	PORT_START("KEYC") // 0x60 - 0x67
-	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("STOP")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x60)
-	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("COPY")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x61)
-	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F1") PORT_CODE(KEYCODE_F1) PORT_CHAR(UCHAR_MAMEKEY(F1))  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x62)
-	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F2") PORT_CODE(KEYCODE_F2) PORT_CHAR(UCHAR_MAMEKEY(F2))  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x63)
-	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F3") PORT_CODE(KEYCODE_F3) PORT_CHAR(UCHAR_MAMEKEY(F3))  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x64)
-	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F4") PORT_CODE(KEYCODE_F4) PORT_CHAR(UCHAR_MAMEKEY(F4))  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x65)
-	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F5") PORT_CODE(KEYCODE_F5) PORT_CHAR(UCHAR_MAMEKEY(F5))  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x66)
-	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F6") PORT_CODE(KEYCODE_F6) PORT_CHAR(UCHAR_MAMEKEY(F6))  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x67)
-
-	PORT_START("KEYD") // 0x68 - 0x6f
-	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F7") PORT_CODE(KEYCODE_F7) PORT_CHAR(UCHAR_MAMEKEY(F7))  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x68)
-	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F8") PORT_CODE(KEYCODE_F8) PORT_CHAR(UCHAR_MAMEKEY(F8))  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x69)
-	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F9") PORT_CODE(KEYCODE_F9) PORT_CHAR(UCHAR_MAMEKEY(F9))  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x6a)
-	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F10") PORT_CODE(KEYCODE_F10) PORT_CHAR(UCHAR_MAMEKEY(F10))  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x6b)
-	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 5-5")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x6c)
-	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 5-6")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x6d)
-	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 5-7")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x6e)
-	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 5-8")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x6f)
-
-	PORT_START("KEYE") // 0x70 - 0x77
-	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("SHIFT") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1) PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x70)
-	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("CAPS LOCK") PORT_CODE(KEYCODE_CAPSLOCK) PORT_TOGGLE  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x71)
-	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("\xe3\x82\xab\xe3\x83\x8a / KANA LOCK") PORT_TOGGLE  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x72)
-	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("GRPH / ALT") PORT_CODE(KEYCODE_LALT) PORT_CODE(KEYCODE_RALT) PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x73)
-	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("CTRL") PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(KEYCODE_RCONTROL) PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x74)
-	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 6-6")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x75)
-	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 6-7")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x76)
-	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 6-8")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x77)
-
-	PORT_START("KEYF") // 0x78 - 0x7f
-	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 7-1")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x78)
-	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 7-2")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x79)
-	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 7-3")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x7a)
-	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 7-4")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x7b)
-	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 7-5")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x7c)
-	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 7-6")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x7d)
-	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 7-7")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x7e)
-	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 7-8")  PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(pc9801_kbd_device::key_stroke), 0x7f)
-INPUT_PORTS_END
-
-ioport_constructor pc9801_kbd_device::device_input_ports() const
-{
-	return INPUT_PORTS_NAME( pc9801_kbd );
-}
-
 //-------------------------------------------------
 //  device_validity_check - perform validity checks
 //  on this device
@@ -244,8 +70,7 @@ void pc9801_kbd_device::device_validity_check(validity_checker &valid) const
 
 void pc9801_kbd_device::device_start()
 {
-	m_rxtimer = timer_alloc(FUNC(pc9801_kbd_device::rx_timer_tick), this);
-	m_rxtimer->adjust(attotime::from_hz(clock()), 0, attotime::from_hz(clock()));
+	// ...
 }
 
 
@@ -255,64 +80,296 @@ void pc9801_kbd_device::device_start()
 
 void pc9801_kbd_device::device_reset()
 {
-	for (int i = 0; i < 0x80; i++)
-		m_rx_buf[i] = 0;
+	clear_fifo();
+	set_data_frame(START_BIT_COUNT, DATA_BIT_COUNT, PARITY, STOP_BITS);
+	set_rcv_rate(BAUD);
+	set_tra_rate(BAUD);
+	receive_register_reset();
+	transmit_register_reset();
 
-	m_keyb_tx = 0xff;
-	m_keyb_rx = 0;
-	m_key_avail = false;
-	m_write_irq(CLEAR_LINE);
+	reset_key_state();
+	start_processing(attotime::from_hz(BAUD));
+	typematic_stop();
+
+//  m_repeat_state = false;
 }
 
-//-------------------------------------------------
-//  rx_timer_tick
-//-------------------------------------------------
-
-TIMER_CALLBACK_MEMBER(pc9801_kbd_device::rx_timer_tick)
+uint8_t pc9801_kbd_device::translate(uint8_t row, uint8_t column)
 {
-	/* key up */
-	for (int i = 0; i < 0x80; i++)
-	{
-		if (m_rx_buf[i] == 2)
-		{
-			m_keyb_tx = i | 0x80;
-			m_write_irq(ASSERT_LINE);
-			m_key_avail = true;
-			m_rx_buf[i] = 0;
-			return;
-		}
-	}
+	return row * 8 + column;
+}
 
-	/* key down */
-	for (int i = 0x7f; i >= 0; i--)
+static INPUT_PORTS_START( pc9801_kbd )
+	PORT_START("KEY0") // 0x00 - 0x07
+	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("ESC") PORT_CODE(KEYCODE_ESC)
+	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("1") PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!')
+	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("2") PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('"')
+	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("3") PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#')
+	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("4") PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$')
+	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("5") PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%')
+	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("6") PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('&')
+	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("7") PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'')
+
+	PORT_START("KEY1") // 0x08 - 0x0f
+	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("8") PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(')
+	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("9") PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')')
+	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("0") PORT_CODE(KEYCODE_0) PORT_CHAR('0')
+	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("- / =") PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHAR('=')
+	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("^ / `") PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('^') PORT_CHAR('`')
+	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME(u8"¥ / ¦") PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR(U'¥','\\') PORT_CHAR(U'¦','|')
+	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("BACKSPACE") PORT_CODE(KEYCODE_BACKSPACE)  PORT_CHAR(8)
+	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("TAB") PORT_CODE(KEYCODE_TAB) PORT_CHAR(9)
+
+	PORT_START("KEY2") // 0x10 - 0x17
+	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Q") PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q')
+	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("W") PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W')
+	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("E") PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E')
+	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("R") PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R')
+	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("T") PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T')
+	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Y") PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y')
+	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("U") PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U')
+	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("I") PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I')
+
+	PORT_START("KEY3") // 0x18 - 0x1f
+	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("O") PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O')
+	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("P") PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P')
+	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("@ / ~") PORT_CODE(KEYCODE_TILDE) PORT_CHAR('@') PORT_CHAR('~')
+	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("[ / {") PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('[') PORT_CHAR('{')
+	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("ENTER") PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)
+	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("A") PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A')
+	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("S") PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S')
+	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("D") PORT_CODE(KEYCODE_D) PORT_CHAR('d') PORT_CHAR('D')
+
+	PORT_START("KEY4") // 0x20 - 0x27
+	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F") PORT_CODE(KEYCODE_F) PORT_CHAR('f') PORT_CHAR('F')
+	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("G") PORT_CODE(KEYCODE_G) PORT_CHAR('g') PORT_CHAR('G')
+	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("H") PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H')
+	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("J") PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J')
+	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("K") PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K')
+	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("L") PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L')
+	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("; / +") PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR('+')
+	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME(": / *") PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(':') PORT_CHAR('*')
+
+	PORT_START("KEY5") // 0x28 - 0x2f
+	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("] / }") PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']') PORT_CHAR('}')
+	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Z") PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z')
+	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("X") PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X')
+	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("C") PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C')
+	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("V") PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V')
+	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("B") PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B')
+	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("N") PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N')
+	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("M") PORT_CODE(KEYCODE_M) PORT_CHAR('m') PORT_CHAR('M')
+
+	// i feel like PORT_CHAR(UCHAR_MAMEKEY(INVALID)) shouldn't work...
+	PORT_START("KEY6") // 0x30 - 0x37
+	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME(", / <") PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<')
+	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME(". / >") PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>')
+	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("/ / ?") PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/')  PORT_CHAR('?')
+	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("_") PORT_CHAR(UCHAR_MAMEKEY(INVALID)) PORT_CHAR('_')
+	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("SPACE") PORT_CODE(KEYCODE_SPACE)  PORT_CHAR(' ')
+	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("XFER")
+	// "ROLL UP / DOWN" are marked as PgDn / PgUp on key sides on most if not all PC-98 keyboards
+	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("ROLL UP / PgDn") PORT_CODE(KEYCODE_PGDN)
+	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("ROLL DOWN / PgUp") PORT_CODE(KEYCODE_PGUP)
+
+	PORT_START("KEY7") // 0x38 - 0x3f
+	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("INS") PORT_CODE(KEYCODE_INSERT)
+	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("DEL") PORT_CODE(KEYCODE_DEL)
+	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Up") PORT_CODE(KEYCODE_UP)
+	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Left") PORT_CODE(KEYCODE_LEFT)
+	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Right") PORT_CODE(KEYCODE_RIGHT)
+	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Down") PORT_CODE(KEYCODE_DOWN)
+	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("HOME / CLR") PORT_CODE(KEYCODE_HOME)
+	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("HELP") PORT_CODE(KEYCODE_END)
+
+	PORT_START("KEY8") // 0x40 - 0x47
+	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("- (PAD)") PORT_CODE(KEYCODE_MINUS_PAD)
+	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("/ (PAD)") PORT_CODE(KEYCODE_SLASH_PAD)
+	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("7 (PAD)") PORT_CODE(KEYCODE_7_PAD)
+	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("8 (PAD)") PORT_CODE(KEYCODE_8_PAD)
+	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("9 (PAD)") PORT_CODE(KEYCODE_9_PAD)
+	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("* (PAD)") PORT_CODE(KEYCODE_ASTERISK)
+	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("4 (PAD)") PORT_CODE(KEYCODE_4_PAD)
+	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("5 (PAD)") PORT_CODE(KEYCODE_5_PAD)
+
+	PORT_START("KEY9") // 0x48 - 0x4f
+	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("6 (PAD)") PORT_CODE(KEYCODE_6_PAD)
+	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("+ (PAD)") PORT_CODE(KEYCODE_PLUS_PAD)
+	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("1 (PAD)") PORT_CODE(KEYCODE_1_PAD)
+	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("2 (PAD)") PORT_CODE(KEYCODE_2_PAD)
+	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("3 (PAD)") PORT_CODE(KEYCODE_3_PAD)
+	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("= (PAD)") PORT_CODE(KEYCODE_ENTER_PAD)
+	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("0 (PAD)") PORT_CODE(KEYCODE_0_PAD)
+	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME(", (PAD)")
+
+	PORT_START("KEYA") // 0x50 - 0x57
+	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME(". (PAD)") PORT_CODE(KEYCODE_DEL_PAD)
+	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("NFER")
+	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("VF1")
+	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("VF2")
+	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("VF3")
+	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("VF4")
+	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("VF5")
+	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 2-8")
+
+	PORT_START("KEYB") // 0x58 - 0x5f
+	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 3-1")
+	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 3-2")
+	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 3-3")
+	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 3-4")
+	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 3-5")
+	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 3-6")
+	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 3-7")
+	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 3-8")
+
+	PORT_START("KEYC") // 0x60 - 0x67
+	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("STOP")
+	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("COPY")
+	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F1") PORT_CODE(KEYCODE_F1) PORT_CHAR(UCHAR_MAMEKEY(F1))
+	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F2") PORT_CODE(KEYCODE_F2) PORT_CHAR(UCHAR_MAMEKEY(F2))
+	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F3") PORT_CODE(KEYCODE_F3) PORT_CHAR(UCHAR_MAMEKEY(F3))
+	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F4") PORT_CODE(KEYCODE_F4) PORT_CHAR(UCHAR_MAMEKEY(F4))
+	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F5") PORT_CODE(KEYCODE_F5) PORT_CHAR(UCHAR_MAMEKEY(F5))
+	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F6") PORT_CODE(KEYCODE_F6) PORT_CHAR(UCHAR_MAMEKEY(F6))
+
+	PORT_START("KEYD") // 0x68 - 0x6f
+	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F7") PORT_CODE(KEYCODE_F7) PORT_CHAR(UCHAR_MAMEKEY(F7))
+	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F8") PORT_CODE(KEYCODE_F8) PORT_CHAR(UCHAR_MAMEKEY(F8))
+	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F9") PORT_CODE(KEYCODE_F9) PORT_CHAR(UCHAR_MAMEKEY(F9))
+	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("F10") PORT_CODE(KEYCODE_F10) PORT_CHAR(UCHAR_MAMEKEY(F10))
+	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 5-5")
+	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 5-6")
+	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 5-7")
+	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 5-8")
+
+	PORT_START("KEYE") // 0x70 - 0x77
+	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("SHIFT") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
+	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("CAPS LOCK") PORT_CODE(KEYCODE_CAPSLOCK) PORT_TOGGLE
+	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("\xe3\x82\xab\xe3\x83\x8a / KANA LOCK") PORT_TOGGLE
+	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("GRPH / ALT") PORT_CODE(KEYCODE_LALT) PORT_CODE(KEYCODE_RALT)
+	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("CTRL") PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(KEYCODE_RCONTROL)
+	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 6-6")
+	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 6-7")
+	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 6-8")
+
+	PORT_START("KEYF") // 0x78 - 0x7f
+	PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 7-1")
+	PORT_BIT(0x02,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 7-2")
+	PORT_BIT(0x04,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 7-3")
+	PORT_BIT(0x08,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 7-4")
+	PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 7-5")
+	PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 7-6")
+	PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 7-7")
+	PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_UNUSED) //IPT_KEYBOARD) PORT_NAME(" un 7-8")
+INPUT_PORTS_END
+
+ioport_constructor pc9801_kbd_device::device_input_ports() const
+{
+	return INPUT_PORTS_NAME( pc9801_kbd );
+}
+
+
+//**************************************************************************
+//  device_matrix_keyboard
+//**************************************************************************
+
+void pc9801_kbd_device::key_make(uint8_t row, uint8_t column)
+{
+	uint8_t code = translate(row, column);
+
+	send_key(code);
+
+	// no typematic for caps and kana locks
+	// TODO: does it applies to the whole E row?
+	// page 345 of the Technical DataBook for timings
+	if (code != 0x71 && code != 0x72)
 	{
-		if (m_rx_buf[i] == 1)
-		{
-			m_keyb_tx = i;
-			m_write_irq(ASSERT_LINE);
-			m_key_avail = true;
-			m_rx_buf[i] = 0;
-			return;
-		}
+		//m_repeat_state = 0;
+		typematic_start(row, column, attotime::from_msec(500), attotime::from_msec(60));
 	}
 }
 
+void pc9801_kbd_device::key_break(uint8_t row, uint8_t column)
+{
+	if (typematic_is(row, column))
+		typematic_stop();
+
+	uint8_t code = translate(row, column);
+
+	send_key(code | 0x80);
+}
+
+void pc9801_kbd_device::key_repeat(uint8_t row, uint8_t column)
+{
+//  uint8_t code = translate(row, column);
+
+//    m_repeat_state ^= 1;
+//    code |= m_repeat_state << 7;
+//
+//    send_key(code);
+}
+
+void pc9801_kbd_device::send_key(uint8_t code)
+{
+	transmit_byte(code);
+	if (fifo_full())
+		stop_processing();
+}
+
 //**************************************************************************
-//  READ/WRITE HANDLERS
+//  Serial implementation
 //**************************************************************************
 
-uint8_t pc9801_kbd_device::rx_r(offs_t offset)
+void pc9801_kbd_device::tra_complete()
 {
-	m_write_irq(CLEAR_LINE);
-	if (!offset)
-	{
-		m_key_avail = false;
-		return m_keyb_tx;
-	}
-	return 1 | 4 | (m_key_avail ? 2 : 0);
+	if (fifo_full())
+		start_processing(attotime::from_hz(BAUD));
+
+	device_buffered_serial_interface::tra_complete();
 }
 
-void pc9801_kbd_device::tx_w(uint8_t data)
+void pc9801_kbd_device::transmit_byte(u8 byte)
 {
-	m_keyb_rx = data;
+	device_buffered_serial_interface::transmit_byte(byte);
+	if (fifo_full())
+		stop_processing();
+}
+
+/*
+ * 0xff: reset
+ * everything else: implementation specific, TBD (0x9* command, some have extra parameters)
+ */
+void pc9801_kbd_device::received_byte(u8 byte)
+{
+	logerror("received_byte 0x%02x\n", byte);
+	if (byte == 0xff)
+	{
+		clear_fifo();
+		receive_register_reset();
+		transmit_register_reset();
+
+		reset_key_state();
+		start_processing(attotime::from_hz(BAUD));
+		typematic_stop();
+	}
+}
+
+void pc9801_kbd_device::rcv_complete()
+{
+	receive_register_extract();
+	received_byte(get_received_char());
+}
+
+void pc9801_kbd_device::input_kbde(int state)
+{
+	if (!m_kbde_state && state)
+		start_processing(attotime::from_hz(BAUD));
+	if (m_kbde_state && !state)
+		stop_processing();
+	m_kbde_state = state;
+}
+
+void pc9801_kbd_device::input_rty(int state)
+{
+	m_rty_state = state;
 }
diff --git a/src/mame/nec/pc9801_kbd.h b/src/mame/nec/pc9801_kbd.h
index f5b6ab059fa..4ad199873e7 100644
--- a/src/mame/nec/pc9801_kbd.h
+++ b/src/mame/nec/pc9801_kbd.h
@@ -10,6 +10,8 @@
 
 #pragma once
 
+#include "machine/keyboard.h"
+#include "diserial.h"
 
 //**************************************************************************
 //  TYPE DEFINITIONS
@@ -18,19 +20,24 @@
 // ======================> pc9801_kbd_device
 
 class pc9801_kbd_device : public device_t
+						, public device_buffered_serial_interface<16U>
+						, protected device_matrix_keyboard_interface<16>
 {
 public:
 	// construction/destruction
 	pc9801_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	auto irq_wr_callback() { return m_write_irq.bind(); }
-
 	virtual ioport_constructor device_input_ports() const override ATTR_COLD;
 
-	// I/O operations
-	void tx_w(uint8_t data);
-	uint8_t rx_r(offs_t offset);
-	DECLARE_INPUT_CHANGED_MEMBER(key_stroke);
+	auto rxd_callback()    { return m_tx_cb.bind(); }
+//  auto rdy_callback()    { return m_rdy_cb.bind(); }
+//  auto rty_callback()    { return m_rty_cb.bind(); }
+
+	// input_rts?
+	void input_txd(int state)  { device_buffered_serial_interface::rx_w(state); }
+	void input_rty(int state);
+	// input_rdy?
+	void input_kbde(int state);
 
 protected:
 	// device-level overrides
@@ -38,15 +45,34 @@ protected:
 	virtual void device_start() override ATTR_COLD;
 	virtual void device_reset() override ATTR_COLD;
 
-	TIMER_CALLBACK_MEMBER(rx_timer_tick);
+	void tra_callback() override { m_tx_cb(transmit_register_get_data_bit()); }
+//  virtual void rcv_callback() override;
+	virtual void rcv_complete() override;
+	virtual void tra_complete() override;
+	void transmit_byte(u8 byte);
+	virtual void received_byte(u8 byte) override;
 
-	devcb_write_line    m_write_irq;
+	virtual void key_make(uint8_t row, uint8_t column) override;
+	virtual void key_break(uint8_t row, uint8_t column) override;
+	virtual void key_repeat(uint8_t row, uint8_t column) override;
+private:
 
-	emu_timer *         m_rxtimer;
-	uint8_t             m_rx_buf[0x80];
-	uint8_t             m_keyb_tx;
-	uint8_t             m_keyb_rx;
-	bool                m_key_avail;
+	static constexpr int START_BIT_COUNT = 1;
+	static constexpr int DATA_BIT_COUNT = 8;
+	static constexpr device_serial_interface::parity_t PARITY = device_serial_interface::PARITY_ODD;
+	static constexpr device_serial_interface::stop_bits_t STOP_BITS = device_serial_interface::STOP_BITS_1;
+	static constexpr int BAUD = 1'200;
+
+	uint8_t translate(uint8_t row, uint8_t column);
+	void send_key(uint8_t code);
+
+	devcb_write_line m_tx_cb;
+//  devcb_write_line m_rdy_cb;
+//  devcb_write_line m_rty_cb;
+
+//  bool m_repeat_state;
+	int m_kbde_state;
+	int m_rty_state;
 };
 
 
diff --git a/src/mame/nec/pc9821.cpp b/src/mame/nec/pc9821.cpp
index dcf07de2ffd..65b93aa23ab 100644
--- a/src/mame/nec/pc9821.cpp
+++ b/src/mame/nec/pc9821.cpp
@@ -414,7 +414,7 @@ void pc9821_state::pc9821_io(address_map &map)
 	map(0x0020, 0x002f).w(FUNC(pc9821_state::dmapg8_w)).umask32(0xff00ff00);
 	map(0x0030, 0x0037).rw(m_ppi_sys, FUNC(i8255_device::read), FUNC(i8255_device::write)).umask32(0xff00ff00); //i8251 RS232c / i8255 system port
 	map(0x0040, 0x0047).rw(m_ppi_prn, FUNC(i8255_device::read), FUNC(i8255_device::write)).umask32(0x00ff00ff);
-	map(0x0040, 0x0047).rw(m_keyb, FUNC(pc9801_kbd_device::rx_r), FUNC(pc9801_kbd_device::tx_w)).umask32(0xff00ff00); //i8255 printer port / i8251 keyboard
+	map(0x0040, 0x0043).rw(m_sio_kbd, FUNC(i8251_device::read), FUNC(i8251_device::write)).umask16(0xff00); //i8255 printer port / i8251 keyboard
 //  map(0x0050, 0x0053).w(FUNC(pc9821_state::nmi_ctrl_w)).umask32(0x00ff00ff);
 //  map(0x005c, 0x005f).r(FUNC(pc9821_state::timestamp_r)).nopw(); // artic
 //  map(0x0060, 0x0063).rw(m_hgdc[0], FUNC(upd7220_device::read), FUNC(upd7220_device::write)).umask32(0x00ff00ff); //upd7220 character ports / <undefined>
diff --git a/src/mame/nec/pc98ha.cpp b/src/mame/nec/pc98ha.cpp
index 21110ec1bc3..34c195538ce 100644
--- a/src/mame/nec/pc98ha.cpp
+++ b/src/mame/nec/pc98ha.cpp
@@ -152,9 +152,9 @@ void pc98lt_state::lt_io(address_map &map)
 //  map(0x0000, 0x001f) // PIC (bit 3 ON slave / master), V50 internal / <undefined>
 	map(0x0020, 0x002f).w(FUNC(pc98lt_state::rtc_w)).umask16(0x00ff);
 	map(0x0030, 0x0037).rw(m_ppi_sys, FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0xff00);
-	map(0x0030, 0x0033).rw(m_sio, FUNC(i8251_device::read), FUNC(i8251_device::write)).umask16(0x00ff); //i8251 RS232c / i8255 system port
+	map(0x0030, 0x0033).rw(m_sio_rs, FUNC(i8251_device::read), FUNC(i8251_device::write)).umask16(0x00ff); //i8251 RS232c / i8255 system port
 	map(0x0040, 0x0047).rw(m_ppi_prn, FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff);
-	map(0x0040, 0x0047).rw(m_keyb, FUNC(pc9801_kbd_device::rx_r), FUNC(pc9801_kbd_device::tx_w)).umask16(0xff00); //i8255 printer port / i8251 keyboard
+	map(0x0040, 0x0043).rw(m_sio_kbd, FUNC(i8251_device::read), FUNC(i8251_device::write)).umask16(0xff00); //i8255 printer port / i8251 keyboard
 //  map(0x0070, 0x007f) // PIT, V50 internal
 
 	// floppy actually requires a docking station on PC98HA, density should be 2dd given the mapping
@@ -436,13 +436,24 @@ void pc98lt_state::lt_config(machine_config &config)
 //  m_maincpu->set_tclk(xtal / 4);
 	m_maincpu->set_tclk(xtal / 100);
 //  m_pit->out_handler<0>().set(m_pic1, FUNC(pic8259_device::ir0_w));
-	m_maincpu->tout2_cb().set(m_sio, FUNC(i8251_device::write_txc));
-	m_maincpu->tout2_cb().append(m_sio, FUNC(i8251_device::write_rxc));
-
+	m_maincpu->tout2_cb().set(m_sio_rs, FUNC(i8251_device::write_txc));
+	m_maincpu->tout2_cb().append(m_sio_rs, FUNC(i8251_device::write_rxc));
 //  m_maincpu->set_irq_acknowledge_callback("pic8259_master", FUNC(pic8259_device::inta_cb));
 
-	PC9801_KBD(config, m_keyb, 53);
-	m_keyb->irq_wr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ1);
+	pc9801_serial(config);
+
+	I8251(config, m_sio_kbd, 0);
+	m_sio_kbd->txd_handler().set("keyb", FUNC(pc9801_kbd_device::input_txd));
+	m_sio_kbd->rxrdy_handler().set_inputline(m_maincpu, INPUT_LINE_IRQ1);
+	m_sio_kbd->write_cts(0);
+	m_sio_kbd->write_dsr(0);
+
+	clock_device &kbd_clock(CLOCK(config, "kbd_clock", 19'200));
+	kbd_clock.signal_handler().set(m_sio_kbd, FUNC(i8251_device::write_rxc));
+	kbd_clock.signal_handler().append(m_sio_kbd, FUNC(i8251_device::write_txc));
+
+	PC9801_KBD(config, m_keyb, 0);
+	m_keyb->rxd_callback().set("sio_kbd", FUNC(i8251_device::write_rxd));
 
 	I8255(config, m_ppi_sys, 0);
 	// PC98LT/HA has no dips, port A acts as a RAM storage
@@ -451,8 +462,6 @@ void pc98lt_state::lt_config(machine_config &config)
 //  m_ppi_sys->in_pc_callback().set_constant(0xa0); // 0x80 cpu triple fault reset flag?
 	m_ppi_sys->out_pc_callback().set(FUNC(pc98lt_state::ppi_sys_beep_portc_w));
 
-	pc9801_serial(config);
-
 	I8255(config, m_ppi_prn, 0);
 	m_ppi_prn->in_pb_callback().set_ioport("PRNB");