[PATCH 14/24] V4L: tveeprom patch was not complete. Completing it.

[mchehab@brturbo.com.br]

.

- tveeprom patch was not complete. Completing it.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>

 linux/drivers/media/video/bttv-cards.c      |    2 +-
 linux/drivers/media/video/cx88/cx88-cards.c |    2 +-
 linux/include/media/tveeprom.h              |    8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff -u /tmp/dst.380 linux/drivers/media/video/bttv-cards.c
--- /tmp/dst.380	2005-09-05 11:42:58.000000000 -0300
+++ linux/drivers/media/video/bttv-cards.c	2005-09-05 11:42:58.000000000 -0300
@@ -3062,7 +3062,7 @@
 {
 	struct tveeprom tv;
 
-	tveeprom_hauppauge_analog(&tv, eeprom_data);
+	tveeprom_hauppauge_analog(&btv->i2c_client, &tv, eeprom_data);
 	btv->tuner_type = tv.tuner_type;
 	btv->has_radio  = tv.has_radio;
 }
diff -u /tmp/dst.380 linux/drivers/media/video/cx88/cx88-cards.c
--- /tmp/dst.380	2005-09-05 11:42:58.000000000 -0300
+++ linux/drivers/media/video/cx88/cx88-cards.c	2005-09-05 11:42:58.000000000 -0300
@@ -945,7 +945,7 @@
 {
 	struct tveeprom tv;
 
-	tveeprom_hauppauge_analog(&tv, eeprom_data);
+	tveeprom_hauppauge_analog(&core->i2c_client, &tv, eeprom_data);
 	core->tuner_type = tv.tuner_type;
 	core->has_radio  = tv.has_radio;
 }
diff -u /tmp/dst.380 linux/include/media/tveeprom.h
--- /tmp/dst.380	2005-09-05 11:42:59.000000000 -0300
+++ linux/include/media/tveeprom.h	2005-09-05 11:42:59.000000000 -0300
@@ -3,15 +3,19 @@
 
 struct tveeprom {
 	u32 has_radio;
+	u32 has_ir;     /* 0: no IR, 1: IR present, 2: unknown */
 
 	u32 tuner_type;
 	u32 tuner_formats;
 
+	u32 tuner2_type;
+	u32 tuner2_formats;
+
 	u32 digitizer;
 	u32 digitizer_formats;
 
 	u32 audio_processor;
-	/* a_p_fmts? */
+	u32 decoder_processor;
 
 	u32 model;
 	u32 revision;
@@ -19,7 +23,7 @@
 	char rev_str[5];
 };
 
-void tveeprom_hauppauge_analog(struct tveeprom *tvee,
+void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
 			       unsigned char *eeprom_data);
 
 int tveeprom_read(struct i2c_client *c, unsigned char *eedata, int len);