--- np2/io/serial.c	2003/11/13 07:47:17	1.5
+++ np2/io/serial.c	2004/03/31 11:59:18	1.18
@@ -1,386 +1,144 @@
 #include	"compiler.h"
+#include	"cpucore.h"
 #include	"commng.h"
 #include	"pccore.h"
 #include	"iocore.h"
+#include	"keystat.h"
 
 
-static const BYTE joykeytable[12] = {
-				0x2a,	0x34,
-				0x29,	0x1c,
-				0x3c,	0x48,
-				0x3b,	0x46,
-				0x3d,	0x4b,
-				0x3a,	0x43};
-
-static const BYTE kbexflag[0x80] = {
-		//	 ESC,  １,  ２,  ３,  ４,  ５,  ６,  ７		; 00h
-			   0,   0,   0,   0,   0,   0,   0,   0,
-		//	  ８,  ９,  ０,  −,  ＾,  ￥,  BS, TAB		; 08h
-			   0,   0,   0,   0,   0,   0,   0,   0,
-		//	  Ｑ,  Ｗ,  Ｅ,  Ｒ,  Ｔ,  Ｙ,  Ｕ,  Ｉ		; 10h
-			   0,   0,   0,   0,   0,   0,   0,   0,
-		//	  Ｏ,  Ｐ,  ＠,  ［, Ret,  Ａ,  Ｓ,  Ｄ		; 18h
-			   0,   0,   0,   0,   1,   0,   0,   0,
-		//	  Ｆ,  Ｇ,  Ｈ,  Ｊ,  Ｋ,  Ｌ,  ；,  ：		; 20h
-			   0,   0,   0,   0,   0,   0,   0,   0,
-		//    ］,  Ｚ,  Ｘ,  Ｃ,  Ｖ,  Ｂ,  Ｎ,  Ｍ		; 28h
-			   0,   1,   1,   0,   0,   0,   0,   0,
-		//    ，,  ．,  ／,  ＿, SPC,XFER,RLUP,RLDN		; 30h
-			   0,   0,   0,   0,   1,   0,   0,   0,
-		//	 INS, DEL,  ↑,  ←,  →,  ↓,HMCR,HELP		; 38h
-			   2,   0,   1,   1,   1,   1,   0,   0,
-		//	<−>,<／>,<７>,<８>,<９>,<＊>,<４>,<５>		; 40h
-			   0,   0,   0,   1,   0,   0,   1,   0,
-		//	<６>,<＋>,<１>,<２>,<３>,<＝>,<０>,<，>		; 48h
-			   1,   0,   0,   1,   0,   0,   0,   0,
-		//	<．>,NFER,vf.1,vf.2,vf.3,vf.4,vf.5,   		; 50h
-			   0,   0,   2,   2,   2,   2,   2,   0,
-		//	    ,    ,    ,    ,    ,    ,HOME,   		; 58h
-			   0,   0,   0,   0,   0,   0,   0,   0,
-		//	STOP,COPY, f.1, f.2, f.3, f.4, f.5, f.6		; 60h
-			   0,   0,   2,   2,   2,   2,   2,   2,
-		//	 f.7, f.8, f.9, f10,    ,    ,    ,   		; 68h
-			   2,   2,   2,   2,   0,   0,   0,   0,
-		//	 SFT,CAPS,KANA,GRPH,CTRL,    ,    ,   		; 70h
-			   2,   2,   2,   2,   2,   0,   0,   0,
-		//	    ,    ,    ,    ,    ,    ,    ,   		; 78h
-			   0,   0,   0,   0,   0,   0,   0,   0};
-
-
-static void keyb_int(BOOL absolute) {
-
-	if (keyb.buffers) {
-		if (!((pic.pi[0].irr | pic.pi[0].isr) & PIC_KEYBOARD)) {
-			keyb.status |= 2;
-			keyb.data = keyb.buf[keyb.pos];
-			keyb.pos = (keyb.pos + 1) & KB_BUFMASK;
-			keyb.buffers--;
-			pic_setirq(1);
-		}
-		nevent_set(NEVENT_KEYBOARD, pc.keyboardclock,
-											keyb_callback, absolute);
-	}
-	else {
-		keyb.status &= ~2;
-	}
-}
-
-void keyb_callback(NEVENTITEM item) {
-
-	if (item->flag & NEVENT_SETEVENT) {
-		keyb_int(NEVENT_RELATIVE);
-	}
-}
-
-static void keyb_out(BYTE data) {
-
-	if (keyb.buffers < KB_BUF) {
-		keyb.buf[(keyb.pos + keyb.buffers) & KB_BUFMASK] = data;
-		keyb.buffers++;
-		if (!nevent_iswork(NEVENT_KEYBOARD)) {
-			keyb_int(NEVENT_ABSOLUTE);
-		}
-	}
-	else {
-		keyb.status |= 0x10;
-	}
-}
-
-
-// ----
-
-	BYTE	keystat[0x80];
-
-void keystat_reset(void) {
-
-	ZeroMemory(keystat, sizeof(keystat));
-}
-
-
-void keystat_senddata(BYTE data) {
+// ---- Keyboard
 
-	BYTE	key;
-	BOOL	keynochange;
+static void keyboard_int(BOOL absolute) {
 
-	key = data & 0x7f;
-	keynochange = FALSE;
-
-	// CTRL:カナ 0x71,0x72 bit7==0でトルグ処理 (標準処理)
-	if ((key == 0x71) || (key == 0x72)) {
-		if (data & 0x80) {
-			return;
-		}
-		data = key | (keystat[key] & 0x80);
-		keystat[key] ^= 0x80;
-	}
-	else {
-		if ((np2cfg.XSHIFT) &&
-			(((key == 0x70) && (np2cfg.XSHIFT & 1)) ||
-			((key == 0x74) && (np2cfg.XSHIFT & 2)) ||
-			((key == 0x73) && (np2cfg.XSHIFT & 4)))) {
-			if (data & 0x80) {
-				return;
+	if ((keybrd.ctrls) || (keybrd.buffers)) {
+		if (!(keybrd.status & 2)) {
+			keybrd.status |= 2;
+			if (keybrd.ctrls) {
+				keybrd.ctrls--;
+				keybrd.data = keybrd.ctr[keybrd.ctrpos];
+				keybrd.ctrpos = (keybrd.ctrpos + 1) & KB_CTRMASK;
 			}
-			data = key | (keystat[key] & 0x80);
-			keystat[key] ^= 0x80;
-		}
-		else {
-			// CTRL:カナ 0x79,0x7a bit7をそのまま通知
-			// (ハードウェアでメカニカル処理してる場合)
-			if ((key == 0x79) || (key == 0x7a)) {
-				key -= 0x08;
-				data -= 0x08;
-			}
-			if (!((keystat[key] ^ data) & 0x80)) {
-				keystat[key] ^= 0x80;
+			else if (keybrd.buffers) {
+				keybrd.buffers--;
+				keybrd.data = keybrd.buf[keybrd.bufpos];
+				keybrd.bufpos = (keybrd.bufpos + 1) & KB_BUFMASK;
 			}
-			else {
-				keynochange = TRUE;
-				if (kbexflag[key] & 2) {			// キーリピート無し
-					return;
-				}
-			}
-		}
-	}
-	if ((!np2cfg.KEY_MODE) || (!(kbexflag[key] & 1))) {
-		if (keynochange) {
-			if (data & 0x80) {						// ver0.30
-				return;
-			}
-			keyb_out((BYTE)(data ^ 0x80));
-		}
-		keyb_out(data);
-	}
-}
-
-void keystat_resetcopyhelp(void) {
-
-	BYTE	i;
-
-	for (i=0x60; i<0x62; i++) {
-		if (keystat[i] & 0x80) {
-			keystat[i] &= 0x7f;
-			keyb_out((BYTE)(i | 0x80));
-		}
-	}
-}
-
-void keystat_allrelease(void) {
-
-	UINT	i;
-
-	for (i=0; i<0x80; i++) {
-		if (keystat[i] & 0x80) {
-			keystat[i] &= ~0x80;
-			keyb_out((BYTE)(i + 0x80));
-		}
-	}
-}
-
-void keystat_forcerelease(BYTE value) {
-
-	if (keystat[value & 0x7f] & 0x80) {
-		keystat[value & 0x7f] &= ~0x80;
-		keyb_out((BYTE)(value | 0x80));
-	}
-}
-
-void keystat_resetjoykey(void) {
-
-	int		i;
-	BYTE	key;
-
-	for (i=0; i<12; i++) {
-		key = joykeytable[i];
-		if (keystat[key] & 0x80) {
-			keystat[key] &= 0x7f;
-			keyb_out((BYTE)(key | 0x80));
+			TRACEOUT(("recv -> %02x", keybrd.data));
 		}
+		pic_setirq(1);
+		nevent_set(NEVENT_KEYBOARD, keybrd.xferclock,
+											keyboard_callback, absolute);
 	}
 }
 
+void keyboard_callback(NEVENTITEM item) {
 
-// ----
-
-typedef struct {
-	BYTE	joysync;
-	BYTE	joylast;
-	BYTE	mouselast;
-	BYTE	padding;
-	BYTE	d_up;
-	BYTE	d_dn;
-	BYTE	d_lt;
-	BYTE	d_rt;
-} KEYEXT;
-
-static	KEYEXT	keyext;
-static const BYTE mousedelta[] = {1, 1, 1, 1,
-									2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 4};
-#define	MOUSESTEPMAX ((sizeof(mousedelta) / sizeof(BYTE)) - 1)
-
-void keyext_flash(void) {
-
-	keyext.joysync = 0;
-}
-
-BYTE keyext_getjoy(void) {
-
-	BYTE	flg;
-const BYTE	*p;
-	BYTE	bit;
-
-	if (!keyext.joysync) {
-		keyext.joysync = 1;
-		flg = 0xff;
-		p = joykeytable;
-		for (bit=0x20; bit; bit>>=1) {
-			if ((keystat[p[0]] & 0x80) || (keystat[p[1]] & 0x80)) {
-				flg ^= bit;
-			}
-			p += 2;
-		}
-		keyext.joylast = flg;
+	if (item->flag & NEVENT_SETEVENT) {
+		keyboard_int(NEVENT_RELATIVE);
 	}
-	return(keyext.joylast);
 }
 
-BYTE keyext_getmouse(SINT16 *x, SINT16 *y) {
-
-	BYTE	btn;
-	BYTE	acc;
-	SINT16	tmp;
-	BYTE	ret;
+static void IOOUTCALL keyboard_o41(UINT port, REG8 dat) {
 
-	btn = keyext_getjoy();
-	acc = btn | keyext.mouselast;
-	keyext.mouselast = btn;
-	tmp = 0;
-	if (!(btn & 1)) {
-		tmp -= mousedelta[keyext.d_up];
-	}
-	if (!(acc & 1)) {
-		if (keyext.d_up < MOUSESTEPMAX) {
-			keyext.d_up++;
-		}
-	}
-	else {
-		keyext.d_up = 0;
-	}
-	if (!(btn & 2)) {
-		tmp += mousedelta[keyext.d_dn];
-	}
-	if (!(acc & 2)) {
-		if (keyext.d_dn < MOUSESTEPMAX) {
-			keyext.d_dn++;
-		}
-	}
-	else {
-		keyext.d_dn = 0;
-	}
-	*y += tmp;
-
-	tmp = 0;
-	if (!(btn & 4)) {
-		tmp -= mousedelta[keyext.d_lt];
-	}
-	if (!(acc & 4)) {
-		if (keyext.d_lt < MOUSESTEPMAX) {
-			keyext.d_lt++;
-		}
+	if (keybrd.cmd & 1) {
+		TRACEOUT(("send -> %02x", dat));
+		keystat_ctrlsend(dat);
 	}
-	else {
-		keyext.d_lt = 0;
-	}
-	if (!(btn & 8)) {
-		tmp += mousedelta[keyext.d_rt];
-	}
-	if (!(acc & 8)) {
-		if (keyext.d_rt < MOUSESTEPMAX) {
-			keyext.d_rt++;
-		}
-	}
-	else {
-		keyext.d_rt = 0;
-	}
-	*x += tmp;
-
-	ret = 0x5f;
-	ret += (btn & 0x10) << 3;
-	ret += (btn & 0x20);
-	return(ret);
-}
-
-
-// ----
-
-static void IOOUTCALL keyb_o41(UINT port, BYTE dat) {
-
-	keyb.mode = dat;
 	(void)port;
 }
 
-static void IOOUTCALL keyb_o43(UINT port, BYTE dat) {
+static void IOOUTCALL keyboard_o43(UINT port, REG8 dat) {
 
-	if ((!(dat & 0x08)) && (keyb.cmd & 0x08)) {
+	TRACEOUT(("out43 -> %02x %.4x:%.8x", dat, CPU_CS, CPU_EIP));
+	if ((!(dat & 0x08)) && (keybrd.cmd & 0x08)) {
 		keyboard_resetsignal();
 	}
 	if (dat & 0x10) {
-		keyb.status &= ~(0x38);
+		keybrd.status &= ~(0x38);
 	}
-	keyb.cmd = dat;
+	keybrd.cmd = dat;
 	(void)port;
 }
 
-static BYTE IOINPCALL keyb_i41(UINT port) {
+static REG8 IOINPCALL keyboard_i41(UINT port) {
 
 	(void)port;
-	return(keyb.data);
+	keybrd.status &= ~2;
+	TRACEOUT(("in41 -> %02x %.4x:%.8x", keybrd.data, CPU_CS, CPU_EIP));
+	return(keybrd.data);
 }
 
-static BYTE IOINPCALL keyb_i43(UINT port) {
+static REG8 IOINPCALL keyboard_i43(UINT port) {
 
 	(void)port;
-	return(keyb.status);
+	TRACEOUT(("in43 -> %02x %.4x:%.8x", keybrd.status, CPU_CS, CPU_EIP));
+	return(keybrd.status | 0x85);
 }
 
 
 // ----
 
-static const IOOUT keybo41[2] = {
-					keyb_o41,	keyb_o43};
+static const IOOUT keybrdo41[2] = {
+					keyboard_o41,	keyboard_o43};
 
-static const IOINP keybi41[2] = {
-					keyb_i41,	keyb_i43};
+static const IOINP keybrdi41[2] = {
+					keyboard_i41,	keyboard_i43};
 
 
 void keyboard_reset(void) {
 
-	ZeroMemory(&keyb, sizeof(keyb));
-	keyb.data = 0xff;
-	keyb.mode = 0x5e;
+	ZeroMemory(&keybrd, sizeof(keybrd));
+	keybrd.data = 0xff;
 }
 
 void keyboard_bind(void) {
 
-	iocore_attachsysoutex(0x0041, 0x0cf1, keybo41, 2);
-	iocore_attachsysinpex(0x0041, 0x0cf1, keybi41, 2);
+	keybrd.xferclock = pccore.realclock / 1920;
+	iocore_attachsysoutex(0x0041, 0x0cf1, keybrdo41, 2);
+	iocore_attachsysinpex(0x0041, 0x0cf1, keybrdi41, 2);
 }
 
-void keyboard_resetsignal(void) {									// ver0.29
+void keyboard_resetsignal(void) {
+
+	keybrd.cmd = 0;
+	keybrd.status = 0;
+	keybrd.ctrls = 0;
+	keybrd.buffers = 0;
+	keystat_ctrlreset();
+	keystat_resendstat();
+}
 
-	int		i;
+void keyboard_ctrl(REG8 data) {
 
-	keyboard_reset();
-	for (i=0; i<0x80; i++) {
-		if (keystat[i]) {
-			keyb_out((BYTE)i);
+	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.bufpos + keybrd.buffers) & KB_BUFMASK] = data;
+		keybrd.buffers++;
+		if (!nevent_iswork(NEVENT_KEYBOARD)) {
+			keyboard_int(NEVENT_ABSOLUTE);
+		}
+	}
+	else {
+		keybrd.status |= 0x10;
+	}
+}
+
 
-// -----------------------------------------------------------------------
 
+// ---- RS-232C
 
 	COMMNG	cm_rs232c;
 
@@ -445,10 +203,10 @@ void rs232c_midipanic(void) {
 
 // ----
 
-static void IOOUTCALL rs232c_o30(UINT port, BYTE dat) {
+static void IOOUTCALL rs232c_o30(UINT port, REG8 dat) {
 
 	if (cm_rs232c) {
-		cm_rs232c->write(cm_rs232c, dat);
+		cm_rs232c->write(cm_rs232c, (UINT8)dat);
 	}
 	if (sysport.c & 4) {
 		rs232c.send = 0;
@@ -460,7 +218,7 @@ static void IOOUTCALL rs232c_o30(UINT po
 	(void)port;
 }
 
-static void IOOUTCALL rs232c_o32(UINT port, BYTE dat) {
+static void IOOUTCALL rs232c_o32(UINT port, REG8 dat) {
 
 	if (!(dat & 0xfd)) {
 		rs232c.dummyinst++;
@@ -512,19 +270,21 @@ static void IOOUTCALL rs232c_o32(UINT po
 			break;
 
 		case 0x02:			// cmd
+			sysport.c &= ~7;
+			sysport.c |= (dat & 7);
 			rs232c.pos++;
 			break;
 	}
 	(void)port;
 }
 
-static BYTE IOINPCALL rs232c_i30(UINT port) {
+static REG8 IOINPCALL rs232c_i30(UINT port) {
 
 	(void)port;
 	return(rs232c.data);
 }
 
-static BYTE IOINPCALL rs232c_i32(UINT port) {
+static REG8 IOINPCALL rs232c_i32(UINT port) {
 
 	if (!(rs232c_stat() & 0x20)) {
 		return(rs232c.result | 0x80);