redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

V4L/DVB (4088): Fixes for card cx88 #50

Browse source 
The description of the card has been updated to it's full name/model.
The tuner has also been switched to a more compatible one (radio
wasn't working, now it is)

Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Ricardo Cerqueira 2006-06-08 17:36:17 -03:00 committed by Mauro Carvalho Chehab
parent 2ed64eb9e7
commit be4f451975
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/video4linux/CARDLIST.cx88
View file

@ -48,5 +48,5 @@
47 -> pcHDTV HD5500 HDTV [7063:5500] 47 -> pcHDTV HD5500 HDTV [7063:5500]
48 -> Kworld MCE 200 Deluxe [17de:0841] 48 -> Kworld MCE 200 Deluxe [17de:0841]
49 -> PixelView PlayTV P7000 [1554:4813] 49 -> PixelView PlayTV P7000 [1554:4813]
50 -> NPG Tech Real TV [14f1:0842] 50 -> NPG Tech Real TV FM Top 10 [14f1:0842]
51 -> WinFast DTV2000 H [107d:665e] 51 -> WinFast DTV2000 H [107d:665e]

9
drivers/media/video/cx88/cx88-cards.c
View file

@ -1152,9 +1152,9 @@ struct cx88_board cx88_boards[] = {
}}, }},
.blackbird = 1, .blackbird = 1,
}, },
[CX88_BOARD_NPGTECH_REALTV] = { [CX88_BOARD_NPGTECH_REALTV_TOP10FM] = {
.name = "NPG Tech Real TV", .name = "NPG Tech Real TV FM Top 10",
.tuner_type = TUNER_LG_PAL_NEW_TAPC, .tuner_type = TUNER_TNF_5335MF, /* Actually a TNF9535 */
.radio_type = UNSET, .radio_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET,
@ -1169,6 +1169,7 @@ struct cx88_board cx88_boards[] = {
},{ },{
.type = CX88_VMUX_SVIDEO, .type = CX88_VMUX_SVIDEO,
.vmux = 2, .vmux = 2,
.gpio0 = 0x078b,
}}, }},
.radio = { .radio = {
.type = CX88_RADIO, .type = CX88_RADIO,
@ -1429,7 +1430,7 @@ struct cx88_subid cx88_subids[] = {
},{ },{
.subvendor = 0x14f1, .subvendor = 0x14f1,
.subdevice = 0x0842, .subdevice = 0x0842,
.card = CX88_BOARD_NPGTECH_REALTV, .card = CX88_BOARD_NPGTECH_REALTV_TOP10FM,
},{ },{
.subvendor = 0x107d, .subvendor = 0x107d,
.subdevice = 0x665e, .subdevice = 0x665e,

4
drivers/media/video/cx88/cx88-input.c
View file

@ -74,7 +74,7 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
/* read gpio value */ /* read gpio value */
gpio = cx_read(ir->gpio_addr); gpio = cx_read(ir->gpio_addr);
if (core->board == CX88_BOARD_NPGTECH_REALTV) { if (core->board == CX88_BOARD_NPGTECH_REALTV_TOP10FM) {
/* This board apparently uses a combination of 2 GPIO /* This board apparently uses a combination of 2 GPIO
to represent the keys. Additionally, the second GPIO to represent the keys. Additionally, the second GPIO
can be used for parity. can be used for parity.
@ -248,7 +248,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
ir_type = IR_TYPE_PD; ir_type = IR_TYPE_PD;
ir->sampling = 0xff00; /* address */ ir->sampling = 0xff00; /* address */
break; break;
case CX88_BOARD_NPGTECH_REALTV: case CX88_BOARD_NPGTECH_REALTV_TOP10FM:
ir_codes = ir_codes_npgtech; ir_codes = ir_codes_npgtech;
ir->gpio_addr = MO_GP0_IO; ir->gpio_addr = MO_GP0_IO;
ir->mask_keycode = 0xfa; ir->mask_keycode = 0xfa;

2
drivers/media/video/cx88/cx88.h
View file

@ -193,7 +193,7 @@ extern struct sram_channel cx88_sram_channels[];
#define CX88_BOARD_PCHDTV_HD5500 47 #define CX88_BOARD_PCHDTV_HD5500 47
#define CX88_BOARD_KWORLD_MCE200_DELUXE 48 #define CX88_BOARD_KWORLD_MCE200_DELUXE 48
#define CX88_BOARD_PIXELVIEW_PLAYTV_P7000 49 #define CX88_BOARD_PIXELVIEW_PLAYTV_P7000 49
#define CX88_BOARD_NPGTECH_REALTV 50 #define CX88_BOARD_NPGTECH_REALTV_TOP10FM 50
#define CX88_BOARD_WINFAST_DTV2000H 51 #define CX88_BOARD_WINFAST_DTV2000H 51
enum cx88_itype { enum cx88_itype {