V4L: tveeprom improved to support newer Hauppage cards
PATCH 2/2 V4L: tveeprom improved to support newer Hauppage cards
- tveeprom improved and updated to reflect newer Hauppage cards.
- CodingStyle fixes.
Signed-off-by Hans Verkuil <[email protected]>
Signed-off-by Mauro Carvalho Chehab <[email protected]>
linux/drivers/media/video/bttv-cards.c | 3 linux/drivers/media/video/bttv-driver.c | 1 linux/drivers/media/video/cx88/cx88-cards.c | 2 linux/drivers/media/video/tveeprom.c | 329 +++++++++++++------- linux/include/media/tveeprom.h | 8 5 files changed, 239 insertions(+), 104 deletions(-)
drivers/media/video/bttv-driver.c renamed from tmp/dst.29011 +1 -0
@@ -4079,6 +4079,7 @@ static int bttv_suspend(struct pci_dev *struct bttv_buffer_set idle;unsigned long flags; +dprintk ("bttv%d: suspend %d\n" , btv->c.nr, state.event);/* stop dma + irqs */ spin_lock_irqsave (&btv->s_lock,flags);
drivers/media/video/bttv-cards.c renamed from tmp/dst.29011 +2 -1
@@ -3062,7 +3062,7 @@ static void __devinit hauppauge_eeprom(s {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; }
@@ -4487,6 +4487,7 @@ void __devinit bttv_check_chipset(void) }if (UNSET != latency)printk (KERN_INFO "bttv: pci latency fixup [%d]\n" ,latency); +while ((dev =pci_find_device (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82441 , dev))) {unsigned char b;
drivers/media/video/cx88/cx88-cards.c renamed from tmp/dst.29011 +1 -1
@@ -945,7 +945,7 @@ static void hauppauge_eeprom(struct cx88 {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; }
include/media/tveeprom.h renamed from tmp/dst.29011 +6 -2
@@ -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 @@ 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);
drivers/media/video/tveeprom.c renamed from tmp/dst.29011 +229 -100
486 lines not on this page · raw message