--- np2/cbus/pc9861k.c	2004/01/30 14:33:27	1.6
+++ np2/cbus/pc9861k.c	2007/11/03 00:00:19	1.8
@@ -82,8 +82,8 @@ static UINT32 pc9861k_getspeed(REG8 dip)
 			speed = 0;
 		}
 	}
-	if (speed > ((sizeof(pc9861k_speed) / sizeof(UINT32)) - 1)) {
-		speed = (sizeof(pc9861k_speed) / sizeof(UINT32)) - 1;
+	if (speed > (NELEMENTS(pc9861k_speed) - 1)) {
+		speed = NELEMENTS(pc9861k_speed) - 1;
 	}
 	return(pc9861k_speed[speed]);
 }
@@ -131,7 +131,7 @@ static void IOOUTCALL pc9861data_w8(COMM
 
 	switch(port & 0x3) {
 		case 0x01:
-			cm->write(cm, (BYTE)value);
+			cm->write(cm, (UINT8)value);
 			if (m->signal & 4) {
 				m->send = 0;
 				pic_setirq(m->irq);
@@ -292,7 +292,7 @@ void pc9861k_deinitialize(void) {
 	cm_pc9861ch2 = NULL;
 }
 
-void pc9861k_reset(void) {
+void pc9861k_reset(const NP2CFG *pConfig) {
 
 	commng_destroy(cm_pc9861ch1);
 	cm_pc9861ch1 = NULL;
@@ -301,7 +301,7 @@ void pc9861k_reset(void) {
 
 	pc9861k.ch1 = pc9861def;
 	pc9861k.ch2 = pc9861def;
-	pc9861k.en = np2cfg.pc9861enable & 1;
+	pc9861k.en = pConfig->pc9861enable & 1;
 }
 
 void pc9861k_bind(void) {