diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-08-30 05:11:41 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-08-30 05:11:41 +0000 |
| commit | 92a16dc4c122516cf49f876bf229d9741f19bac9 (patch) | |
| tree | 7a18b86707a24a07956223094b62e05f3f43e434 | |
| parent | f1580aa239dfdb58cfdc6cc399f7d7db29c4564a (diff) | |
| download | mediapointer-dvb-s2-92a16dc4c122516cf49f876bf229d9741f19bac9.tar.gz mediapointer-dvb-s2-92a16dc4c122516cf49f876bf229d9741f19bac9.tar.bz2 | |
* bttv-cards.c,cx88-cards.c,tveeprom.h:
- 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>
| -rw-r--r-- | linux/drivers/media/video/bttv-cards.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 4 | ||||
| -rw-r--r-- | linux/include/media/tveeprom.h | 10 | ||||
| -rw-r--r-- | v4l/ChangeLog | 8 |
4 files changed, 19 insertions, 7 deletions
diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c index acc904e2a..6e1b564c8 100644 --- a/linux/drivers/media/video/bttv-cards.c +++ b/linux/drivers/media/video/bttv-cards.c @@ -1,5 +1,5 @@ /* - $Id: bttv-cards.c,v 1.69 2005/08/25 06:06:52 mkrufky Exp $ + $Id: bttv-cards.c,v 1.70 2005/08/30 05:11:41 mchehab Exp $ bttv-cards.c @@ -3110,7 +3110,7 @@ static void __devinit hauppauge_eeprom(struct bttv *btv) { 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 --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index 8dc020ecf..e9be0bc95 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-cards.c,v 1.93 2005/08/07 09:24:08 mkrufky Exp $ + * $Id: cx88-cards.c,v 1.94 2005/08/30 05:11:41 mchehab Exp $ * * device driver for Conexant 2388x based TV cards * card-specific stuff. @@ -947,7 +947,7 @@ static void hauppauge_eeprom(struct cx88_core *core, u8 *eeprom_data) { 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 --git a/linux/include/media/tveeprom.h b/linux/include/media/tveeprom.h index aa634ce89..334e64216 100644 --- a/linux/include/media/tveeprom.h +++ b/linux/include/media/tveeprom.h @@ -1,18 +1,22 @@ /* - * $Id: tveeprom.h,v 1.3 2005/07/21 21:53:54 mkrufky Exp $ + * $Id: tveeprom.h,v 1.4 2005/08/30 05:11:41 mchehab Exp $ */ 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; @@ -20,7 +24,7 @@ struct tveeprom { 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); diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 5bc6150ef..68fa09aca 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,11 @@ +2005-08-30 05:09 + + * bttv-cards.c,cx88-cards.c,tveeprom.h: + - 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> + 2005-08-30 04:44 * tuner-simple.c, tuner.h: |