aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/common/ir-keymaps.c8
-rw-r--r--drivers/media/video/bt8xx/bttv-cards.c23
-rw-r--r--drivers/media/video/bt8xx/bttv-input.c6
-rw-r--r--drivers/media/video/bt8xx/bttv.h1
4 files changed, 37 insertions, 1 deletions
diff --git a/drivers/media/common/ir-keymaps.c b/drivers/media/common/ir-keymaps.c
index 2ab5a120470d..107565c47274 100644
--- a/drivers/media/common/ir-keymaps.c
+++ b/drivers/media/common/ir-keymaps.c
@@ -1157,7 +1157,8 @@ EXPORT_SYMBOL_GPL(ir_codes_purpletv);
1157 1157
1158/* Mapping for the 28 key remote control as seen at 1158/* Mapping for the 28 key remote control as seen at
1159 http://www.sednacomputer.com/photo/cardbus-tv.jpg 1159 http://www.sednacomputer.com/photo/cardbus-tv.jpg
1160 Pavel Mihaylov <bin@bash.info> */ 1160 Pavel Mihaylov <bin@bash.info>
1161 Also for the remote bundled with Kozumi KTV-01C card */
1161IR_KEYTAB_TYPE ir_codes_pctv_sedna[IR_KEYTAB_SIZE] = { 1162IR_KEYTAB_TYPE ir_codes_pctv_sedna[IR_KEYTAB_SIZE] = {
1162 [ 0x00 ] = KEY_0, 1163 [ 0x00 ] = KEY_0,
1163 [ 0x01 ] = KEY_1, 1164 [ 0x01 ] = KEY_1,
@@ -1188,6 +1189,11 @@ IR_KEYTAB_TYPE ir_codes_pctv_sedna[IR_KEYTAB_SIZE] = {
1188 [ 0x1c ] = KEY_RADIO, /* FM Radio */ 1189 [ 0x1c ] = KEY_RADIO, /* FM Radio */
1189 [ 0x1d ] = KEY_RECORD, 1190 [ 0x1d ] = KEY_RECORD,
1190 [ 0x1e ] = KEY_PAUSE, 1191 [ 0x1e ] = KEY_PAUSE,
1192 /* additional codes for Kozumi's remote */
1193 [0x14] = KEY_INFO, /* OSD */
1194 [0x16] = KEY_OK, /* OK */
1195 [0x17] = KEY_DIGITS, /* Plus */
1196 [0x1f] = KEY_PLAY, /* Play */
1191}; 1197};
1192 1198
1193EXPORT_SYMBOL_GPL(ir_codes_pctv_sedna); 1199EXPORT_SYMBOL_GPL(ir_codes_pctv_sedna);
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index 417dd552dba9..22c2708e42ab 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -3015,6 +3015,29 @@ struct tvcard bttv_tvcards[] = {
3015 .tuner_addr = ADDR_UNSET, 3015 .tuner_addr = ADDR_UNSET,
3016 .radio_addr = ADDR_UNSET, 3016 .radio_addr = ADDR_UNSET,
3017 }, 3017 },
3018 [BTTV_BOARD_KOZUMI_KTV_01C] = {
3019 /* Mauro Lacy <mauro@lacy.com.ar>
3020 * Based on MagicTV and Conceptronic CONTVFMi */
3021
3022 .name = "Kozumi KTV-01C",
3023 .video_inputs = 3,
3024 .audio_inputs = 1,
3025 .tuner = 0,
3026 .svhs = 2,
3027 .gpiomask = 0x008007,
3028 .muxsel = { 2, 3, 1, 1 },
3029 .gpiomux = { 0, 1, 2, 2 }, /* CONTVFMi */
3030 /*gpiomux = { 0, 1, 2, 3 }, /* MagicTV */
3031 .gpiomute = 3, /* CONTVFMi */
3032 /*gpiomute = 4, /* MagicTV */
3033 .needs_tvaudio = 0,
3034 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* TCL MK3 */
3035 .tuner_addr = ADDR_UNSET,
3036 .radio_addr = ADDR_UNSET,
3037 .pll = PLL_28,
3038 .has_radio = 1,
3039 .has_remote = 1,
3040 },
3018}; 3041};
3019 3042
3020static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards); 3043static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards);
diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
index fc9ecb21eec6..a38af98f4cae 100644
--- a/drivers/media/video/bt8xx/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
@@ -278,6 +278,12 @@ int bttv_input_init(struct bttv *btv)
278 ir->mask_keyup = 0x004000; 278 ir->mask_keyup = 0x004000;
279 ir->polling = 50; /* ms */ 279 ir->polling = 50; /* ms */
280 break; 280 break;
281 case BTTV_BOARD_KOZUMI_KTV_01C:
282 ir_codes = ir_codes_pctv_sedna;
283 ir->mask_keycode = 0x001f00;
284 ir->mask_keyup = 0x006000;
285 ir->polling = 50; /* ms */
286 break;
281 } 287 }
282 if (NULL == ir_codes) { 288 if (NULL == ir_codes) {
283 dprintk(KERN_INFO "Ooops: IR config error [card=%d]\n", btv->c.type); 289 dprintk(KERN_INFO "Ooops: IR config error [card=%d]\n", btv->c.type);
diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h
index ed0cd3b1a01e..0c859d949c78 100644
--- a/drivers/media/video/bt8xx/bttv.h
+++ b/drivers/media/video/bt8xx/bttv.h
@@ -174,6 +174,7 @@
174#define BTTV_BOARD_DVICO_FUSIONHDTV_2 0x94 174#define BTTV_BOARD_DVICO_FUSIONHDTV_2 0x94
175#define BTTV_BOARD_TYPHOON_TVTUNERPCI 0x95 175#define BTTV_BOARD_TYPHOON_TVTUNERPCI 0x95
176#define BTTV_BOARD_GEOVISION_GV600 0x96 176#define BTTV_BOARD_GEOVISION_GV600 0x96
177#define BTTV_BOARD_KOZUMI_KTV_01C 0x97
177 178
178 179
179/* more card-specific defines */ 180/* more card-specific defines */