--- np2/sound/fmboard.h	2003/10/16 17:58:02	1.1
+++ np2/sound/fmboard.h	2004/01/23 15:05:05	1.4
@@ -1,5 +1,4 @@
 
-#include	"config.h"
 #include	"soundrom.h"
 #include	"tms3631.h"
 #include	"fmtimer.h"
@@ -45,9 +44,15 @@ typedef struct {
 extern "C" {
 #endif
 
+extern	UINT32		usesound;
+extern	OPN_T		opn;
+extern	AMD98		amd98;
+extern	MUSICGEN	musicgen;
+
 extern	_TMS3631	tms3631;
 extern	_FMTIMER	fmtimer;
 extern	_OPNGEN		opngen;
+extern	OPNCH		opnch[OPNCH_MAX];
 extern	_PSGGEN		psg1;
 extern	_PSGGEN		psg2;
 extern	_PSGGEN		psg3;
@@ -56,18 +61,13 @@ extern	_ADPCM		adpcm;
 extern	_PCM86		pcm86;
 extern	_CS4231		cs4231;
 
-extern	int			usesound;
-extern	OPN_T		opn;
-extern	AMD98		amd98;
-extern	MUSICGEN	musicgen;
-
 
-BYTE fmboard_getjoy(PSGGEN psg);
+REG8 fmboard_getjoy(PSGGEN psg);
 
-void fmboard_extreg(void (*ext)(BYTE enable));
-void fmboard_extenable(BYTE enable);
+void fmboard_extreg(void (*ext)(REG8 enable));
+void fmboard_extenable(REG8 enable);
 
-void fmboard_reset(BYTE num);
+void fmboard_reset(UINT32 type);
 void fmboard_bind(void);
 
 #ifdef __cplusplus