summaryrefslogtreecommitdiff
path: root/linux/include/media
diff options
context:
space:
mode:
Diffstat (limited to 'linux/include/media')
-rw-r--r--linux/include/media/tuner.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h
index c24769c69..a40ca4d48 100644
--- a/linux/include/media/tuner.h
+++ b/linux/include/media/tuner.h
@@ -1,5 +1,5 @@
-/* $Id: tuner.h,v 1.34 2005/06/22 22:31:38 nsh Exp $
+/* $Id: tuner.h,v 1.35 2005/06/28 03:17:39 mchehab Exp $
*
tuner.h - definition for different tuners
@@ -169,8 +169,16 @@ enum v4l_radio_tuner {
#define I2C_ADDR_TDA8290 0x4b
#define I2C_ADDR_TDA8275 0x61
+enum tuner_admin_state {
+ T_UNINITIALIZED = 0,
+ T_RADIO = 1<<V4L2_TUNER_RADIO,
+ T_ANALOG_TV = 1<<V4L2_TUNER_ANALOG_TV,
+ T_DIGITAL_TV = 1<<V4L2_TUNER_DIGITAL_TV,
+ T_STANDBY = 1<<31
+};
+
struct tuner_addr {
- enum v4l2_tuner_type v4l2_tuner;
+ enum tuner_admin_state v4l2_tuner;
unsigned int type;
unsigned short addr;
};
@@ -180,7 +188,7 @@ struct tuner {
struct i2c_client i2c;
/* state + config */
- unsigned int initialized;
+ unsigned int admin_status;
unsigned int type; /* chip type */
unsigned int freq; /* keep track of the current settings */
v4l2_std_id std;