Commit e80faad3 authored by Mauro Lacy's avatar Mauro Lacy Committed by Mauro Carvalho Chehab

V4L/DVB (7368): bttv: added support for Kozumi KTV-01C card

Signed-off-by: default avatarMauro Lacy <mauro@lacy.com.ar>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 97275ac5
...@@ -149,3 +149,4 @@ ...@@ -149,3 +149,4 @@
148 -> DViCO FusionHDTV 2 [dbc0:d200] 148 -> DViCO FusionHDTV 2 [dbc0:d200]
149 -> Typhoon TV-Tuner PCI (50684) 149 -> Typhoon TV-Tuner PCI (50684)
150 -> Geovision GV-600 [008a:763c] 150 -> Geovision GV-600 [008a:763c]
151 -> Kozumi KTV-01C
...@@ -1157,7 +1157,8 @@ EXPORT_SYMBOL_GPL(ir_codes_purpletv); ...@@ -1157,7 +1157,8 @@ EXPORT_SYMBOL_GPL(ir_codes_purpletv);
/* Mapping for the 28 key remote control as seen at /* Mapping for the 28 key remote control as seen at
http://www.sednacomputer.com/photo/cardbus-tv.jpg http://www.sednacomputer.com/photo/cardbus-tv.jpg
Pavel Mihaylov <bin@bash.info> */ Pavel Mihaylov <bin@bash.info>
Also for the remote bundled with Kozumi KTV-01C card */
IR_KEYTAB_TYPE ir_codes_pctv_sedna[IR_KEYTAB_SIZE] = { IR_KEYTAB_TYPE ir_codes_pctv_sedna[IR_KEYTAB_SIZE] = {
[ 0x00 ] = KEY_0, [ 0x00 ] = KEY_0,
[ 0x01 ] = KEY_1, [ 0x01 ] = KEY_1,
...@@ -1188,6 +1189,11 @@ IR_KEYTAB_TYPE ir_codes_pctv_sedna[IR_KEYTAB_SIZE] = { ...@@ -1188,6 +1189,11 @@ IR_KEYTAB_TYPE ir_codes_pctv_sedna[IR_KEYTAB_SIZE] = {
[ 0x1c ] = KEY_RADIO, /* FM Radio */ [ 0x1c ] = KEY_RADIO, /* FM Radio */
[ 0x1d ] = KEY_RECORD, [ 0x1d ] = KEY_RECORD,
[ 0x1e ] = KEY_PAUSE, [ 0x1e ] = KEY_PAUSE,
/* additional codes for Kozumi's remote */
[0x14] = KEY_INFO, /* OSD */
[0x16] = KEY_OK, /* OK */
[0x17] = KEY_DIGITS, /* Plus */
[0x1f] = KEY_PLAY, /* Play */
}; };
EXPORT_SYMBOL_GPL(ir_codes_pctv_sedna); EXPORT_SYMBOL_GPL(ir_codes_pctv_sedna);
......
...@@ -3015,6 +3015,29 @@ struct tvcard bttv_tvcards[] = { ...@@ -3015,6 +3015,29 @@ struct tvcard bttv_tvcards[] = {
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET,
}, },
[BTTV_BOARD_KOZUMI_KTV_01C] = {
/* Mauro Lacy <mauro@lacy.com.ar>
* Based on MagicTV and Conceptronic CONTVFMi */
.name = "Kozumi KTV-01C",
.video_inputs = 3,
.audio_inputs = 1,
.tuner = 0,
.svhs = 2,
.gpiomask = 0x008007,
.muxsel = { 2, 3, 1, 1 },
.gpiomux = { 0, 1, 2, 2 }, /* CONTVFMi */
/*gpiomux = { 0, 1, 2, 3 }, /* MagicTV */
.gpiomute = 3, /* CONTVFMi */
/*gpiomute = 4, /* MagicTV */
.needs_tvaudio = 0,
.tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* TCL MK3 */
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
.pll = PLL_28,
.has_radio = 1,
.has_remote = 1,
},
}; };
static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards); static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards);
......
...@@ -278,6 +278,12 @@ int bttv_input_init(struct bttv *btv) ...@@ -278,6 +278,12 @@ int bttv_input_init(struct bttv *btv)
ir->mask_keyup = 0x004000; ir->mask_keyup = 0x004000;
ir->polling = 50; /* ms */ ir->polling = 50; /* ms */
break; break;
case BTTV_BOARD_KOZUMI_KTV_01C:
ir_codes = ir_codes_pctv_sedna;
ir->mask_keycode = 0x001f00;
ir->mask_keyup = 0x006000;
ir->polling = 50; /* ms */
break;
} }
if (NULL == ir_codes) { if (NULL == ir_codes) {
dprintk(KERN_INFO "Ooops: IR config error [card=%d]\n", btv->c.type); dprintk(KERN_INFO "Ooops: IR config error [card=%d]\n", btv->c.type);
......
...@@ -174,6 +174,7 @@ ...@@ -174,6 +174,7 @@
#define BTTV_BOARD_DVICO_FUSIONHDTV_2 0x94 #define BTTV_BOARD_DVICO_FUSIONHDTV_2 0x94
#define BTTV_BOARD_TYPHOON_TVTUNERPCI 0x95 #define BTTV_BOARD_TYPHOON_TVTUNERPCI 0x95
#define BTTV_BOARD_GEOVISION_GV600 0x96 #define BTTV_BOARD_GEOVISION_GV600 0x96
#define BTTV_BOARD_KOZUMI_KTV_01C 0x97
/* more card-specific defines */ /* more card-specific defines */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment