--- np2/cbus/pc9861k.c	2003/10/16 17:57:58	1.1
+++ np2/cbus/pc9861k.c	2004/01/30 01:56:01	1.5
@@ -1,6 +1,8 @@
 #include	"compiler.h"
+
+#if defined(SUPPORT_PC9861K)
+
 #include	"commng.h"
-#include	"memory.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"cbuscore.h"
@@ -18,8 +20,8 @@
 const UINT32 pc9861k_speed[11] = {75, 150, 300, 600, 1200, 2400, 4800,
 											9600, 19200, 38400, 76800};
 
-static const BYTE ch1_irq[4] = {IRQ_INT0, IRQ_INT1, IRQ_INT2, IRQ_INT3};
-static const BYTE ch2_irq[4] = {IRQ_INT0, IRQ_INT41, IRQ_INT5, IRQ_INT6};
+static const UINT8 ch1_irq[4] = {IRQ_INT0, IRQ_INT1, IRQ_INT2, IRQ_INT3};
+static const UINT8 ch2_irq[4] = {IRQ_INT0, IRQ_INT41, IRQ_INT5, IRQ_INT6};
 static const _PC9861CH pc9861def =
 					{0x05, 0xff, 7, 1,
 						0, 0, 2400, NEVENT_MAXCLOCK, 0, 0, 0};
@@ -39,7 +41,7 @@ static void pc9861k_callback(COMMNG cm, 
 		}
 	}
 	else {
-		m->result &= (BYTE)~2;
+		m->result &= ~2;
 	}
 	if (m->signal & 4) {
 		if (m->send) {
@@ -70,7 +72,7 @@ void pc9861ch2cb(NEVENTITEM item) {
 	pc9861k_callback(cm_pc9861ch2, &pc9861ch2);
 }
 
-static UINT32 pc9861k_getspeed(BYTE dip) {
+static UINT32 pc9861k_getspeed(REG8 dip) {
 
 	UINT	speed;
 
@@ -91,7 +93,7 @@ static UINT32 pc9861k_getspeed(BYTE dip)
 
 static void pc9861_makeclk(PC9861CH m, UINT32 mul2) {
 
-	m->clk = pc.realclock * mul2 / ((m->speed) * 2);
+	m->clk = pccore.realclock * mul2 / ((m->speed) * 2);
 }
 
 static void pc9861ch1_open(void) {
@@ -124,13 +126,13 @@ static void pc9861ch2_open(void) {
 // -------------------------------------------------------------------------
 
 static void IOOUTCALL pc9861data_w8(COMMNG cm, PC9861CH m,
-													UINT port, BYTE value) {
+													UINT port, REG8 value) {
 
 	UINT32	mul2;
 
 	switch(port & 0x3) {
 		case 0x01:
-			cm->write(cm, value);
+			cm->write(cm, (BYTE)value);
 			if (m->signal & 4) {
 				m->send = 0;
 				pic_setirq(m->irq);
@@ -188,7 +190,7 @@ static void IOOUTCALL pc9861data_w8(COMM
 	}
 }
 
-static BYTE IOINPCALL pc9861data_r8(COMMNG cm, PC9861CH m, UINT port) {
+static REG8 IOINPCALL pc9861data_r8(COMMNG cm, PC9861CH m, UINT port) {
 
 	switch(port & 0x3) {
 		case 0x01:
@@ -204,7 +206,7 @@ static BYTE IOINPCALL pc9861data_r8(COMM
 }
 
 
-static void IOOUTCALL pc9861k_ob0(UINT port, BYTE dat) {
+static void IOOUTCALL pc9861k_ob0(UINT port, REG8 dat) {
 
 	if (cm_pc9861ch1 == NULL) {
 		pc9861ch1_open();
@@ -213,7 +215,7 @@ static void IOOUTCALL pc9861k_ob0(UINT p
 	(void)port;
 }
 
-static void IOOUTCALL pc9861k_ob2(UINT port, BYTE dat) {
+static void IOOUTCALL pc9861k_ob2(UINT port, REG8 dat) {
 
 	if (cm_pc9861ch2 == NULL) {
 		pc9861ch2_open();
@@ -222,7 +224,7 @@ static void IOOUTCALL pc9861k_ob2(UINT p
 	(void)port;
 }
 
-static BYTE IOINPCALL pc9861k_ib0(UINT port) {
+static REG8 IOINPCALL pc9861k_ib0(UINT port) {
 
 	if (cm_pc9861ch1 == NULL) {
 		pc9861ch1_open();
@@ -231,7 +233,7 @@ static BYTE IOINPCALL pc9861k_ib0(UINT p
 	return(cm_pc9861ch1->getstat(cm_pc9861ch1) | pc9861ch1.vect);
 }
 
-static BYTE IOINPCALL pc9861k_ib2(UINT port) {
+static REG8 IOINPCALL pc9861k_ib2(UINT port) {
 
 	if (cm_pc9861ch2 == NULL) {
 		pc9861ch2_open();
@@ -241,7 +243,7 @@ static BYTE IOINPCALL pc9861k_ib2(UINT p
 }
 
 
-static void IOOUTCALL pc9861k_ob1(UINT port, BYTE dat) {
+static void IOOUTCALL pc9861k_ob1(UINT port, REG8 dat) {
 
 	if (cm_pc9861ch1 == NULL) {
 		pc9861ch1_open();
@@ -249,7 +251,7 @@ static void IOOUTCALL pc9861k_ob1(UINT p
 	pc9861data_w8(cm_pc9861ch1, &pc9861ch1, port, dat);
 }
 
-static BYTE IOINPCALL pc9861k_ib1(UINT port) {
+static REG8 IOINPCALL pc9861k_ib1(UINT port) {
 
 	if (cm_pc9861ch2 == NULL) {
 		pc9861ch1_open();
@@ -258,7 +260,7 @@ static BYTE IOINPCALL pc9861k_ib1(UINT p
 }
 
 
-static void IOOUTCALL pc9861k_ob9(UINT port, BYTE dat) {
+static void IOOUTCALL pc9861k_ob9(UINT port, REG8 dat) {
 
 	if (cm_pc9861ch2 == NULL) {
 		pc9861ch2_open();
@@ -266,7 +268,7 @@ static void IOOUTCALL pc9861k_ob9(UINT p
 	pc9861data_w8(cm_pc9861ch2, &pc9861ch2, port, dat);
 }
 
-static BYTE IOINPCALL pc9861k_ib9(UINT port) {
+static REG8 IOINPCALL pc9861k_ib9(UINT port) {
 
 	if (cm_pc9861ch2 == NULL) {
 		pc9861ch2_open();
@@ -277,13 +279,13 @@ static BYTE IOINPCALL pc9861k_ib9(UINT p
 
 // ---- I/F
 
-void pc9861k_construct(void) {
+void pc9861k_initialize(void) {
 
 	cm_pc9861ch1 = NULL;
 	cm_pc9861ch2 = NULL;
 }
 
-void pc9861k_destruct(void) {
+void pc9861k_deinitialize(void) {
 
 	commng_destroy(cm_pc9861ch1);
 	cm_pc9861ch1 = NULL;
@@ -333,3 +335,5 @@ void pc9861k_midipanic(void) {
 	}
 }
 
+#endif
+