--- np2/sound/fmboard.c	2003/10/18 07:28:50	1.2
+++ np2/sound/fmboard.c	2004/01/23 15:05:05	1.7
@@ -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"
@@ -20,7 +20,10 @@
 #include	"keydisp.h"
 
 
-	int			usesound = 0;
+	UINT32		usesound;
+	OPN_T		opn;
+	AMD98		amd98;
+	MUSICGEN	musicgen;
 
 	_TMS3631	tms3631;
 	_FMTIMER	fmtimer;
@@ -35,33 +38,28 @@
 	_CS4231		cs4231;
 
 
-	OPN_T		opn;
-	AMD98		amd98;
-	MUSICGEN	musicgen;
-
-
-static void		(*extfn)(BYTE enable);
+static void	(*extfn)(REG8 enable);
 
 
 // ----
 
-static	BYTE	rapids = 0;
+static	REG8	rapids = 0;
 
-BYTE fmboard_getjoy(PSGGEN psg) {
+REG8 fmboard_getjoy(PSGGEN psg) {
 
-	BYTE	ret;
+	REG8	ret;
 
 	rapids ^= 0xf0;											// ver0.28
 	ret = 0xff;
 	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) {
@@ -86,12 +84,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);
@@ -102,24 +100,23 @@ void fmboard_extenable(BYTE enable) {
 
 // ----
 
-void fmboard_reset(BYTE num) {
+void fmboard_reset(UINT32 type) {
 
 	BYTE	cross;
 
 	soundrom_reset();
 	beep_reset();												// ver0.27a
 	cross = np2cfg.snd_x;										// ver0.30
-	usesound = num;
 
 	extfn = NULL;
 	ZeroMemory(&opn, sizeof(opn));
-	ZeroMemory(&musicgen, sizeof(musicgen));
-	ZeroMemory(&amd98, sizeof(amd98));
-
 	opn.channels = 3;
 	opn.adpcmmask = (BYTE)~(0x1c);
 	opn.reg[0xff] = 0x01;
 
+	ZeroMemory(&musicgen, sizeof(musicgen));
+	ZeroMemory(&amd98, sizeof(amd98));
+
 	tms3631_reset(&tms3631);
 	opngen_reset();
 	psggen_reset(&psg1);
@@ -130,7 +127,7 @@ void fmboard_reset(BYTE num) {
 	pcm86_reset();
 	cs4231_reset();
 
-	switch(num) {
+	switch(usesound) {
 		case 0x01:
 			board14_reset();
 			break;
@@ -170,12 +167,13 @@ void fmboard_reset(BYTE num) {
 			break;
 
 		default:
-			usesound = 0;
+			type = 0;
 			break;
 	}
+	usesound = type;
 	soundmng_setreverse(cross);
-	keydisp_setfmboard(num);
-//	FM_setVR(np2cfg.spb_vrc, np2cfg.spb_vrl);				// ver0.30
+	keydisp_setfmboard(type);
+	opngen_setVR(np2cfg.spb_vrc, np2cfg.spb_vrl);
 }
 
 void fmboard_bind(void) {
@@ -194,7 +192,7 @@ void fmboard_bind(void) {
 			break;
 
 		case 0x06:
-			board86c_bind();
+			boardx2_bind();
 			break;
 
 		case 0x08: