diff --git a/src/devices/bus/apricot/keyboard/hle.cpp b/src/devices/bus/apricot/keyboard/hle.cpp
index c940b269233..4fb94c1f1a4 100644
--- a/src/devices/bus/apricot/keyboard/hle.cpp
+++ b/src/devices/bus/apricot/keyboard/hle.cpp
@@ -45,15 +45,7 @@
 ***************************************************************************/
 
 #include "hle.h"
-
-
-//**************************************************************************
-//  CONSTANTS / MACROS
-//**************************************************************************
-
-#define APRICOT_KEY(_key, _index) \
-		PORT_BIT(1 << _key, IP_ACTIVE_HIGH, IPT_KEYBOARD) \
-		PORT_CHANGED_MEMBER(DEVICE_SELF, apricot_keyboard_hle_device, key_callback, (void *) _index)
+#include "machine/keyboard.ipp"
 
 
 //**************************************************************************
@@ -68,110 +60,128 @@ const device_type APRICOT_KEYBOARD_HLE = &device_creator<apricot_keyboard_hle_de
 //-------------------------------------------------
 
 static INPUT_PORTS_START( keyboard )
-	PORT_START("keyboard_0")
-	PORT_BIT(1 << 0, IP_ACTIVE_HIGH, IPT_UNUSED)
-	APRICOT_KEY( 1, nullptr) PORT_CODE(KEYCODE_F7)        PORT_CHAR(UCHAR_MAMEKEY(F7))     PORT_NAME("Help")
-	APRICOT_KEY( 2, nullptr) PORT_CODE(KEYCODE_F8)        PORT_CHAR(UCHAR_MAMEKEY(F8))     PORT_NAME("Undo")
-	APRICOT_KEY( 3, nullptr) PORT_CODE(KEYCODE_F9)        PORT_CHAR(UCHAR_MAMEKEY(F9))     PORT_NAME("Repeat")
-	APRICOT_KEY( 4, nullptr) PORT_CODE(KEYCODE_F10)       PORT_CHAR(UCHAR_MAMEKEY(F10))    PORT_NAME("Calc")
-	APRICOT_KEY( 5, nullptr) PORT_CODE(KEYCODE_PRTSCR)    PORT_CHAR(UCHAR_MAMEKEY(PRTSCR)) PORT_NAME("Print")
-	APRICOT_KEY( 6, nullptr) PORT_CODE(KEYCODE_CANCEL)    PORT_CHAR(UCHAR_MAMEKEY(CANCEL)) PORT_NAME("Intr")
-	APRICOT_KEY( 7, nullptr) PORT_CODE(KEYCODE_F11)       PORT_CHAR(UCHAR_MAMEKEY(F11))    PORT_NAME("Menu")
-	APRICOT_KEY( 8, nullptr) PORT_CODE(KEYCODE_F12)       PORT_CHAR(UCHAR_MAMEKEY(F12))    PORT_NAME("Finish")
-	APRICOT_KEY( 9, nullptr) PORT_CODE(KEYCODE_F1)        PORT_CHAR(UCHAR_MAMEKEY(F1))     PORT_NAME("Function 1")
-	APRICOT_KEY(10, nullptr) PORT_CODE(KEYCODE_F2)        PORT_CHAR(UCHAR_MAMEKEY(F2))     PORT_NAME("Function 2")
-	APRICOT_KEY(11, nullptr) PORT_CODE(KEYCODE_F3)        PORT_CHAR(UCHAR_MAMEKEY(F3))     PORT_NAME("Function 3")
-	APRICOT_KEY(12, nullptr) PORT_CODE(KEYCODE_F4)        PORT_CHAR(UCHAR_MAMEKEY(F4))     PORT_NAME("Function 4")
-	APRICOT_KEY(13, nullptr) PORT_CODE(KEYCODE_F5)        PORT_CHAR(UCHAR_MAMEKEY(F5))     PORT_NAME("Function 5")
-	APRICOT_KEY(14, nullptr) PORT_CODE(KEYCODE_F6)        PORT_CHAR(UCHAR_MAMEKEY(F6))     PORT_NAME("Function 6")
-	APRICOT_KEY(15, nullptr) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('\\') PORT_CHAR('^')
-	APRICOT_KEY(16, nullptr) PORT_CODE(KEYCODE_1)         PORT_CHAR('1')  PORT_CHAR('!')
-	APRICOT_KEY(17, nullptr) PORT_CODE(KEYCODE_2)         PORT_CHAR('2')  PORT_CHAR('@')
-	APRICOT_KEY(18, nullptr) PORT_CODE(KEYCODE_3)         PORT_CHAR('3')  PORT_CHAR('#')
-	APRICOT_KEY(19, nullptr) PORT_CODE(KEYCODE_4)         PORT_CHAR('4')  PORT_CHAR(0xa3) // pound
-	APRICOT_KEY(20, nullptr) PORT_CODE(KEYCODE_5)         PORT_CHAR('5')  PORT_CHAR('%')
-	APRICOT_KEY(21, nullptr) PORT_CODE(KEYCODE_6)         PORT_CHAR('6')  PORT_CHAR('$')
-	APRICOT_KEY(22, nullptr) PORT_CODE(KEYCODE_7)         PORT_CHAR('7')  PORT_CHAR('&')
-	APRICOT_KEY(23, nullptr) PORT_CODE(KEYCODE_8)         PORT_CHAR('8')  PORT_CHAR('*')
-	APRICOT_KEY(24, nullptr) PORT_CODE(KEYCODE_9)         PORT_CHAR('9')  PORT_CHAR('(')
-	APRICOT_KEY(25, nullptr) PORT_CODE(KEYCODE_0)         PORT_CHAR('0')  PORT_CHAR(')')
-	APRICOT_KEY(26, nullptr) PORT_CODE(KEYCODE_MINUS)     PORT_CHAR('-')  PORT_CHAR('_')
-	APRICOT_KEY(27, nullptr) PORT_CODE(KEYCODE_EQUALS)    PORT_CHAR('=')  PORT_CHAR('+')
-	APRICOT_KEY(28, nullptr) PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(9)
-	PORT_BIT(1 << 29, IP_ACTIVE_HIGH, IPT_UNUSED) // actually a dedicated % key
-	APRICOT_KEY(30, nullptr) PORT_CODE(KEYCODE_ASTERISK)  PORT_CHAR(UCHAR_MAMEKEY(ASTERISK))
-	APRICOT_KEY(31, nullptr) PORT_CODE(KEYCODE_SLASH_PAD) PORT_CHAR(UCHAR_MAMEKEY(SLASH_PAD))
+	PORT_START("row_0")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_F7)         PORT_CHAR(UCHAR_MAMEKEY(F7))      PORT_NAME("Help")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_F8)         PORT_CHAR(UCHAR_MAMEKEY(F8))      PORT_NAME("Undo")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_F9)         PORT_CHAR(UCHAR_MAMEKEY(F9))      PORT_NAME("Repeat")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_F10)        PORT_CHAR(UCHAR_MAMEKEY(F10))     PORT_NAME("Calc")
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_PRTSCR)     PORT_CHAR(UCHAR_MAMEKEY(PRTSCR))  PORT_NAME("Print")
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_CANCEL)     PORT_CHAR(UCHAR_MAMEKEY(CANCEL))  PORT_NAME("Intr")
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_F11)        PORT_CHAR(UCHAR_MAMEKEY(F11))     PORT_NAME("Menu")
 
