--- np2/io/serial.h	2004/02/07 21:23:22	1.5
+++ np2/io/serial.h	2005/02/07 14:46:11	1.10
@@ -1,19 +1,24 @@
 
 enum {
-	KB_BUFBIT		= 7,
-	KB_BUF			= (1 << KB_BUFBIT),
+	KB_CTR			= (1 << 3),
+	KB_CTRMASK		= (KB_CTR - 1),
+
+	KB_BUF			= (1 << 7),
 	KB_BUFMASK		= (KB_BUF - 1)
 };
 
 typedef struct {
 	UINT32	xferclock;
 	UINT8	data;
-	UINT8	mode;
 	UINT8	cmd;
+	UINT8	mode;
 	UINT8	status;
-	int		buffers;
-	int		pos;
-	BYTE	buf[KB_BUF];
+	UINT	ctrls;
+	UINT	ctrpos;
+	UINT	buffers;
+	UINT	bufpos;
+	UINT8	ctr[KB_CTR];
+	UINT8	buf[KB_BUF];
 } _KEYBRD, *KEYBRD;
 
 typedef struct {
@@ -32,23 +37,13 @@ typedef struct {
 extern "C" {
 #endif
 
-void keystat_reset(void);
-void keystat_senddata(REG8 data);
-void keystat_allrelease(void);
-void keystat_forcerelease(REG8 value);
-void keystat_resetcopyhelp(void);
-void keystat_resetjoykey(void);
-
-
-void keyext_flash(void);
-BYTE keyext_getjoy(void);
-BYTE keyext_getmouse(SINT16 *x, SINT16 *y);
-
-void keybrd_callback(NEVENTITEM item);
+void keyboard_callback(NEVENTITEM item);
 
 void keyboard_reset(void);
 void keyboard_bind(void);
 void keyboard_resetsignal(void);
+void keyboard_ctrl(REG8 data);
+void keyboard_send(REG8 data);
 
 
 
@@ -60,7 +55,7 @@ void rs232c_bind(void);
 void rs232c_open(void);
 void rs232c_callback(void);
 
-BYTE rs232c_stat(void);
+UINT8 rs232c_stat(void);
 void rs232c_midipanic(void);
 
 #ifdef __cplusplus