From e4a3e5710f9d49095149a7ec54b295bfe177d456 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <devnull@localhost>
Date: Tue, 28 Jun 2005 03:17:39 +0000
Subject:         * cx88-i2c.c, cx88-video.c, saa7134-i2c.c, tuner-core.c,
 tuner.h:         - Improved support for multi tuners on multi boards.

        *tuner-core.c:
        - Pal M and PAL N added to tuner_fixup_std

        * tuner-simple.c:
        - Eliminated old tea code from tuner-simple.

        Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
---
 linux/include/media/tuner.h | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'linux/include/media/tuner.h')

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;
-- 
cgit v1.2.3