patch-2.2.18 linux/drivers/sound/emu10k1/8010.h

• Lines: 41
• Date: Tue Sep 5 21:50:50 2000
• Orig file: v2.2.17/drivers/sound/emu10k1/8010.h
• Orig date: Sat Sep 9 18:42:43 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/drivers/sound/emu10k1/8010.h linux/drivers/sound/emu10k1/8010.h
@@ -41,10 +41,14 @@
 
 /* ------------------- DEFINES -------------------- */
 
-#define CMD_WRITEFN0	0x0
-#define CMD_READFN0	0x1
-#define CMD_WRITEPTR	0x2
-#define CMD_READPTR	0x3
+#define CMD_WRITEFN0		0x0
+#define CMD_READFN0		0x1
+#define CMD_WRITEPTR		0x2
+#define CMD_READPTR		0x3
+#define CMD_SETRECSRC		0x4
+#define CMD_GETRECSRC		0x5
+#define CMD_GETVOICEPARAM	0x6
+#define CMD_SETVOICEPARAM	0x7
 
 struct mixer_private_ioctl {
 	u32 cmd;
@@ -175,6 +179,7 @@
 #define HCFG_AC3ENABLE_MASK	0x0x0000e0	/* AC3 async input control - Not implemented	*/
 #define HCFG_AC3ENABLE_ZVIDEO	0x00000080	/* Channels 0 and 1 replace ZVIDEO		*/
 #define HCFG_AC3ENABLE_CDSPDIF	0x00000040	/* Channels 0 and 1 replace CDSPDIF		*/
+#define HCFG_AC3ENABLE_GPSPDIF  0x00000020      /* Channels 0 and 1 replace GPSPDIF             */
 #define HCFG_AUTOMUTE		0x00000010	/* When set, the async sample rate convertors	*/
 						/* will automatically mute their output when	*/
 						/* they are not rate-locked to the external	*/
@@ -337,10 +342,12 @@
 #define CCCA_CURRADDR		0x18000008
 
 #define CCR			0x09		/* Cache control register				*/
-#define CCR_CACHEINVALIDSIZE	0xfe000000	/* Number of invalid samples cache for this channel    	*/
+#define CCR_CACHEINVALIDSIZE	0x07190009
+#define CCR_CACHEINVALIDSIZE_MASK	0xfe000000	/* Number of invalid samples cache for this channel    	*/
 #define CCR_CACHELOOPFLAG	0x01000000	/* 1 = Cache has a loop service pending			*/
 #define CCR_INTERLEAVEDSAMPLES	0x00800000	/* 1 = A cache service will fetch interleaved samples	*/
 #define CCR_WORDSIZEDSAMPLES	0x00400000	/* 1 = A cache service will fetch word sized samples	*/
+#define CCR_READADDRESS		0x06100009
 #define CCR_READADDRESS_MASK	0x003f0000	/* Location of cache just beyond current cache service	*/
 #define CCR_LOOPINVALSIZE	0x0000fe00	/* Number of invalid samples in cache prior to loop	*/
 						/* NOTE: This is valid only if CACHELOOPFLAG is set	*/