diff options
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 8 | ||||
| -rw-r--r-- | linux/drivers/media/video/tveeprom.c | 15 | ||||
| -rw-r--r-- | v4l/ChangeLog | 17 |
3 files changed, 30 insertions, 10 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index 5781ef4b1..117e925a5 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.107 2005/11/22 19:32:26 mkrufky Exp $ + * $Id: cx88-cards.c,v 1.108 2005/11/25 10:24:13 mchehab Exp $ * * device driver for Conexant 2388x based TV cards * card-specific stuff. @@ -1155,11 +1155,13 @@ static void hauppauge_eeprom(struct cx88_core *core, u8 *eeprom_data) switch (tv.model) { case 90002: /* Nova-T-PCI (9002) */ + case 92001: /* Nova-S-Plus (Video and IR) */ + case 92002: /* Nova-S-Plus (Video and IR) */ + case 90003: /* Nova-T-PCI (9002 No RF out) */ case 90500: /* Nova-T-PCI (oem) */ case 90501: /* Nova-T-PCI (oem/IR) */ case 92000: /* Nova-SE2 (OEM, No Video or IR) */ - case 92001: /* Nova-S-Plus (Video and IR) */ - case 92002: /* Nova-S-Plus (Video and IR) */ + /* known */ break; default: diff --git a/linux/drivers/media/video/tveeprom.c b/linux/drivers/media/video/tveeprom.c index 0b090e849..3bc4a482a 100644 --- a/linux/drivers/media/video/tveeprom.c +++ b/linux/drivers/media/video/tveeprom.c @@ -397,14 +397,15 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee, memset(tvee, 0, sizeof(*tvee)); done = len = beenhere = 0; - /* Hack for processing eeprom for em28xx */ + /* Hack for processing eeprom for em28xx and cx 2388x*/ if ((eeprom_data[0] == 0x1a) && (eeprom_data[1] == 0xeb) && - (eeprom_data[2] == 0x67) && (eeprom_data[3] == 0x95)) - start=0xa0; - else if ((eeprom_data[0] == 0x1f) && (eeprom_data[8] == 0x84)) - start=8; - else if ((eeprom_data[0] == 0x17) && (eeprom_data[8] == 0x84)) - start=8; + (eeprom_data[2] == 0x67) && (eeprom_data[3] == 0x95)) + start=0xa0; /* Generic em28xx offset */ + else if (((eeprom_data[0] & 0xf0) == 0x10) && + (eeprom_data[1] == 0x00) && + (eeprom_data[2] == 0x00) && + (eeprom_data[8] == 0x84)) + start=8; /* Generic cx2388x offset */ else start=0; diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 33c7d01b5..a99606600 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,20 @@ +2005-11-25 10:21 mchehab + + * ../linux/drivers/media/video/tveeprom.c: + (tveeprom_hauppauge_analog): + + - Fixed code handling for eeprom on cx88 boards. + + * ../linux/drivers/media/video/cx88/cx88-cards.c: + (hauppauge_eeprom): + - Hauppauge released a new version of the Nova-T-PCI (9002) a few months + ago with a different (compatible) tuner (but lacking RF passthru). The + official model# is 90003. All features are working. + - Adding entry to the known model list after testing. + + Signed-off-by: Steven Toth <stoth@hauppauge.com> + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2005-11-24 21:57 nshmyrev * ../linux/drivers/media/video/bttv-driver.c: (bttv_common_ioctls), |