Merge /spare/repo/linux-2.6/

6 files changed, 56 insertions, 64 deletions

diff --git a/include/media/audiochip.h b/include/media/audiochip.h
index d3e9e30608dc..cd831168fdc1 100644
--- a/include/media/audiochip.h
+++ b/include/media/audiochip.h
@@ -1,3 +1,7 @@
+/*
+ * $Id: audiochip.h,v 1.5 2005/06/16 22:59:16 hhackmann Exp $
+ */
+
 #ifndef AUDIOCHIP_H
 #define AUDIOCHIP_H
 
@@ -31,5 +35,4 @@
 
 /* misc stuff to pass around config info to i2c chips */
 #define AUDC_CONFIG_PINNACLE  _IOW('m',32,int)
-
 #endif /* AUDIOCHIP_H */
diff --git a/include/media/id.h b/include/media/id.h
index 1b0320dc8f73..a39a6423914b 100644
--- a/include/media/id.h
+++ b/include/media/id.h
@@ -1,3 +1,7 @@
+/*
+ * $Id: id.h,v 1.4 2005/06/12 04:19:19 mchehab Exp $
+ */
+
 /* FIXME: this temporarely, until these are included in linux/i2c-id.h */
 
 /* drivers */
diff --git a/include/media/ir-common.h b/include/media/ir-common.h
index 62c963a52d86..698670547f16 100644
--- a/include/media/ir-common.h
+++ b/include/media/ir-common.h
@@ -1,5 +1,5 @@
 /*
- * $Id: ir-common.h,v 1.8 2005/02/22 12:28:40 kraxel Exp $
+ * $Id: ir-common.h,v 1.9 2005/05/15 19:01:26 mchehab Exp $
  *
  * some common structs and functions to handle infrared remotes via
  * input layer ...
@@ -50,6 +50,7 @@ extern IR_KEYTAB_TYPE ir_codes_rc5_tv[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_winfast[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_empty[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_hauppauge_new[IR_KEYTAB_SIZE];
+extern IR_KEYTAB_TYPE ir_codes_pixelview[IR_KEYTAB_SIZE];
 
 void ir_input_init(struct input_dev *dev, struct ir_input_state *ir,
                    int ir_type, IR_KEYTAB_TYPE *ir_codes);
diff --git a/include/media/saa6752hs.h b/include/media/saa6752hs.h
index 791bad2b86e9..3b8686ead80d 100644
--- a/include/media/saa6752hs.h
+++ b/include/media/saa6752hs.h
@@ -18,55 +18,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#if 0 /* ndef _SAA6752HS_H */
-#define _SAA6752HS_H
-
-enum mpeg_video_bitrate_mode {
-        MPEG_VIDEO_BITRATE_MODE_VBR = 0, /* Variable bitrate */
-        MPEG_VIDEO_BITRATE_MODE_CBR = 1, /* Constant bitrate */
-
-        MPEG_VIDEO_BITRATE_MODE_MAX
-};
-
-enum mpeg_audio_bitrate {
-        MPEG_AUDIO_BITRATE_256 = 0, /* 256 kBit/sec */
-        MPEG_AUDIO_BITRATE_384 = 1, /* 384 kBit/sec */
-
-        MPEG_AUDIO_BITRATE_MAX
-};
-
-enum mpeg_video_format {
-        MPEG_VIDEO_FORMAT_D1 = 0,
-        MPEG_VIDEO_FORMAT_2_3_D1 = 1,
-        MPEG_VIDEO_FORMAT_1_2_D1 = 2,
-        MPEG_VIDEO_FORMAT_SIF = 3,
-
-        MPEG_VIDEO_FORMAT_MAX
-};
-
-#define MPEG_VIDEO_TARGET_BITRATE_MAX 27000
-#define MPEG_VIDEO_MAX_BITRATE_MAX 27000
-#define MPEG_TOTAL_BITRATE_MAX 27000
-#define MPEG_PID_MAX ((1 << 14) - 1)
-
-struct mpeg_params {
-        enum mpeg_video_bitrate_mode video_bitrate_mode;
-        unsigned int video_target_bitrate;
-        unsigned int video_max_bitrate; // only used for VBR
-        enum mpeg_audio_bitrate audio_bitrate;
-        unsigned int total_bitrate;
-
-        unsigned int pmt_pid;
-        unsigned int video_pid;
-        unsigned int audio_pid;
-        unsigned int pcr_pid;
-
-        enum mpeg_video_format video_format;
-};
-
-#define MPEG_SETPARAMS             _IOW('6',100,struct mpeg_params)
-
-#endif // _SAA6752HS_H
 
 /*
  * Local variables:
diff --git a/include/media/tuner.h b/include/media/tuner.h
index 156a9c51ffec..eeaa15ddee85 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -1,5 +1,6 @@
 
-/*
+/* $Id: tuner.h,v 1.45 2005/07/28 18:41:21 mchehab Exp $
+ *
     tuner.h - definition for different tuners
 
     Copyright (C) 1997 Markus Schroeder (schroedm@uni-duesseldorf.de)
@@ -23,7 +24,9 @@
 #ifndef _TUNER_H
 #define _TUNER_H
 
-#include "id.h"
+#include <linux/videodev2.h>
+
+#define ADDR_UNSET (255)
 
 #define TUNER_TEMIC_PAL     0        /* 4002 FH5 (3X 7756, 9483) */
 #define TUNER_PHILIPS_PAL_I 1
