lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (7755): ivtv: add support for card comments and detected but unsupported cards

Browse Source 
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Hans Verkuil
2008-04-26 08:48:26 -03:00
committed by Mauro Carvalho Chehab
parent d86e2ee98e
commit ecfcc83b8d
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/video/ivtv/ivtv-cards.c
View File

@@ -875,6 +875,7 @@ static const struct ivtv_card_pci_info ivtv_pci_pg600v2[] = {
static const struct ivtv_card ivtv_card_pg600v2 = { static const struct ivtv_card ivtv_card_pg600v2 = {
.type = IVTV_CARD_PG600V2, .type = IVTV_CARD_PG600V2,
.name = "Yuan PG600-2, GotView PCI DVD Lite", .name = "Yuan PG600-2, GotView PCI DVD Lite",
.comment = "only Composite and S-Video inputs are supported, not the tuner\n",
.v4l2_capabilities = IVTV_CAP_ENCODER, .v4l2_capabilities = IVTV_CAP_ENCODER,
.hw_video = IVTV_HW_CX25840, .hw_video = IVTV_HW_CX25840,
.hw_audio = IVTV_HW_CX25840, .hw_audio = IVTV_HW_CX25840,
@@ -940,6 +941,7 @@ static const struct ivtv_card_pci_info ivtv_pci_avertv_mce116[] = {
static const struct ivtv_card ivtv_card_avertv_mce116 = { static const struct ivtv_card ivtv_card_avertv_mce116 = {
.type = IVTV_CARD_AVERTV_MCE116, .type = IVTV_CARD_AVERTV_MCE116,
.name = "AVerTV MCE 116 Plus", .name = "AVerTV MCE 116 Plus",
.comment = "only Composite and S-Video inputs are supported, not the tuner\n",
.v4l2_capabilities = IVTV_CAP_ENCODER, .v4l2_capabilities = IVTV_CAP_ENCODER,
.hw_video = IVTV_HW_CX25840, .hw_video = IVTV_HW_CX25840,
.hw_audio = IVTV_HW_CX25840, .hw_audio = IVTV_HW_CX25840,

1
drivers/media/video/ivtv/ivtv-cards.h
View File

@@ -244,6 +244,7 @@ struct ivtv_card_tuner_i2c {
struct ivtv_card { struct ivtv_card {
int type; int type;
char *name; char *name;
char *comment;
u32 v4l2_capabilities; u32 v4l2_capabilities;
u32 hw_video; /* hardware used to process video */ u32 hw_video; /* hardware used to process video */
u32 hw_audio; /* hardware used to process audio */ u32 hw_audio; /* hardware used to process audio */

7
drivers/media/video/ivtv/ivtv-driver.c
View File

@@ -1097,6 +1097,13 @@ static int __devinit ivtv_probe(struct pci_dev *dev,
The PCI IDs are not always reliable. */ The PCI IDs are not always reliable. */
ivtv_process_eeprom(itv); ivtv_process_eeprom(itv);
} }
if (itv->card->comment)
IVTV_INFO("%s", itv->card->comment);
if (itv->card->v4l2_capabilities == 0) {
/* card was detected but is not supported */
retval = -ENODEV;
goto free_i2c;
}
if (itv->std == 0) { if (itv->std == 0) {
itv->std = V4L2_STD_NTSC_M; itv->std = V4L2_STD_NTSC_M;