--- np2/io/serial.c	2004/02/18 03:24:48	1.12
+++ np2/io/serial.c	2004/03/30 08:48:46	1.16
@@ -9,12 +9,20 @@
 
 static void keyboard_int(BOOL absolute) {
 
-	if (keybrd.buffers) {
+	if ((keybrd.ctrls) || (keybrd.buffers)) {
 		if (!(keybrd.status & 2)) {
 			keybrd.status |= 2;
-			keybrd.data = keybrd.buf[keybrd.pos];
-			keybrd.pos = (keybrd.pos + 1) & KB_BUFMASK;
-			keybrd.buffers--;
+			if (keybrd.ctrls) {
+				keybrd.ctrls--;
+				keybrd.data = keybrd.ctr[keybrd.ctrpos];
+				keybrd.ctrpos = (keybrd.ctrpos + 1) & KB_CTRMASK;
+			}
+			else if (keybrd.buffers) {
+				keybrd.buffers--;
+				keybrd.data = keybrd.buf[keybrd.bufpos];
+				keybrd.bufpos = (keybrd.bufpos + 1) & KB_BUFMASK;
+			}
+			TRACEOUT(("recv -> %02x", keybrd.data));
 		}
 		pic_setirq(1);
 		nevent_set(NEVENT_KEYBOARD, keybrd.xferclock,
@@ -31,7 +39,10 @@ void keyboard_callback(NEVENTITEM item) 
 
 static void IOOUTCALL keyboard_o41(UINT port, REG8 dat) {
 
-	keybrd.mode = dat;
+	if (keybrd.cmd & 1) {
+		TRACEOUT(("send -> %02x", dat));
+		keystat_ctrl(dat);
+	}
 	(void)port;
 }
 
@@ -74,7 +85,6 @@ void keyboard_reset(void) {
 
 	ZeroMemory(&keybrd, sizeof(keybrd));
 	keybrd.data = 0xff;
-	keybrd.mode = 0x5e;
 }
 
 void keyboard_bind(void) {
@@ -86,18 +96,31 @@ void keyboard_bind(void) {
 
 void keyboard_resetsignal(void) {
 
-	keybrd.mode = 0x5e;
 	keybrd.cmd = 0;
 	keybrd.status = 0;
+	keybrd.ctrls = 0;
 	keybrd.buffers = 0;
-	keybrd.pos = 0;
 	keystat_resendstat();
 }
 
+void keyboard_ctrl(REG8 data) {
+
+	if ((data == 0xfa) || (data == 0xfc)) {
+		keybrd.ctrls = 0;
+	}
+	if (keybrd.ctrls < KB_CTR) {
+		keybrd.ctr[(keybrd.ctrpos + keybrd.ctrls) & KB_CTRMASK] = data;
+		keybrd.ctrls++;
+		if (!nevent_iswork(NEVENT_KEYBOARD)) {
+			keyboard_int(NEVENT_ABSOLUTE);
+		}
+	}
+}
+
 void keyboard_send(REG8 data) {
 
 	if (keybrd.buffers < KB_BUF) {
-		keybrd.buf[(keybrd.pos + keybrd.buffers) & KB_BUFMASK] = data;
+		keybrd.buf[(keybrd.bufpos + keybrd.buffers) & KB_BUFMASK] = data;
 		keybrd.buffers++;
 		if (!nevent_iswork(NEVENT_KEYBOARD)) {
 			keyboard_int(NEVENT_ABSOLUTE);
@@ -242,6 +265,8 @@ static void IOOUTCALL rs232c_o32(UINT po
 			break;
 
 		case 0x02:			// cmd
+			sysport.c &= ~7;
+			sysport.c |= (dat & 7);
 			rs232c.pos++;
 			break;
 	}