diff options
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 21 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 16 |
3 files changed, 32 insertions, 8 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index 489c5abf3..7a6338be2 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -306,6 +306,23 @@ struct cx88_board cx88_boards[] = { .gpio3 = 0x00000000, }}, }, + [CX88_BOARD_KWORLD_DVBT_] = { + .name = "KWorld/VStream XPert DVB-t", + .tuner_type = UNSET, + .input = {{ + .type = CX88_VMUX_DVB, + .vmux = 0, + },{ + .type = CX88_VMUX_COMPOSITE1, + .vmux = 1, + },{ + .type = CX88_VMUX_SVIDEO, + .vmux = 2, + },{ + .type = CX88_VMUX_UNUSED, + .vmux = 3, + }}, + }, }; const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards); @@ -369,6 +386,10 @@ struct cx88_subid cx88_subids[] = { .subvendor = 0x1043, .subdevice = 0x4823, /* with mpeg encoder */ .card = CX88_BOARD_ASUS_PVR_416, + },{ + .subvendor = 0x17de, + .subdevice = 0x08a6, + .card = CX88_BOARD_KWORLD_DVB_T, } }; const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids); diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index 4024b8ef9..a65e8ed9e 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -1664,8 +1664,9 @@ static int video_do_ioctl(struct inode *inode, struct file *file, [ CX88_VMUX_COMPOSITE2 ] = "Composite2", [ CX88_VMUX_COMPOSITE3 ] = "Composite3", [ CX88_VMUX_COMPOSITE4 ] = "Composite4", - [ CX88_VMUX_TELEVISION ] = "Television", [ CX88_VMUX_SVIDEO ] = "S-Video", + [ CX88_VMUX_TELEVISION ] = "Television", + [ CX88_VMUX_DVB ] = "DVB", [ CX88_VMUX_DEBUG ] = "for debug only", }; struct v4l2_input *i = arg; diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index ca1df83fc..82512c514 100644 --- a/linux/drivers/media/video/cx88/cx88.h +++ b/linux/drivers/media/video/cx88/cx88.h @@ -146,16 +146,18 @@ extern struct sram_channel cx88_sram_channels[]; #define CX88_BOARD_PROLINK_PLAYTVPVR 11 #define CX88_BOARD_ASUS_PVR_416 12 #define CX88_BOARD_MSI_TVANYWHERE 13 +#define CX88_BOARD_KWORLD_DVB_T 14 enum cx88_itype { CX88_VMUX_COMPOSITE1 = 1, - CX88_VMUX_COMPOSITE2 = 2, - CX88_VMUX_COMPOSITE3 = 3, - CX88_VMUX_COMPOSITE4 = 4, - CX88_VMUX_TELEVISION = 5, - CX88_VMUX_SVIDEO = 6, - CX88_VMUX_DEBUG = 7, - CX88_RADIO = 8, + CX88_VMUX_COMPOSITE2, + CX88_VMUX_COMPOSITE3, + CX88_VMUX_COMPOSITE4, + CX88_VMUX_SVIDEO, + CX88_VMUX_TELEVISION, + CX99_VMUX_DVB, + CX88_VMUX_DEBUG, + CX88_RADIO, }; struct cx88_input { |