diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-05 10:30:39 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-05 10:30:39 -0200 |
| commit | d0b48ff1d8682f060368a30911d74b455d0084ab (patch) | |
| tree | 70b3205d43a729b18d7f0b7531bb2e609a52483a /linux/drivers/media/video | |
| parent | 360996f106d2d16808c20857bd925197884237a5 (diff) | |
| download | mediapointer-dvb-s2-d0b48ff1d8682f060368a30911d74b455d0084ab.tar.gz mediapointer-dvb-s2-d0b48ff1d8682f060368a30911d74b455d0084ab.tar.bz2 | |
Make HVR900 to use also tveeprom
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Hauppauge firmwares can be decoded using tveeprom. This patch adds HVR-900 as
a tveeprom client. It also adds xc3028 tuner entry to tveeprom.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-cards.c | 8 | ||||
| -rw-r--r-- | linux/drivers/media/video/tveeprom.c | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-cards.c b/linux/drivers/media/video/em28xx/em28xx-cards.c index 5b50232f4..b4535c5c0 100644 --- a/linux/drivers/media/video/em28xx/em28xx-cards.c +++ b/linux/drivers/media/video/em28xx/em28xx-cards.c @@ -588,11 +588,11 @@ void em28xx_card_setup(struct em28xx *dev) /* request some modules */ switch (dev->model) { case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2: + case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900: { struct tveeprom tv; #ifdef CONFIG_MODULES request_module("tveeprom"); - request_module("ir-kbd-i2c"); #endif /* Call first TVeeprom */ @@ -604,6 +604,12 @@ void em28xx_card_setup(struct em28xx *dev) dev->i2s_speed = 2048000; dev->has_msp34xx = 1; } +#ifdef CONFIG_MODULES + if (tv.has_ir) + request_module("ir-kbd-i2c"); +#endif + /* FIXME: Should also retrieve decoder processor type */ + break; } case EM2820_BOARD_KWORLD_PVRTV2800RF: diff --git a/linux/drivers/media/video/tveeprom.c b/linux/drivers/media/video/tveeprom.c index d0bbf7969..baef98966 100644 --- a/linux/drivers/media/video/tveeprom.c +++ b/linux/drivers/media/video/tveeprom.c @@ -230,7 +230,7 @@ hauppauge_tuner[] = { TUNER_ABSENT, "TCL M2523_3DI_E"}, { TUNER_ABSENT, "Samsung THPD5222FG30A"}, /* 120-129 */ - { TUNER_ABSENT, "Xceive XC3028"}, + { TUNER_XC2028, "Xceive XC3028"}, { TUNER_ABSENT, "Philips FQ1216LME MK5"}, { TUNER_ABSENT, "Philips FQD1216LME"}, { TUNER_ABSENT, "Conexant CX24118A"}, |