@@ -86,7 +89,7 @@
 #define TUNER_LG_NTSC_TAPE       47
 
 #define TUNER_TNF_8831BGFF       48
-#define TUNER_MICROTUNE_4042FI5  49     /* FusionHDTV 3 Gold - 4042 FI5 (3X 8147) */
+#define TUNER_MICROTUNE_4042FI5  49     /* DViCO FusionHDTV 3 Gold-Q - 4042 FI5 (3X 8147) */
 #define TUNER_TCL_2002N          50
 #define TUNER_PHILIPS_FM1256_IH3   51
 
@@ -96,7 +99,17 @@
 #define TUNER_LG_PAL_TAPE        55    /* Hauppauge PVR-150 PAL */
 
 #define TUNER_PHILIPS_FQ1216AME_MK4 56 /* Hauppauge PVR-150 PAL */
-#define TUNER_PHILIPS_FQ1236A_MK4 57   /* Hauppauge PVR-500MCE NTSC */
+#define TUNER_PHILIPS_FQ1236A_MK4   57   /* Hauppauge PVR-500MCE NTSC */
+
+#define TUNER_YMEC_TVF_8531MF 58
+#define TUNER_YMEC_TVF_5533MF 59        /* Pixelview Pro Ultra NTSC */
+#define TUNER_THOMSON_DTT7611 60        /* DViCO FusionHDTV 3 Gold-T */
+#define TUNER_TENA_9533_DI    61
+
+#define TUNER_TEA5767         62        /* Only FM Radio Tuner */
+#define TUNER_PHILIPS_FMD1216ME_MK3 63
+#define TUNER_LG_TDVS_H062F   64        /* DViCO FusionHDTV 5 */
+#define TUNER_YMEC_TVF66T5_B_DFF 65     /* Acorp Y878F */
 
 #define NOTUNER 0
 #define PAL     1       /* PAL_BG */
@@ -104,6 +117,7 @@
 #define NTSC    3
 #define SECAM   4
 #define ATSC    5
+#define RADIO   6
 
 #define NoTuner 0
 #define Philips 1
@@ -119,10 +133,9 @@
 #define TCL     11
 #define THOMSON 12
 
-#define TUNER_SET_TYPE               _IOW('t',1,int)    /* set tuner type */
-#define TUNER_SET_TVFREQ             _IOW('t',2,int)    /* set tv freq */
+#define TUNER_SET_TYPE_ADDR          _IOW('T',3,int)
+#define TDA9887_SET_CONFIG           _IOW('t',5,int)
 
-#define  TDA9887_SET_CONFIG          _IOW('t',5,int)
 /* tv card specific */
 # define TDA9887_PRESENT             (1<<0)
 # define TDA9887_PORT1_INACTIVE      (1<<1)
@@ -143,19 +156,34 @@
 #define I2C_ADDR_TDA8290        0x4b
 #define I2C_ADDR_TDA8275        0x61
 
+enum tuner_mode {
+        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_setup {
+        unsigned short          addr;
+        unsigned int            type;
+        unsigned int            mode_mask;
+};
+
 struct tuner {
         /* device */
         struct i2c_client i2c;
 
-        /* state + config */
-        unsigned int initialized;
         unsigned int type;            /* chip type */
+
+        unsigned int          mode;
+        unsigned int          mode_mask; /* Combination of allowable modes */
+
         unsigned int freq;            /* keep track of the current settings */
+        unsigned int audmode;
         v4l2_std_id  std;
-        int          using_v4l2;
 
-        enum v4l2_tuner_type mode;
-        unsigned int input;
+        int          using_v4l2;
 
         /* used by MT2032 */
         unsigned int xogc;
@@ -177,7 +205,9 @@ extern unsigned const int tuner_count;
 
 extern int microtune_init(struct i2c_client *c);
 extern int tda8290_init(struct i2c_client *c);
+extern int tea5767_tuner_init(struct i2c_client *c);
 extern int default_tuner_init(struct i2c_client *c);
+extern int tea5767_autodetection(struct i2c_client *c);
 
 #define tuner_warn(fmt, arg...) \
         dev_printk(KERN_WARNING , &t->i2c.dev , fmt , ## arg)
diff --git a/include/media/tveeprom.h b/include/media/tveeprom.h
index 627603e561a6..854a2c2f105b 100644
--- a/include/media/tveeprom.h
+++ b/include/media/tveeprom.h
@@ -1,3 +1,7 @@
+/*
+ * $Id: tveeprom.h,v 1.2 2005/06/12 04:19:19 mchehab Exp $
+ */
+
 struct tveeprom {
         u32 has_radio;
 
@@ -20,4 +24,3 @@ void tveeprom_hauppauge_analog(struct tveeprom *tvee,
                                unsigned char *eeprom_data);
 
 int tveeprom_read(struct i2c_client *c, unsigned char *eedata, int len);
-int tveeprom_dump(unsigned char *eedata, int len);