patch-2.1.105 linux/drivers/char/bttv.h

Next file: linux/drivers/char/lp.c
Previous file: linux/drivers/char/bttv.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.104/linux/drivers/char/bttv.h linux/drivers/char/bttv.h
@@ -33,14 +33,7 @@
 
 #define MAX_CLIPRECS	100
 #define RISCMEM_LEN	(32744*2)
-#define MAX_FBUF	0x144000
-
-struct riscprog 
-{
-	unsigned int length;  
-	u32 *busadr;
-	u32 *prog;
-};
+#define BTTV_MAX_FBUF	0x144000
 
 
 /* clipping rectangle */
@@ -51,29 +44,6 @@
 };
 
 
-/* grab buffer */
-struct gbuffer 
-{
-	struct gbuffer *next;
-	struct gbuffer *next_active;
-	void *adr;
-	int x, y;
-	int width, height;
-	unsigned int bpl;
-	unsigned int fmt;
-	int flags;
-#define GBUF_ODD  1
-#define GBUF_EVEN 2
-#define GBUF_LFB  4
-#define GBUF_INT  8
-	unsigned int length;
-	void *ro;
-	void *re;
-	u32 bro;
-	u32 bre;
-};
-
-
 #ifdef __KERNEL__
 
 struct bttv_window 
@@ -89,6 +59,7 @@
 	int norm;
 	int interlace;
 	int color_fmt;
+	ushort depth;
 };
 
 
@@ -119,7 +90,7 @@
 	int type;            /* card type  */
 	int audio;           /* audio mode */
 	int user;
-	int dbx;
+	int audio_chip;
 	int radio;
 
 	u32 *risc_jmp;
@@ -145,12 +116,15 @@
 	u32 *grisc;
 	unsigned long gro;
 	unsigned long gre;
+	unsigned long gro_next;
+	unsigned long gre_next;
 	char *fbuffer;
 	int gmode;
 	int grabbing;
 	int lastgrab;
 	int grab;
 	int grabcount;
+	int pll;
 };
 
 #endif
@@ -184,6 +158,8 @@
 #define BTTV_INTEL         0x04
 #define BTTV_DIAMOND       0x05 
 #define BTTV_AVERMEDIA     0x06 
+#define BTTV_MATRIX_VISION 0x07 
+#define BTTV_FLYVIDEO      0x08
 
 #define AUDIO_TUNER        0x00
 #define AUDIO_RADIO        0x01
@@ -194,8 +170,12 @@
 #define AUDIO_MUTE         0x80
 #define AUDIO_UNMUTE       0x81
 
+#define TDA9850            0x01
+#define TDA8425            0x02
+
 #define I2C_TSA5522        0xc2
 #define I2C_TDA9850        0xb6
+#define I2C_TDA8425        0x82
 #define I2C_HAUPEE         0xa0
 #define I2C_STBEE          0xae
 
@@ -206,5 +186,13 @@
 #define TDA9850_ALI1       0x08
 #define TDA9850_ALI2       0x09
 #define TDA9850_ALI3       0x0a
+
+
+#define TDA8425_VL         0x00
+#define TDA8425_VR         0x01
+#define TDA8425_BA         0x02
+#define TDA8425_TR         0x03
+#define TDA8425_S1         0x08
+ 
 
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov