--- np2/cbus/pc9861k.h	2003/12/08 00:55:30	1.2
+++ np2/cbus/pc9861k.h	2007/11/03 00:00:19	1.6
@@ -1,4 +1,12 @@
 
+#if !defined(SUPPORT_PC9861K)
+
+#define pc9861k_initialize()
+#define	pc9861k_deinitialize()
+#define	pc9861k_midipanic()
+
+#else
+
 typedef struct {
 	UINT8	result;
 	UINT8	data;
@@ -10,28 +18,32 @@ typedef struct {
 	UINT32	speed;
 	SINT32	clk;
 
-	BYTE	dip;
-	BYTE	vect;
-	BYTE	irq;
+	UINT8	dip;
+	UINT8	vect;
+	UINT8	irq;
 } _PC9861CH, *PC9861CH;
 
+typedef struct {
+	_PC9861CH	ch1;
+	_PC9861CH	ch2;
+	BOOL		en;
+} _PC9861K, *PC9861K;
+
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-extern _PC9861CH pc9861ch1;
-extern _PC9861CH pc9861ch2;
 extern const UINT32 pc9861k_speed[11];
-
+extern _PC9861K	pc9861k;
 
 void pc9861ch1cb(NEVENTITEM item);
 void pc9861ch2cb(NEVENTITEM item);
 
-void pc9861k_construct(void);
-void pc9861k_destruct(void);
+void pc9861k_initialize(void);
+void pc9861k_deinitialize(void);
 
-void pc9861k_reset(void);
+void pc9861k_reset(const NP2CFG *pConfig);
 void pc9861k_bind(void);
 
 void pc9861k_midipanic(void);
@@ -40,3 +52,5 @@ void pc9861k_midipanic(void);
 }
 #endif
 
+#endif
+