--- np2/sound/fmboard.h 2003/10/18 07:28:50 1.2 +++ np2/sound/fmboard.h 2004/07/01 11:42:54 1.6 @@ -1,4 +1,6 @@ +#if !defined(DISABLE_SOUND) + #include "soundrom.h" #include "tms3631.h" #include "fmtimer.h" @@ -44,6 +46,11 @@ 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; @@ -56,21 +63,26 @@ 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); +void fmboard_fmrestore(REG8 chbase, UINT bank); +void fmboard_rhyrestore(RHYTHM rhy, UINT bank); + #ifdef __cplusplus } #endif +#else + +#define fmboard_reset(t) +#define fmboard_bind() + +#endif +