diff options
| author | Nickolay V. Shmyrev <devnull@localhost> | 2005-09-28 20:34:07 +0000 |
|---|---|---|
| committer | Nickolay V. Shmyrev <devnull@localhost> | 2005-09-28 20:34:07 +0000 |
| commit | d4fd93973761eab19082d6f48339cf851a84ebc6 (patch) | |
| tree | ce5f52228a727f0ac0e5cab41d37cdd9ab392e1c | |
| parent | f11c84c380a266c3b4d5a99137a6029a04f2f3c9 (diff) | |
| download | mediapointer-dvb-s2-d4fd93973761eab19082d6f48339cf851a84ebc6.tar.gz mediapointer-dvb-s2-d4fd93973761eab19082d6f48339cf851a84ebc6.tar.bz2 | |
* saa7134-cards.c: (saa7134_board_init1):
* saa7134-input.c: (saa7134_input_init1):
Add remote for DVB-T300 Remote.
Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-input.c | 7 | ||||
| -rw-r--r-- | v4l/ChangeLog | 9 |
3 files changed, 17 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index 559bc42a1..69aebf947 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-cards.c,v 1.94 2005/09/14 18:38:33 nsh Exp $ + * $Id: saa7134-cards.c,v 1.95 2005/09/28 20:34:07 nsh Exp $ * * device driver for philips saa7134 based TV cards * card-specific stuff. @@ -2846,6 +2846,7 @@ int saa7134_board_init1(struct saa7134_dev *dev) /* case SAA7134_BOARD_SABRENT_SBTTVFM: */ /* not finished yet */ case SAA7134_BOARD_VIDEOMATE_TV_PVR: case SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUSII: + case SAA7134_BOARD_VIDEOMATE_DVBT_300: case SAA7134_BOARD_MANLI_MTV001: case SAA7134_BOARD_MANLI_MTV002: case SAA7134_BOARD_BEHOLD_409FM: diff --git a/linux/drivers/media/video/saa7134/saa7134-input.c b/linux/drivers/media/video/saa7134/saa7134-input.c index a007b48dc..ca483da88 100644 --- a/linux/drivers/media/video/saa7134/saa7134-input.c +++ b/linux/drivers/media/video/saa7134/saa7134-input.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-input.c,v 1.28 2005/09/10 07:29:46 nsh Exp $ + * $Id: saa7134-input.c,v 1.29 2005/09/28 20:34:07 nsh Exp $ * * handle saa7134 IR remotes via linux kernel input layer. * @@ -581,6 +581,11 @@ int saa7134_input_init1(struct saa7134_dev *dev) mask_keyup = 0x400000; polling = 50; // ms break; + case SAA7134_BOARD_VIDEOMATE_DVBT_300: + ir_codes = videomate_tv_pvr_codes; + mask_keycode = 0x003F00; + mask_keyup = 0x040000; + break; } if (NULL == ir_codes) { printk("%s: Oops: IR config error [card=%d]\n", diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 2f3a41e5a..48f4bc10c 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,5 +1,14 @@ 2005-09-28 20:04 nshmyrev + * saa7134-cards.c: (saa7134_board_init1): + * saa7134-input.c: (saa7134_input_init1): + + Add remote for DVB-T300 Remote. + + Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru> + +2005-09-28 20:04 nshmyrev + * bttv-cards.c: - Fix source charset. Make symbols UTF-8. |