--- np2/io/serial.c	2004/04/02 19:31:26	1.21
+++ np2/io/serial.c	2011/01/15 18:04:43	1.25
@@ -24,7 +24,7 @@ void keyboard_callback(NEVENTITEM item) 
 					keybrd.data = keybrd.buf[keybrd.bufpos];
 					keybrd.bufpos = (keybrd.bufpos + 1) & KB_BUFMASK;
 				}
-				TRACEOUT(("recv -> %02x", keybrd.data));
+//				TRACEOUT(("recv -> %02x", keybrd.data));
 			}
 			pic_setirq(1);
 			nevent_set(NEVENT_KEYBOARD, keybrd.xferclock,
@@ -36,7 +36,7 @@ void keyboard_callback(NEVENTITEM item) 
 static void IOOUTCALL keyboard_o41(UINT port, REG8 dat) {
 
 	if (keybrd.cmd & 1) {
-		TRACEOUT(("send -> %02x", dat));
+//		TRACEOUT(("send -> %02x", dat));
 		keystat_ctrlsend(dat);
 	}
 	else {
@@ -84,11 +84,13 @@ static const IOINP keybrdi41[2] = {
 					keyboard_i41,	keyboard_i43};
 
 
-void keyboard_reset(void) {
+void keyboard_reset(const NP2CFG *pConfig) {
 
 	ZeroMemory(&keybrd, sizeof(keybrd));
 	keybrd.data = 0xff;
 	keybrd.mode = 0x5e;
+
+	(void)pConfig;
 }
 
 void keyboard_bind(void) {
@@ -166,30 +168,30 @@ void rs232c_open(void) {
 
 void rs232c_callback(void) {
 
-	BOOL	interrupt;
+	BOOL	intr;
 
-	interrupt = FALSE;
+	intr = FALSE;
 	if ((cm_rs232c) && (cm_rs232c->read(cm_rs232c, &rs232c.data))) {
 		rs232c.result |= 2;
 		if (sysport.c & 1) {
-			interrupt = TRUE;
+			intr = TRUE;
 		}
 	}
 	else {
-		rs232c.result &= (BYTE)~2;
+		rs232c.result &= (UINT8)~2;
 	}
 	if (sysport.c & 4) {
 		if (rs232c.send) {
 			rs232c.send = 0;
-			interrupt = TRUE;
+			intr = TRUE;
 		}
 	}
-	if (interrupt) {
+	if (intr) {
 		pic_setirq(4);
 	}
 }
 
-BYTE rs232c_stat(void) {
+UINT8 rs232c_stat(void) {
 
 	if (cm_rs232c == NULL) {
 		cm_rs232c = commng_create(COMCREATE_SERIAL);
@@ -308,7 +310,7 @@ static const IOOUT rs232co30[2] = {
 static const IOINP rs232ci30[2] = {
 					rs232c_i30,	rs232c_i32};
 
-void rs232c_reset(void) {
+void rs232c_reset(const NP2CFG *pConfig) {
 
 	commng_destroy(cm_rs232c);
 	cm_rs232c = NULL;
@@ -318,6 +320,8 @@ void rs232c_reset(void) {
 	rs232c.pos = 0;
 	rs232c.dummyinst = 0;
 	rs232c.mul = 10 * 16;
+
+	(void)pConfig;
 }
 
 void rs232c_bind(void) {