-	PORT_START("keyboard_1")
-	APRICOT_KEY( 0, 1) PORT_CODE(KEYCODE_MINUS_PAD)  PORT_CHAR(UCHAR_MAMEKEY(MINUS_PAD))
-	APRICOT_KEY( 1, 1) PORT_CODE(KEYCODE_PLUS_PAD)   PORT_CHAR(UCHAR_MAMEKEY(PLUS_PAD))
-	APRICOT_KEY( 2, 1) PORT_CODE(KEYCODE_TAB)        PORT_CHAR(9)
-	APRICOT_KEY( 3, 1) PORT_CODE(KEYCODE_Q)          PORT_CHAR('q')  PORT_CHAR('Q')
-	APRICOT_KEY( 4, 1) PORT_CODE(KEYCODE_W)          PORT_CHAR('w')  PORT_CHAR('W')
-	APRICOT_KEY( 5, 1) PORT_CODE(KEYCODE_E)          PORT_CHAR('e')  PORT_CHAR('E')
-	APRICOT_KEY( 6, 1) PORT_CODE(KEYCODE_R)          PORT_CHAR('r')  PORT_CHAR('R')
-	APRICOT_KEY( 7, 1) PORT_CODE(KEYCODE_T)          PORT_CHAR('t')  PORT_CHAR('T')
-	APRICOT_KEY( 8, 1) PORT_CODE(KEYCODE_Y)          PORT_CHAR('y')  PORT_CHAR('Y')
-	APRICOT_KEY( 9, 1) PORT_CODE(KEYCODE_U)          PORT_CHAR('u')  PORT_CHAR('U')
-	APRICOT_KEY(10, 1) PORT_CODE(KEYCODE_I)          PORT_CHAR('i')  PORT_CHAR('I')
-	APRICOT_KEY(11, 1) PORT_CODE(KEYCODE_O)          PORT_CHAR('o')  PORT_CHAR('O')
-	APRICOT_KEY(12, 1) PORT_CODE(KEYCODE_P)          PORT_CHAR('p')  PORT_CHAR('P')
-	APRICOT_KEY(13, 1) PORT_CODE(KEYCODE_OPENBRACE)  PORT_CHAR('[')  PORT_CHAR('{')
-	APRICOT_KEY(14, 1) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']')  PORT_CHAR('}')
-	APRICOT_KEY(15, 1) PORT_CODE(KEYCODE_HOME)       PORT_CHAR(UCHAR_MAMEKEY(HOME))
-	APRICOT_KEY(16, 1) PORT_CODE(KEYCODE_END)        PORT_CHAR(UCHAR_MAMEKEY(END))      PORT_NAME("Clear")
-	APRICOT_KEY(17, 1) PORT_CODE(KEYCODE_7_PAD)      PORT_CHAR(UCHAR_MAMEKEY(7_PAD))
-	APRICOT_KEY(18, 1) PORT_CODE(KEYCODE_8_PAD)      PORT_CHAR(UCHAR_MAMEKEY(8_PAD))
-	APRICOT_KEY(19, 1) PORT_CODE(KEYCODE_9_PAD)      PORT_CHAR(UCHAR_MAMEKEY(9_PAD))
-	APRICOT_KEY(20, 1) PORT_CODE(KEYCODE_CAPSLOCK)   PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK))
-	APRICOT_KEY(21, 1) PORT_CODE(KEYCODE_A)          PORT_CHAR('a')   PORT_CHAR('A')
-	APRICOT_KEY(22, 1) PORT_CODE(KEYCODE_S)          PORT_CHAR('s')   PORT_CHAR('S')
-	APRICOT_KEY(23, 1) PORT_CODE(KEYCODE_D)          PORT_CHAR('d')   PORT_CHAR('D')
-	APRICOT_KEY(24, 1) PORT_CODE(KEYCODE_F)          PORT_CHAR('f')   PORT_CHAR('F')
-	APRICOT_KEY(25, 1) PORT_CODE(KEYCODE_G)          PORT_CHAR('g')   PORT_CHAR('G')
-	APRICOT_KEY(26, 1) PORT_CODE(KEYCODE_H)          PORT_CHAR('h')   PORT_CHAR('H')
-	APRICOT_KEY(27, 1) PORT_CODE(KEYCODE_J)          PORT_CHAR('j')   PORT_CHAR('J')
-	APRICOT_KEY(28, 1) PORT_CODE(KEYCODE_K)          PORT_CHAR('k')   PORT_CHAR('K')
-	APRICOT_KEY(29, 1) PORT_CODE(KEYCODE_L)          PORT_CHAR('l')   PORT_CHAR('L')
-	APRICOT_KEY(30, 1) PORT_CODE(KEYCODE_COLON)      PORT_CHAR(';')   PORT_CHAR(':')
-	APRICOT_KEY(31, 1) PORT_CODE(KEYCODE_QUOTE)      PORT_CHAR('\'')  PORT_CHAR('"')
+	PORT_START("row_1")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_F12)        PORT_CHAR(UCHAR_MAMEKEY(F12))     PORT_NAME("Finish")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_F1)         PORT_CHAR(UCHAR_MAMEKEY(F1))      PORT_NAME("Function 1")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_F2)         PORT_CHAR(UCHAR_MAMEKEY(F2))      PORT_NAME("Function 2")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_F3)         PORT_CHAR(UCHAR_MAMEKEY(F3))      PORT_NAME("Function 3")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_F4)         PORT_CHAR(UCHAR_MAMEKEY(F4))      PORT_NAME("Function 4")
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_F5)         PORT_CHAR(UCHAR_MAMEKEY(F5))      PORT_NAME("Function 5")
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_F6)         PORT_CHAR(UCHAR_MAMEKEY(F6))      PORT_NAME("Function 6")
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_BACKSLASH)  PORT_CHAR('\\') PORT_CHAR('^')
 
-	PORT_START("keyboard_2")
-	APRICOT_KEY( 0, 2) PORT_CODE(KEYCODE_ENTER)      PORT_CHAR(13)
-	APRICOT_KEY( 1, 2) PORT_CODE(KEYCODE_INSERT)     PORT_CHAR(UCHAR_MAMEKEY(INSERT))
-	APRICOT_KEY( 2, 2) PORT_CODE(KEYCODE_DEL)        PORT_CHAR(UCHAR_MAMEKEY(DEL))
-	APRICOT_KEY( 3, 2) PORT_CODE(KEYCODE_4_PAD)      PORT_CHAR(UCHAR_MAMEKEY(4_PAD))
-	APRICOT_KEY( 4, 2) PORT_CODE(KEYCODE_5_PAD)      PORT_CHAR(UCHAR_MAMEKEY(5_PAD))
-	APRICOT_KEY( 5, 2) PORT_CODE(KEYCODE_6_PAD)      PORT_CHAR(UCHAR_MAMEKEY(6_PAD))
-	APRICOT_KEY( 6, 2) PORT_CODE(KEYCODE_LSHIFT)     PORT_CHAR(UCHAR_SHIFT_1)
-	APRICOT_KEY( 7, 2) PORT_CODE(KEYCODE_Z)          PORT_CHAR('z')  PORT_CHAR('Z')
-	APRICOT_KEY( 8, 2) PORT_CODE(KEYCODE_X)          PORT_CHAR('x')  PORT_CHAR('X')
-	APRICOT_KEY( 9, 2) PORT_CODE(KEYCODE_C)          PORT_CHAR('c')  PORT_CHAR('C')
-	APRICOT_KEY(10, 2) PORT_CODE(KEYCODE_V)          PORT_CHAR('v')  PORT_CHAR('V')
-	APRICOT_KEY(11, 2) PORT_CODE(KEYCODE_B)          PORT_CHAR('b')  PORT_CHAR('B')
-	APRICOT_KEY(12, 2) PORT_CODE(KEYCODE_N)          PORT_CHAR('n')  PORT_CHAR('N')
-	APRICOT_KEY(13, 2) PORT_CODE(KEYCODE_M)          PORT_CHAR('m')  PORT_CHAR('M')
-	APRICOT_KEY(14, 2) PORT_CODE(KEYCODE_COMMA)      PORT_CHAR(',')  PORT_CHAR('<')
-	APRICOT_KEY(15, 2) PORT_CODE(KEYCODE_STOP)       PORT_CHAR('.')  PORT_CHAR('>')
-	APRICOT_KEY(16, 2) PORT_CODE(KEYCODE_SLASH)      PORT_CHAR('/')  PORT_CHAR('?')
-	APRICOT_KEY(17, 2) PORT_CODE(KEYCODE_RSHIFT)     PORT_CHAR(UCHAR_SHIFT_1)
-	APRICOT_KEY(18, 2) PORT_CODE(KEYCODE_UP)         PORT_CHAR(UCHAR_MAMEKEY(UP))
-	APRICOT_KEY(19, 2) PORT_CODE(KEYCODE_SCRLOCK)    PORT_CHAR(UCHAR_MAMEKEY(SCRLOCK))
-	APRICOT_KEY(20, 2) PORT_CODE(KEYCODE_1_PAD)      PORT_CHAR(UCHAR_MAMEKEY(1_PAD))
-	APRICOT_KEY(21, 2) PORT_CODE(KEYCODE_2_PAD)      PORT_CHAR(UCHAR_MAMEKEY(2_PAD))
-	APRICOT_KEY(22, 2) PORT_CODE(KEYCODE_3_PAD)      PORT_CHAR(UCHAR_MAMEKEY(3_PAD))
-	APRICOT_KEY(23, 2) PORT_CODE(KEYCODE_ESC)        PORT_CHAR(UCHAR_MAMEKEY(ESC))
-	APRICOT_KEY(24, 2) PORT_CODE(KEYCODE_LCONTROL)   PORT_CHAR(UCHAR_SHIFT_2)
-	APRICOT_KEY(25, 2) PORT_CODE(KEYCODE_SPACE)      PORT_CHAR(' ')
-	APRICOT_KEY(26, 2) PORT_CODE(KEYCODE_RCONTROL)   PORT_CHAR(UCHAR_MAMEKEY(PAUSE)) PORT_NAME("Stop")
-	APRICOT_KEY(27, 2) PORT_CODE(KEYCODE_LEFT)       PORT_CHAR(UCHAR_MAMEKEY(LEFT))
-	APRICOT_KEY(28, 2) PORT_CODE(KEYCODE_DOWN)       PORT_CHAR(UCHAR_MAMEKEY(DOWN))
-	APRICOT_KEY(29, 2) PORT_CODE(KEYCODE_RIGHT)      PORT_CHAR(UCHAR_MAMEKEY(RIGHT))
-	APRICOT_KEY(30, 2) PORT_CODE(KEYCODE_0_PAD)      PORT_CHAR(UCHAR_MAMEKEY(0_PAD))
-	APRICOT_KEY(31, 2) PORT_CODE(KEYCODE_DEL_PAD)    PORT_CHAR(UCHAR_MAMEKEY(DEL_PAD))
+	PORT_START("row_2")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_1)          PORT_CHAR('1')  PORT_CHAR('!')
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_2)          PORT_CHAR('2')  PORT_CHAR('@')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_3)          PORT_CHAR('3')  PORT_CHAR('#')
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_4)          PORT_CHAR('4')  PORT_CHAR(0xa3) // pound
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_5)          PORT_CHAR('5')  PORT_CHAR('%')
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_6)          PORT_CHAR('6')  PORT_CHAR('$')
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_7)          PORT_CHAR('7')  PORT_CHAR('&')
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_8)          PORT_CHAR('8')  PORT_CHAR('*')
 
