--- np2/sound/opngen.h	2005/05/13 05:47:25	1.11
+++ np2/sound/opngen.h	2011/02/04 14:43:55	1.14
@@ -1,11 +1,15 @@
 
 enum {
+#if defined(SUPPORT_PX)
+	OPNCH_MAX		= 30,
+#else	// defined(SUPPORT_PX)
 	OPNCH_MAX		= 12,
+#endif	// defined(SUPPORT_PX)
 	OPNA_CLOCK		= 55466 * 72,
 
-	OPN_CHMASK		= 0x8000,
-	OPN_STEREO		= 0x8000,
-	OPN_MONORAL		= 0x0000
+	OPN_CHMASK		= 0x80000000,
+	OPN_STEREO		= 0x80000000,
+	OPN_MONORAL		= 0x00000000
 };
 
 
@@ -21,7 +25,7 @@ enum {
 #define EVC_BITS		10
 #define ENV_BITS		16
 #define KF_BITS			6
-#define FREQ_BITS		20
+#define FREQ_BITS		21
 #define ENVTBL_BIT		14
 #define SINTBL_BIT		14
 
@@ -53,7 +57,7 @@ enum {
 #define	EVC_BITS		10
 #define	ENV_BITS		16
 #define	KF_BITS			6
-#define	FREQ_BITS		20
+#define	FREQ_BITS		21
 #define	ENVTBL_BIT		14
 #define	SINTBL_BIT		15
 
@@ -166,7 +170,7 @@ void opngen_setvol(UINT vol);
 void opngen_setVR(REG8 channel, REG8 value);
 
 void opngen_reset(void);
-void opngen_setcfg(REG8 maxch, UINT flag);
+void opngen_setcfg(REG8 maxch, UINT32 flag);
 void opngen_setextch(UINT chnum, REG8 data);
 void opngen_setreg(REG8 chbase, UINT reg, REG8 value);
 void opngen_keyon(UINT chnum, REG8 value);