diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
| commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
| tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /drivers/char/bttv.h | |
| parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) | |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'drivers/char/bttv.h')
| -rw-r--r-- | drivers/char/bttv.h | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/drivers/char/bttv.h b/drivers/char/bttv.h index f8da6c6d0..f780de12b 100644 --- a/drivers/char/bttv.h +++ b/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 @@ struct bttv_window 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 bttv 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 @@ struct bttv int i2c_command; int triton1; }; + #endif /*The following should be done in more portable way. It depends on define @@ -167,6 +168,10 @@ struct bttv #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,10 @@ struct bttv #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 BTTV_ADSTECH_TV 0x0c #define AUDIO_TUNER 0x00 #define AUDIO_RADIO 0x01 |