summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-cards.c3
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-input.c8
-rw-r--r--v4l/ChangeLog8
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 8f2bd98dd..082c357aa 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.98 2005/10/03 19:40:13 mkrufky Exp $
+ * $Id: saa7134-cards.c,v 1.99 2005/10/04 14:52:08 nsh Exp $
*
* device driver for philips saa7134 based TV cards
* card-specific stuff.
@@ -2887,6 +2887,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
case SAA7134_BOARD_BEHOLD_409FM:
case SAA7134_BOARD_AVACSSMARTTV:
case SAA7134_BOARD_GOTVIEW_7135:
+ case SAA7134_BOARD_KWORLD_TERMINATOR:
dev->has_remote = 1;
break;
case SAA7134_BOARD_MD5044:
diff --git a/linux/drivers/media/video/saa7134/saa7134-input.c b/linux/drivers/media/video/saa7134/saa7134-input.c
index 393a681a2..4878e9c75 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.32 2005/10/03 19:40:13 mkrufky Exp $
+ * $Id: saa7134-input.c,v 1.33 2005/10/04 14:52:08 nsh Exp $
*
* handle saa7134 IR remotes via linux kernel input layer.
*
@@ -560,6 +560,12 @@ int saa7134_input_init1(struct saa7134_dev *dev)
saa_setb(SAA7134_GPIO_GPMODE0, 0x4);
saa_setb(SAA7134_GPIO_GPSTATUS0, 0x4);
break;
+ case SAA7134_BOARD_KWORLD_TERMINATOR:
+ ir_codes = avacssmart_codes;
+ mask_keycode = 0x00001f;
+ mask_keyup = 0x000060;
+ polling = 50; // ms
+ break;
case SAA7134_BOARD_MANLI_MTV001:
case SAA7134_BOARD_MANLI_MTV002:
case SAA7134_BOARD_BEHOLD_409FM:
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 655734002..3dd0189a4 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-04 14:50 nshmyrev
+
+ * saa7134-cards.c: (saa7134_board_init1):
+ * saa7134-input.c: (saa7134_input_init1):
+ - Remote for KWorld Terminator.
+
+ Signed-off-by: James R. Webb <jrwebb@qwest.net>
+
2005-10-04 14:46 nshmyrev
* cx88-tvaudio.c: (set_audio_registers), (set_audio_start),