summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Knorr <devnull@localhost>2004-05-24 13:24:24 +0000
committerGerd Knorr <devnull@localhost>2004-05-24 13:24:24 +0000
commitad011fef392d31cf6903f3d1115d80b4d1d78751 (patch)
tree2a92d13e54626ecc690263d22def8fc680cba3c8
parent0742e1cfee70fd483f826027eadb5dcae97df1de (diff)
downloadmediapointer-dvb-s2-ad011fef392d31cf6903f3d1115d80b4d1d78751.tar.gz
mediapointer-dvb-s2-ad011fef392d31cf6903f3d1115d80b4d1d78751.tar.bz2
- cx88: add IODATA GV-VCP3/PCI by 河村直樹 (Kawamura Naoki).
- ir-common: update rc5 keytable.
-rw-r--r--linux/drivers/media/common/ir-common.c4
-rw-r--r--linux/drivers/media/video/cx88/cx88-cards.c23
-rw-r--r--linux/drivers/media/video/cx88/cx88.h1
3 files changed, 23 insertions, 5 deletions
diff --git a/linux/drivers/media/common/ir-common.c b/linux/drivers/media/common/ir-common.c
index 78c3590f8..a0e4f376d 100644
--- a/linux/drivers/media/common/ir-common.c
+++ b/linux/drivers/media/common/ir-common.c
@@ -80,6 +80,8 @@ IR_KEYTAB_TYPE ir_codes_rc5_tv[IR_KEYTAB_SIZE] = {
[ 0x35 ] = KEY_PLAY, // play
[ 0x36 ] = KEY_STOP, // stop
[ 0x37 ] = KEY_RECORD, // recording
+ [ 0x3c ] = KEY_TEXT, // teletext submode (Japan: 12)
+ [ 0x3d ] = KEY_SUSPEND, // system standby
#if 0 /* FIXME */
[ 0x0a ] = KEY_RESERVED, // 1/2/3 digits (japan: 10)
@@ -111,8 +113,6 @@ IR_KEYTAB_TYPE ir_codes_rc5_tv[IR_KEYTAB_SIZE] = {
[ 0x39 ] = KEY_RESERVED, // external 2
[ 0x3a ] = KEY_RESERVED, // PIP display mode
[ 0x3b ] = KEY_RESERVED, // view data mode / advance
- [ 0x3c ] = KEY_RESERVED, // teletext submode (Japan: 12)
- [ 0x3d ] = KEY_RESERVED, // system standby
[ 0x3e ] = KEY_RESERVED, // crispener on/off
[ 0x3f ] = KEY_RESERVED, // system select
#endif
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c
index 3146f69a0..f5a5abca2 100644
--- a/linux/drivers/media/video/cx88/cx88-cards.c
+++ b/linux/drivers/media/video/cx88/cx88-cards.c
@@ -211,8 +211,21 @@ struct cx88_board cx88_boards[] = {
.type = CX88_RADIO,
},
},
-
-
+ [CX88_BOARD_IODATA_GVVCP3PCI] = {
+ .name = "IODATA GV-VCP3/PCI",
+ .tuner_type = TUNER_ABSENT,
+ .needs_tda9887 = 0,
+ .input = {{
+ .type = CX88_VMUX_COMPOSITE1,
+ .vmux = 0,
+ },{
+ .type = CX88_VMUX_COMPOSITE2,
+ .vmux = 1,
+ },{
+ .type = CX88_VMUX_SVIDEO,
+ .vmux = 2,
+ }},
+ },
};
const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards);
@@ -268,7 +281,11 @@ struct cx88_subid cx88_subids[] = {
.subvendor = 0x1462,
.subdevice = 0x8606,
.card = CX88_BOARD_MSI_TVANYWHERE,
- }
+ },{
+ .subvendor = 0x10fc,
+ .subdevice = 0xd003,
+ .card = CX88_BOARD_IODATA_GVVCP3PCI,
+ }
};
const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);
diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h
index 96af2cdf3..9a94a566e 100644
--- a/linux/drivers/media/video/cx88/cx88.h
+++ b/linux/drivers/media/video/cx88/cx88.h
@@ -141,6 +141,7 @@ extern struct sram_channel cx88_sram_channels[];
#define CX88_BOARD_MSI_TVANYWHERE 7
#define CX88_BOARD_WINFAST_DV2000 8
#define CX88_BOARD_LEADTEK_PVR2000 9
+#define CX88_BOARD_IODATA_GVVCP3PCI 10
enum cx88_itype {