-	PORT_START("keyboard_3")
-	APRICOT_KEY( 0, 3) PORT_CODE(KEYCODE_ENTER_PAD)  PORT_CHAR(UCHAR_MAMEKEY(ENTER_PAD))
+	PORT_START("row_3")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_9)          PORT_CHAR('9')  PORT_CHAR('(')
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_0)          PORT_CHAR('0')  PORT_CHAR(')')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_MINUS)      PORT_CHAR('-')  PORT_CHAR('_')
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_EQUALS)     PORT_CHAR('=')  PORT_CHAR('+')
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)    PORT_CODE(KEYCODE_BACKSPACE)  PORT_CHAR(8)
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD)  // actually a dedicated % key
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_ASTERISK)   PORT_CHAR(UCHAR_MAMEKEY(ASTERISK))
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_SLASH_PAD)  PORT_CHAR(UCHAR_MAMEKEY(SLASH_PAD))
+
+	PORT_START("row_4")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_MINUS_PAD)  PORT_CHAR(UCHAR_MAMEKEY(MINUS_PAD))
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_PLUS_PAD)   PORT_CHAR(UCHAR_MAMEKEY(PLUS_PAD))
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_TAB)        PORT_CHAR(9)
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_Q)          PORT_CHAR('q')  PORT_CHAR('Q')
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_W)          PORT_CHAR('w')  PORT_CHAR('W')
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_E)          PORT_CHAR('e')  PORT_CHAR('E')
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_R)          PORT_CHAR('r')  PORT_CHAR('R')
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_T)          PORT_CHAR('t')  PORT_CHAR('T')
+
+	PORT_START("row_5")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_Y)          PORT_CHAR('y')  PORT_CHAR('Y')
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_U)          PORT_CHAR('u')  PORT_CHAR('U')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_I)          PORT_CHAR('i')  PORT_CHAR('I')
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_O)          PORT_CHAR('o')  PORT_CHAR('O')
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_P)          PORT_CHAR('p')  PORT_CHAR('P')
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_OPENBRACE)  PORT_CHAR('[')  PORT_CHAR('{')
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']')  PORT_CHAR('}')
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_HOME)       PORT_CHAR(UCHAR_MAMEKEY(HOME))
+
+	PORT_START("row_6")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_END)        PORT_CHAR(UCHAR_MAMEKEY(END))      PORT_NAME("Clear")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_7_PAD)      PORT_CHAR(UCHAR_MAMEKEY(7_PAD))
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_8_PAD)      PORT_CHAR(UCHAR_MAMEKEY(8_PAD))
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_9_PAD)      PORT_CHAR(UCHAR_MAMEKEY(9_PAD))
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_CAPSLOCK)   PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK))
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_A)          PORT_CHAR('a')   PORT_CHAR('A')
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_S)          PORT_CHAR('s')   PORT_CHAR('S')
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_D)          PORT_CHAR('d')   PORT_CHAR('D')
+
+	PORT_START("row_7")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_F)          PORT_CHAR('f')   PORT_CHAR('F')
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_G)          PORT_CHAR('g')   PORT_CHAR('G')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_H)          PORT_CHAR('h')   PORT_CHAR('H')
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_J)          PORT_CHAR('j')   PORT_CHAR('J')
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_K)          PORT_CHAR('k')   PORT_CHAR('K')
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_L)          PORT_CHAR('l')   PORT_CHAR('L')
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_COLON)      PORT_CHAR(';')   PORT_CHAR(':')
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_QUOTE)      PORT_CHAR('\'')  PORT_CHAR('"')
+
+	PORT_START("row_8")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_ENTER)      PORT_CHAR(13)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_INSERT)     PORT_CHAR(UCHAR_MAMEKEY(INSERT))
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_DEL)        PORT_CHAR(UCHAR_MAMEKEY(DEL))
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_4_PAD)      PORT_CHAR(UCHAR_MAMEKEY(4_PAD))
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_5_PAD)      PORT_CHAR(UCHAR_MAMEKEY(5_PAD))
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_6_PAD)      PORT_CHAR(UCHAR_MAMEKEY(6_PAD))
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_LSHIFT)     PORT_CHAR(UCHAR_SHIFT_1)
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_Z)          PORT_CHAR('z')  PORT_CHAR('Z')
+
+	PORT_START("row_9")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_X)          PORT_CHAR('x')  PORT_CHAR('X')
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_C)          PORT_CHAR('c')  PORT_CHAR('C')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_V)          PORT_CHAR('v')  PORT_CHAR('V')
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_B)          PORT_CHAR('b')  PORT_CHAR('B')
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_N)          PORT_CHAR('n')  PORT_CHAR('N')
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_M)          PORT_CHAR('m')  PORT_CHAR('M')
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_COMMA)      PORT_CHAR(',')  PORT_CHAR('<')
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_STOP)       PORT_CHAR('.')  PORT_CHAR('>')
+
+	PORT_START("row_a")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_SLASH)      PORT_CHAR('/')  PORT_CHAR('?')
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_RSHIFT)     PORT_CHAR(UCHAR_SHIFT_1)
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_UP)         PORT_CHAR(UCHAR_MAMEKEY(UP))
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_SCRLOCK)    PORT_CHAR(UCHAR_MAMEKEY(SCRLOCK))
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_1_PAD)      PORT_CHAR(UCHAR_MAMEKEY(1_PAD))
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_2_PAD)      PORT_CHAR(UCHAR_MAMEKEY(2_PAD))
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_3_PAD)      PORT_CHAR(UCHAR_MAMEKEY(3_PAD))
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_ESC)        PORT_CHAR(UCHAR_MAMEKEY(ESC))
+
+	PORT_START("row_b")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_LCONTROL)   PORT_CHAR(UCHAR_SHIFT_2)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_SPACE)      PORT_CHAR(' ')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_RCONTROL)   PORT_CHAR(UCHAR_MAMEKEY(PAUSE))    PORT_NAME("Stop")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_LEFT)       PORT_CHAR(UCHAR_MAMEKEY(LEFT))
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_DOWN)       PORT_CHAR(UCHAR_MAMEKEY(DOWN))
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_RIGHT)      PORT_CHAR(UCHAR_MAMEKEY(RIGHT))
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_0_PAD)      PORT_CHAR(UCHAR_MAMEKEY(0_PAD))
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_DEL_PAD)    PORT_CHAR(UCHAR_MAMEKEY(DEL_PAD))
+
+	PORT_START("row_c")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD)  PORT_CODE(KEYCODE_ENTER_PAD)  PORT_CHAR(UCHAR_MAMEKEY(ENTER_PAD))
 INPUT_PORTS_END
 
 ioport_constructor apricot_keyboard_hle_device::device_input_ports() const
