--- np2/sound/s98.c	2004/01/13 05:30:59	1.7
+++ np2/sound/s98.c	2005/05/13 05:47:25	1.12
@@ -4,6 +4,9 @@
 //
 
 #include	"compiler.h"
+
+#if defined(SUPPORT_S98)
+
 #include	"dosio.h"
 #include	"pccore.h"
 #include	"iocore.h"
@@ -15,16 +18,16 @@
 #define S98LOG_BUFSIZE (32 * 1024)
 
 typedef struct {
-	BYTE	magic[3];
+	UINT8	magic[3];
 	UINT8	formatversion;
-	BYTE	timerinfo[4];
-	BYTE	timerinfo2[4];
-	BYTE	compressing[4];
-	BYTE	offset[4];
-	BYTE	dumpdata[4];
-	BYTE	looppoint[4];
-	BYTE	headerreserved[0x24];
-	BYTE	title[0x40];
+	UINT8	timerinfo[4];
+	UINT8	timerinfo2[4];
+	UINT8	compressing[4];
+	UINT8	offset[4];
+	UINT8	dumpdata[4];
+	UINT8	looppoint[4];
+	UINT8	headerreserved[0x24];
+	UINT8	title[0x40];
 } S98HDR;
 
 static struct {
@@ -32,7 +35,7 @@ static struct {
 	UINT32	intcount;
 	SINT32	clock;
 	UINT	p;
-	BYTE	buf[S98LOG_BUFSIZE];
+	UINT8	buf[S98LOG_BUFSIZE];
 } s98log;
 
 
@@ -105,7 +108,7 @@ void S98_trash(void) {
 	S98_close();
 }
 
-BOOL S98_open(const char *filename) {
+BRESULT S98_open(const OEMCHAR *filename) {
 
 	UINT	i;
 	S98HDR	hdr;
@@ -130,7 +133,7 @@ BOOL S98_open(const char *filename) {
 	STOREINTELDWORD(hdr.offset, offsetof(S98HDR, title));
 	STOREINTELDWORD(hdr.dumpdata, sizeof(S98HDR));
 	for (i=0; i<sizeof(hdr); i++) {
-		S98_putc(*(((BYTE *)&hdr) + i));
+		S98_putc(*(((UINT8 *)&hdr) + i));
 	}
 
 #if 1
@@ -140,18 +143,17 @@ BOOL S98_open(const char *filename) {
 			S98_putc(NORMAL2608);
 			S98_putc((REG8)i);
 			S98_putc(opn.reg[i]);
-#if 0
+
 			S98_putc(EXTEND2608);
 			S98_putc((REG8)i);
 			S98_putc(opn.reg[i+0x100]);
-#endif
 		}
 	}
 	// PSG
 	for (i=0x00; i<0x0e; i++) {
 		S98_putc(NORMAL2608);
 		S98_putc((REG8)i);
-		S98_putc(((BYTE *)&psg1.reg)[i]);
+		S98_putc(((UINT8 *)&psg1.reg)[i]);
 	}
 #endif
 
@@ -174,16 +176,17 @@ void S98_close(void) {
 	}
 }
 
-void S98_put(REG8 module, REG8 addr, REG8 data) {
+void S98_put(REG8 module, UINT addr, REG8 data) {
 
 	if (s98log.fh != FILEH_INVALID) {
 		S98_putint();
 		S98_putc(module);
-		S98_putc(addr);
+		S98_putc((UINT8)addr);
 		S98_putc(data);
 	}
 }
 
 void S98_sync(void) {
 }
+#endif