aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx/em28xx-cards.c
diff options
context:
space:
mode:
authorDevin Heitmueller <devin.heitmueller@gmail.com>2008-11-13 01:15:55 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-29 14:53:33 -0500
commit4b92253acc723f365ad6b2f32e4118e38133b7b8 (patch)
tree509874e833c9330a29c85c554b01df1380ca6052 /drivers/media/video/em28xx/em28xx-cards.c
parent0a6b8a851efae71b0a6f2cbf5d40880553dfabaa (diff)
V4L/DVB (9628): em28xx: refactor IR support
Refactor the em28xx IR support based on the em2860/em2880 and em2874 datasheets. Tested on the HVR-950 (em2883), Pinnacle 800e (em2883), Pinnacle 80e (em2874) using the remote controls that came with those products. Signed-off-by: Devin Heitmueller <devin.heitmueller@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-cards.c')
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 1d38bfaa3e7c..3b585486f7fe 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -592,6 +592,7 @@ struct em28xx_board em28xx_boards[] = {
592 .mts_firmware = 1, 592 .mts_firmware = 1,
593 .has_12mhz_i2s = 1, 593 .has_12mhz_i2s = 1,
594 .has_dvb = 1, 594 .has_dvb = 1,
595 .ir_codes = ir_codes_hauppauge_new,
595 .decoder = EM28XX_TVP5150, 596 .decoder = EM28XX_TVP5150,
596 .input = { { 597 .input = { {
597 .type = EM28XX_VMUX_TELEVISION, 598 .type = EM28XX_VMUX_TELEVISION,
@@ -615,6 +616,7 @@ struct em28xx_board em28xx_boards[] = {
615 .mts_firmware = 1, 616 .mts_firmware = 1,
616 .has_12mhz_i2s = 1, 617 .has_12mhz_i2s = 1,
617 .has_dvb = 1, 618 .has_dvb = 1,
619 .ir_codes = ir_codes_pinnacle_pctv_hd,
618 .decoder = EM28XX_TVP5150, 620 .decoder = EM28XX_TVP5150,
619 .input = { { 621 .input = { {
620 .type = EM28XX_VMUX_TELEVISION, 622 .type = EM28XX_VMUX_TELEVISION,
@@ -1092,6 +1094,7 @@ struct em28xx_board em28xx_boards[] = {
1092 .vchannels = 0, 1094 .vchannels = 0,
1093 .tuner_type = TUNER_ABSENT, 1095 .tuner_type = TUNER_ABSENT,
1094 .has_dvb = 1, 1096 .has_dvb = 1,
1097 .ir_codes = ir_codes_pinnacle_pctv_hd,
1095 .decoder = EM28XX_NODECODER, 1098 .decoder = EM28XX_NODECODER,
1096#ifdef DJH_DEBUG 1099#ifdef DJH_DEBUG
1097 .input = { { 1100 .input = { {
@@ -1329,6 +1332,7 @@ static void em28xx_set_model(struct em28xx *dev)
1329 dev->max_range_640_480 = em28xx_boards[dev->model].max_range_640_480; 1332 dev->max_range_640_480 = em28xx_boards[dev->model].max_range_640_480;
1330 dev->has_dvb = em28xx_boards[dev->model].has_dvb; 1333 dev->has_dvb = em28xx_boards[dev->model].has_dvb;
1331 dev->has_snapshot_button = em28xx_boards[dev->model].has_snapshot_button; 1334 dev->has_snapshot_button = em28xx_boards[dev->model].has_snapshot_button;
1335 dev->ir_codes = em28xx_boards[dev->model].ir_codes;
1332 dev->valid = em28xx_boards[dev->model].valid; 1336 dev->valid = em28xx_boards[dev->model].valid;
1333} 1337}
1334 1338