patch-2.4.21 linux-2.4.21/drivers/media/video/bttvp.h
Next file: linux-2.4.21/drivers/media/video/cpia.c
Previous file: linux-2.4.21/drivers/media/video/bttv.h
Back to the patch index
Back to the overall index
- Lines: 93
- Date:
2003-06-13 07:51:34.000000000 -0700
- Orig file:
linux-2.4.20/drivers/media/video/bttvp.h
- Orig date:
2002-11-28 15:53:13.000000000 -0800
diff -urN linux-2.4.20/drivers/media/video/bttvp.h linux-2.4.21/drivers/media/video/bttvp.h
@@ -25,7 +25,7 @@
#ifndef _BTTVP_H_
#define _BTTVP_H_
-#define BTTV_VERSION_CODE KERNEL_VERSION(0,7,96)
+#define BTTV_VERSION_CODE KERNEL_VERSION(0,7,104)
#include <linux/types.h>
#include <linux/wait.h>
@@ -42,7 +42,7 @@
/* bttv-driver.c */
/* insmod options / kernel args */
-extern int no_overlay;
+extern unsigned int no_overlay;
extern unsigned int bttv_verbose;
extern unsigned int bttv_debug;
extern unsigned int bttv_gpio;
@@ -50,17 +50,15 @@
extern int init_bttv_i2c(struct bttv *btv);
extern int pvr_boot(struct bttv *btv);
-#define dprintk if (bttv_debug) printk
+#define dprintk if (bttv_debug) printk
+#define vprintk if (bttv_verbose) printk
/* Anybody who uses more than four? */
#define BTTV_MAX 4
-extern int bttv_num; /* number of Bt848s in use */
+extern unsigned int bttv_num; /* number of Bt848s in use */
extern struct bttv bttvs[BTTV_MAX];
-
-#ifndef O_NONCAP
-#define O_NONCAP O_TRUNC
-#endif
+#define UNSET -1U
#ifdef VIDEODAT_HACK
# define VBI_MAXLINES 19
@@ -120,18 +118,17 @@
spinlock_t s_lock;
struct semaphore lock;
- int user;
- int capuser;
+ unsigned int user;
/* i2c */
struct i2c_adapter i2c_adap;
struct i2c_algo_bit_data i2c_algo;
struct i2c_client i2c_client;
int i2c_state, i2c_rc;
- struct i2c_client *i2c_clients[I2C_CLIENTS_MAX];
- int tuner_type;
- int channel;
+ unsigned int tuner_type;
+ unsigned int pinnacle_id;
+ unsigned int channel;
unsigned int nr;
unsigned short id;
@@ -146,7 +143,7 @@
struct bttv_window win;
int fb_color_ctl;
int type; /* card type */
- int cardid;
+ unsigned int cardid;
int audio; /* audio mode */
int audio_chip; /* set to one of the chips supported by bttv.c */
int radio;
@@ -161,6 +158,11 @@
int mbox_most;
int mbox_mask;
+ /* ISA stuff (Terratec Active Radio Upgrade) */
+ int mbox_ior;
+ int mbox_iow;
+ int mbox_csel;
+
u32 *risc_jmp;
u32 *vbi_odd;
u32 *vbi_even;
@@ -168,7 +170,7 @@
u32 bus_vbi_odd;
wait_queue_head_t vbiq;
wait_queue_head_t capq;
- int vbip;
+ unsigned int vbip;
u32 *risc_scr_odd;
u32 *risc_scr_even;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)