--- np2/sound/fmboard.c	2003/10/16 17:58:02	1.1.1.1
+++ np2/sound/fmboard.c	2003/12/08 00:55:33	1.6
@@ -1,7 +1,7 @@
 #include	"compiler.h"
 #include	"joymng.h"
 #include	"soundmng.h"
-#include	"i286.h"
+// #include	"cpucore.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"cbuscore.h"
@@ -25,6 +25,7 @@
 	_TMS3631	tms3631;
 	_FMTIMER	fmtimer;
 	_OPNGEN		opngen;
+	OPNCH		opnch[OPNCH_MAX];
 	_PSGGEN		psg1;
 	_PSGGEN		psg2;
 	_PSGGEN		psg3;
@@ -39,7 +40,7 @@
 	MUSICGEN	musicgen;
 
 
-static void		(*extfn)(BYTE enable);
+static void	(*extfn)(REG8 enable);
 
 
 // ----
@@ -55,12 +56,12 @@ BYTE fmboard_getjoy(PSGGEN psg) {
 	if (!(psg->reg.io2 & 0x40)) {
 		ret &= (joymng_getstat() | (rapids & 0x30));
 		if (np2cfg.KEY_MODE == 1) {
-			ret &= keystat_getjoy();
+			ret &= keyext_getjoy();
 		}
 	}
 	else {
 		if (np2cfg.KEY_MODE == 2) {
-			ret &= keystat_getjoy();
+			ret &= keyext_getjoy();
 		}
 	}
 	if (np2cfg.BTN_RAPID) {
@@ -85,12 +86,12 @@ BYTE fmboard_getjoy(PSGGEN psg) {
 
 // ----
 
-void fmboard_extreg(void (*ext)(BYTE enable)) {
+void fmboard_extreg(void (*ext)(REG8 enable)) {
 
 	extfn = ext;
 }
 
-void fmboard_extenable(BYTE enable) {
+void fmboard_extenable(REG8 enable) {
 
 	if (extfn) {
 		(*extfn)(enable);
@@ -174,7 +175,7 @@ void fmboard_reset(BYTE num) {
 	}
 	soundmng_setreverse(cross);
 	keydisp_setfmboard(num);
-//	FM_setVR(np2cfg.spb_vrc, np2cfg.spb_vrl);				// ver0.30
+	opngen_setVR(np2cfg.spb_vrc, np2cfg.spb_vrl);
 }
 
 void fmboard_bind(void) {
@@ -193,7 +194,7 @@ void fmboard_bind(void) {
 			break;
 
 		case 0x06:
-			board86c_bind();
+			boardx2_bind();
 			break;
 
 		case 0x08: