--- np2/sound/psggen.h	2003/11/14 05:26:53	1.4
+++ np2/sound/psggen.h	2003/12/24 14:01:56	1.7
@@ -14,7 +14,7 @@ enum {
 typedef struct {
 	SINT32	freq;
 	SINT32	count;
-	BYTE	*pvol;
+	SINT32	*pvol;			// !!
 	UINT16	puchi;
 	BYTE	pan;
 	BYTE	padding;
@@ -43,10 +43,11 @@ typedef struct {
 	PSGREG		reg;
 	UINT16		envcnt;
 	UINT16		envmax;
+	BYTE		mixer;
 	BYTE		envmode;
 	BYTE		envvol;
 	char		envvolcnt;
-	BYTE		mixer;
+	SINT32		evol;				// !!
 	UINT		puchicount;
 } _PSGGEN, *PSGGEN;
 
@@ -67,9 +68,9 @@ void psggen_initialize(UINT rate);
 void psggen_setvol(UINT vol);
 
 void psggen_reset(PSGGEN psg);
-void psggen_setreg(PSGGEN psg, BYTE reg, BYTE val);
-BYTE psggen_getreg(PSGGEN psg, BYTE reg);
-void psggen_setpan(PSGGEN psg, UINT ch, BYTE pan);
+void psggen_setreg(PSGGEN psg, REG8 reg, REG8 val);
+REG8 psggen_getreg(PSGGEN psg, REG8 reg);
+void psggen_setpan(PSGGEN psg, UINT ch, REG8 pan);
 
 void SOUNDCALL psggen_getpcm(PSGGEN psg, SINT32 *pcm, UINT count);