summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa7134/saa7134-input.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-11-12 15:30:19 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-11-12 15:30:19 -0200
commit09aed8a358a9de22ae31897cb5a9b82f7fa73310 (patch)
tree9d4b51895a42b7018cfd6b85d8f1e36d32192fdf /linux/drivers/media/video/saa7134/saa7134-input.c
parent7b002be60b03a06493b32634f963bdf5c9b9d87e (diff)
parent0d93b580aad1ef28486437831a00212fea35356f (diff)
downloadmediapointer-dvb-s2-09aed8a358a9de22ae31897cb5a9b82f7fa73310.tar.gz
mediapointer-dvb-s2-09aed8a358a9de22ae31897cb5a9b82f7fa73310.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-input.c')
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-input.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-input.c b/linux/drivers/media/video/saa7134/saa7134-input.c
index 99462db8f..c7df8d1c5 100644
--- a/linux/drivers/media/video/saa7134/saa7134-input.c
+++ b/linux/drivers/media/video/saa7134/saa7134-input.c
@@ -187,7 +187,6 @@ int saa7134_input_init1(struct saa7134_dev *dev)
case SAA7134_BOARD_AVERMEDIA_STUDIO_307:
case SAA7134_BOARD_AVERMEDIA_STUDIO_507:
case SAA7134_BOARD_AVERMEDIA_GO_007_FM:
- case SAA7134_BOARD_AVERMEDIA_A16AR:
ir_codes = ir_codes_avermedia;
mask_keycode = 0x0007C8;
mask_keydown = 0x000010;
@@ -196,6 +195,15 @@ int saa7134_input_init1(struct saa7134_dev *dev)
saa_setb(SAA7134_GPIO_GPMODE0, 0x4);
saa_setb(SAA7134_GPIO_GPSTATUS0, 0x4);
break;
+ case SAA7134_BOARD_AVERMEDIA_777:
+ case SAA7134_BOARD_AVERMEDIA_A16AR:
+ ir_codes = ir_codes_avermedia;
+ mask_keycode = 0x02F200;
+ mask_keydown = 0x000400;
+ polling = 50; // ms
+ /* Without this we won't receive key up events */
+ saa_setb(SAA7134_GPIO_GPMODE1, 0x1);
+ saa_setb(SAA7134_GPIO_GPSTATUS1, 0x1);
case SAA7134_BOARD_KWORLD_TERMINATOR:
ir_codes = ir_codes_pixelview;
mask_keycode = 0x00001f;