@@ -191,10 +201,8 @@ ioport_constructor apricot_keyboard_hle_device::device_input_ports() const
 apricot_keyboard_hle_device::apricot_keyboard_hle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
 	device_t(mconfig, APRICOT_KEYBOARD_HLE, "Apricot Keyboard (HLE)", tag, owner, clock, "apricotkb_hle", __FILE__),
 	device_apricot_keyboard_interface(mconfig, *this),
-	device_serial_interface(mconfig, *this),
-	m_rxd(1),
-	m_data_in(0),
-	m_data_out(0)
+	device_buffered_serial_interface(mconfig, *this),
+	device_matrix_keyboard_interface(mconfig, *this, "row_0", "row_1", "row_2", "row_3", "row_4", "row_5", "row_6", "row_7", "row_8", "row_9", "row_a", "row_b", "row_c")
 {
 }
 
@@ -204,6 +212,7 @@ apricot_keyboard_hle_device::apricot_keyboard_hle_device(const machine_config &m
 
 void apricot_keyboard_hle_device::device_start()
 {
+	device_buffered_serial_interface::register_save_state(machine().save(), this);
 }
 
 //-------------------------------------------------
@@ -212,21 +221,17 @@ void apricot_keyboard_hle_device::device_start()
 
 void apricot_keyboard_hle_device::device_reset()
 {
+	clear_fifo();
+
 	receive_register_reset();
 	transmit_register_reset();
 
 	set_data_frame(1, 8, PARITY_NONE, STOP_BITS_1);
 	set_rcv_rate(7800);
 	set_tra_rate(7800);
-}
 
-//-------------------------------------------------
-//  device_timer - device-specific timer
-//-------------------------------------------------
-
-void apricot_keyboard_hle_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
-{
-	device_serial_interface::device_timer(timer, id, param, ptr);
+	reset_key_state();
+	start_processing(attotime::from_hz(7800));
 }
 
 void apricot_keyboard_hle_device::tra_callback()
@@ -236,49 +241,54 @@ void apricot_keyboard_hle_device::tra_callback()
 
 void apricot_keyboard_hle_device::tra_complete()
 {
-	if (m_data_out != 0)
-	{
-		transmit_register_setup(m_data_out);
-		m_data_out = 0;
-	}
+	device_buffered_serial_interface::tra_complete();
 }
 
-void apricot_keyboard_hle_device::rcv_callback()
+void apricot_keyboard_hle_device::received_byte(UINT8 byte)
 {
-	receive_register_update_bit(m_rxd);
+	logerror("received command: %02x\n", byte);
 }
 
-void apricot_keyboard_hle_device::rcv_complete()
-{
-	receive_register_extract();
-	m_data_in = get_received_char();
+//-------------------------------------------------
+//  key_make - handle a key being pressed
+//-------------------------------------------------
 
-	// reset command? send keyboard ready (likely needs a delay, just disable for now)
-//  if (m_data_in == 0xe8)
-//      transmit_register_setup(0xfb);
+void apricot_keyboard_hle_device::key_make(UINT8 row, UINT8 column)
+{
+	// send the make code
+	transmit_byte((row << 3) | column);
+}
+
+//-------------------------------------------------
+//  key_break - handle a key being released
+//-------------------------------------------------
+
+void apricot_keyboard_hle_device::key_break(UINT8 row, UINT8 column)
+{
+	// send the break code
+	transmit_byte(0x80 | (row << 3) | column);
 }
 
 void apricot_keyboard_hle_device::out_w(int state)
 {
-	m_rxd = state;
-	device_serial_interface::rx_w(m_rxd);
+	device_buffered_serial_interface::rx_w(state);
 }
 
-INPUT_CHANGED_MEMBER( apricot_keyboard_hle_device::key_callback )
+//-------------------------------------------------
+//  transmit_byte - send a byte or queue it
+//-------------------------------------------------
+
+void apricot_keyboard_hle_device::transmit_byte(UINT8 byte)
 {
-	UINT32 oldvalue = oldval * field.mask(), newvalue = newval * field.mask();
-	UINT32 delta = oldvalue ^ newvalue;
-
-	for (int i = 0; i < 32; i++)
-	{
-		if (delta & (1 << i))
-		{
-			UINT8 down = (newvalue & (1 << i)) ? 0x00 : 0x80;
-			UINT8 scancode = (FPTR) param * 32 + i;
-			scancode |= down;
-			transmit_register_setup(scancode);
-			break;
-		}
-	}
-
+	device_buffered_serial_interface::transmit_byte(byte);
+}
+
+//-------------------------------------------------
+//  device_timer - device-specific timer
+//-------------------------------------------------
+
+void apricot_keyboard_hle_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
+{
+	device_matrix_keyboard_interface::device_timer(timer, id, param, ptr);
+	device_buffered_serial_interface::device_timer(timer, id, param, ptr);
 }
diff --git a/src/devices/bus/apricot/keyboard/hle.h b/src/devices/bus/apricot/keyboard/hle.h
index e6ce8ee9df5..a0d8b1b306f 100644
--- a/src/devices/bus/apricot/keyboard/hle.h
+++ b/src/devices/bus/apricot/keyboard/hle.h
@@ -13,6 +13,7 @@
 
 #include "emu.h"
 #include "keyboard.h"
+#include "machine/keyboard.h"
 
 
 //**************************************************************************
@@ -21,14 +22,15 @@
 
 // ======================> apricot_keyboard_hle_device
 
-class apricot_keyboard_hle_device : public device_t, public device_apricot_keyboard_interface, public device_serial_interface
+class apricot_keyboard_hle_device : public device_t,
+                                    public device_apricot_keyboard_interface,
+									public device_buffered_serial_interface<8>,
+									protected device_matrix_keyboard_interface<13>
 {
 public:
 	// construction/destruction
 	apricot_keyboard_hle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
 
-	DECLARE_INPUT_CHANGED_MEMBER(key_callback);
-
 	// from host
 	virtual void out_w(int state) override;
 
@@ -38,19 +40,19 @@ protected:
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
-	// device_serial_interface overrides
+	// device_buffered_serial_interface overrides
 	virtual void tra_callback() override;
 	virtual void tra_complete() override;
-	virtual void rcv_callback() override;
-	virtual void rcv_complete() override;
+	virtual void received_byte(UINT8 byte) override;
+
+	// device_matrix_keyboard_interface overrides
+	virtual void key_make(UINT8 row, UINT8 column) override;
+	virtual void key_break(UINT8 row, UINT8 column) override;
+	void transmit_byte(UINT8 byte);
 
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 
 private:
-	int m_rxd;
-
-	UINT8 m_data_in;
-	UINT8 m_data_out;
 };