summaryrefslogtreecommitdiff
path: root/linux/drivers/media
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2009-04-09 23:16:41 +0300
committerAntti Palosaari <crope@iki.fi>2009-04-09 23:16:41 +0300
commit074a4772727768fbe6cebc0c11f14e529a33ff9f (patch)
tree660dee6c87cdb4026e3318afefadffda1c73a364 /linux/drivers/media
parent000a3988dda531d977b79f3b335a41582c4f116f (diff)
downloadmediapointer-dvb-s2-074a4772727768fbe6cebc0c11f14e529a33ff9f.tar.gz
mediapointer-dvb-s2-074a4772727768fbe6cebc0c11f14e529a33ff9f.tar.bz2
af9015: support for Conceptronic USB2.0 DVB-T CTVDIGRCU V3.0
From: Marcel Jueling <Marcel@Jueling.de> Add USB ID (1b80:e397) for Conceptronic USB2.0 DVB-T CTVDIGRCU V3.0. Priority: normal Signed-off-by: Marcel Jueling <Marcel@Jueling.de> Signed-off-by: Antti Palosaari <crope@iki.fi>
Diffstat (limited to 'linux/drivers/media')
-rw-r--r--linux/drivers/media/dvb/dvb-usb/af9015.c9
-rw-r--r--linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h1
2 files changed, 9 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/af9015.c b/linux/drivers/media/dvb/dvb-usb/af9015.c
index 11346263c..57c678892 100644
--- a/linux/drivers/media/dvb/dvb-usb/af9015.c
+++ b/linux/drivers/media/dvb/dvb-usb/af9015.c
@@ -1266,6 +1266,7 @@ static struct usb_device_id af9015_usb_table[] = {
{USB_DEVICE(USB_VID_AFATECH, USB_PID_TREKSTOR_DVBT)},
/* 20 */{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A850)},
{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A805)},
+ {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_CONCEPTRONIC_CTVDIGRCU)},
{0},
};
MODULE_DEVICE_TABLE(usb, af9015_usb_table);
@@ -1536,13 +1537,19 @@ static struct dvb_usb_device_properties af9015_properties[] = {
.i2c_algo = &af9015_i2c_algo,
- .num_device_descs = 1, /* max 9 */
+ .num_device_descs = 2, /* max 9 */
.devices = {
{
.name = "AverMedia AVerTV Volar GPS 805 (A805)",
.cold_ids = {&af9015_usb_table[21], NULL},
.warm_ids = {NULL},
},
+ {
+ .name = "Conceptronic USB2.0 DVB-T CTVDIGRCU " \
+ "V3.0",
+ .cold_ids = {&af9015_usb_table[22], NULL},
+ .warm_ids = {NULL},
+ },
}
},
};
diff --git a/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index a25b06825..ca0051272 100644
--- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -80,6 +80,7 @@
#define USB_PID_COMPRO_DVBU2000_UNK_WARM 0x010d
#define USB_PID_COMPRO_VIDEOMATE_U500 0x1e78
#define USB_PID_COMPRO_VIDEOMATE_U500_PC 0x1e80
+#define USB_PID_CONCEPTRONIC_CTVDIGRCU 0xe397
#define USB_PID_CONEXANT_D680_DMB 0x86d6
#define USB_PID_DIBCOM_HOOK_DEFAULT 0x0064
#define USB_PID_DIBCOM_HOOK_DEFAULT_REENUM 0x0065