From 8deaf683058ae8423013f3c34e4a86ab94ad094d Mon Sep 17 00:00:00 2001 From: Tony Wan Date: Fri, 11 May 2007 11:33:50 -0300 Subject: [PATCH] --- yaml --- r: 61271 b: refs/heads/master c: 480f75acbc1452c0fc7b2ee595bde17c18f798aa h: refs/heads/master i: 61269: 360dbde16736060069067f74777269112b457b8a 61267: c2a0a0dd2f510b2cd96341eff5a614faa74ab935 61263: 69b89099470bd3b78a35d26ffb7e42b7423dd0f0 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/saa7134/saa7134-cards.c | 1 + trunk/drivers/media/video/saa7134/saa7134-input.c | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f14169c10d50..447382a22eb7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aaccb82bdb93889987497b2b712c5160cdf79240 +refs/heads/master: 480f75acbc1452c0fc7b2ee595bde17c18f798aa diff --git a/trunk/drivers/media/video/saa7134/saa7134-cards.c b/trunk/drivers/media/video/saa7134/saa7134-cards.c index 44f207780a49..5813509e3992 100644 --- a/trunk/drivers/media/video/saa7134/saa7134-cards.c +++ b/trunk/drivers/media/video/saa7134/saa7134-cards.c @@ -4368,6 +4368,7 @@ int saa7134_board_init1(struct saa7134_dev *dev) case SAA7134_BOARD_AVERMEDIA_A16AR: case SAA7134_BOARD_ENCORE_ENLTV: case SAA7134_BOARD_ENCORE_ENLTV_FM: + case SAA7134_BOARD_10MOONSTVMASTER3: dev->has_remote = SAA7134_REMOTE_GPIO; break; case SAA7134_BOARD_FLYDVBS_LR300: diff --git a/trunk/drivers/media/video/saa7134/saa7134-input.c b/trunk/drivers/media/video/saa7134/saa7134-input.c index c0de37e3f5c6..817d4b62e222 100644 --- a/trunk/drivers/media/video/saa7134/saa7134-input.c +++ b/trunk/drivers/media/video/saa7134/saa7134-input.c @@ -333,6 +333,12 @@ int saa7134_input_init1(struct saa7134_dev *dev) mask_keyup = 0x040000; polling = 50; // ms break; + case SAA7134_BOARD_10MOONSTVMASTER3: + ir_codes = ir_codes_encore_enltv; + mask_keycode = 0x5f80000; + mask_keyup = 0x8000000; + polling = 50; //ms + break; } if (NULL == ir_codes) { printk("%s: Oops: IR config error [card=%d]\n",