patch-2.1.126 linux/drivers/char/bttv.h
Next file: linux/drivers/char/bw-qcam.c
Previous file: linux/drivers/char/bttv.c
Back to the patch index
Back to the overall index
- Lines: 67
- Date:
Sat Oct 17 15:52:18 1998
- Orig file:
v2.1.125/linux/drivers/char/bttv.h
- Orig date:
Sat Sep 5 16:46:40 1998
diff -u --recursive --new-file v2.1.125/linux/drivers/char/bttv.h linux/drivers/char/bttv.h
@@ -31,12 +31,11 @@
#include "bt848.h"
#include <linux/videodev.h>
-#define MAX_CLIPRECS 100
#define MAX_GBUFFERS 2
#define RISCMEM_LEN (32744*2)
/* maximum needed buffer size for extended VBI frame mode capturing */
-#define BTTV_MAX_FBUF 0x151000
+#define BTTV_MAX_FBUF 0x190000
#ifdef __KERNEL__
@@ -56,11 +55,11 @@
ushort depth;
};
-
struct bttv_pll_info {
- unsigned int pll_ifreq; /* PLL input frequency */
- unsigned int pll_ofreq; /* PLL output frequency */
+ unsigned int pll_ifreq; /* PLL input frequency */
+ unsigned int pll_ofreq; /* PLL output frequency */
unsigned int pll_crystal; /* Crystal used for input */
+ unsigned int pll_current; /* Current programmed ofrq*/
};
struct bttv
@@ -116,6 +115,7 @@
struct gbuffer *ogbuffers;
struct gbuffer *egbuffers;
u16 gwidth, gheight, gfmt;
+ u16 gwidth_next, gheight_next, gfmt_next;
u32 *grisc;
unsigned long gro;
@@ -143,6 +143,7 @@
int i2c_command;
int triton1;
};
+
#endif
/*The following should be done in more portable way. It depends on define
@@ -167,6 +168,10 @@
#define BTTV_GRAB _IOR('v' , BASE_VIDIOCPRIVATE+2, struct gbuf)
#define BTTV_FIELDNR _IOR('v' , BASE_VIDIOCPRIVATE+2, unsigned int)
#define BTTV_PLLSET _IOW('v' , BASE_VIDIOCPRIVATE+3, struct bttv_pll_info)
+#define BTTV_BURST_ON _IOR('v' , BASE_VIDIOCPRIVATE+4, int)
+#define BTTV_BURST_OFF _IOR('v' , BASE_VIDIOCPRIVATE+5, int)
+#define BTTV_NAGRAVERSION _IOR('v' , BASE_VIDIOCPRIVATE+6, int)
+#define BTTV_PICNR _IOR('v' , BASE_VIDIOCPRIVATE+7, int)
#define BTTV_UNKNOWN 0x00
@@ -178,7 +183,9 @@
#define BTTV_AVERMEDIA 0x06
#define BTTV_MATRIX_VISION 0x07
#define BTTV_FLYVIDEO 0x08
-#define BTTV_HAUPPAUGE878 0x09
+#define BTTV_TURBOTV 0x09
+#define BTTV_HAUPPAUGE878 0x0a
+#define BTTV_MIROPRO 0x0b
#define AUDIO_TUNER 0x00
#define AUDIO_RADIO 0x01
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov