Skip to content

L
linux
Commit bc050e67 authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files
Options

[media] af9015: various small changes and clean-ups 

Clean-up dvb_usb_device_properties and fix errors
reported by checkpatch.pl.

Some other very minor changes. Functionality remains
untouched.
Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent f9b26cd8
Show whitespace changes
Inline Side-by-side
Showing with 212 additions and 283 deletions
drivers/media/dvb/dvb-usb/af9015.c
View file @ bc050e67
...@@ -244,8 +244,7 @@ static int af9015_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], ...@@ -244,8 +244,7 @@ static int af9015_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
u8 uninitialized_var(mbox), addr_len; u8 uninitialized_var(mbox), addr_len;
struct req_t req; struct req_t req;
/* TODO: implement bus lock /*
The bus lock is needed because there is two tuners both using same I2C-address. The bus lock is needed because there is two tuners both using same I2C-address.
Due to that the only way to select correct tuner is use demodulator I2C-gate. Due to that the only way to select correct tuner is use demodulator I2C-gate.
...@@ -789,7 +788,7 @@ static void af9015_set_remote_config(struct usb_device *udev, ...@@ -789,7 +788,7 @@ static void af9015_set_remote_config(struct usb_device *udev,
/* try to load remote based USB ID */ /* try to load remote based USB ID */
if (!props->rc.core.rc_codes) if (!props->rc.core.rc_codes)
props->rc.core.rc_codes = af9015_rc_setup_match( props->rc.core.rc_codes = af9015_rc_setup_match(
(vid << 16) + pid, af9015_rc_setup_usbids); (vid << 16) | pid, af9015_rc_setup_usbids);
/* try to load remote based USB iManufacturer string */ /* try to load remote based USB iManufacturer string */
if (!props->rc.core.rc_codes && vid == USB_VID_AFATECH) { if (!props->rc.core.rc_codes && vid == USB_VID_AFATECH) {
...@@ -1220,8 +1219,8 @@ static int af9015_af9013_frontend_attach(struct dvb_usb_adapter *adap) ...@@ -1220,8 +1219,8 @@ static int af9015_af9013_frontend_attach(struct dvb_usb_adapter *adap)
} }
/* attach demodulator */ /* attach demodulator */
adap->fe_adap[0].fe = dvb_attach(af9013_attach, &af9015_af9013_config[adap->id], adap->fe_adap[0].fe = dvb_attach(af9013_attach,
&adap->dev->i2c_adap); &af9015_af9013_config[adap->id], &adap->dev->i2c_adap);
/* /*
* AF9015 firmware does not like if it gets interrupted by I2C adapter * AF9015 firmware does not like if it gets interrupted by I2C adapter
...@@ -1324,14 +1323,15 @@ static int af9015_tuner_attach(struct dvb_usb_adapter *adap) ...@@ -1324,14 +1323,15 @@ static int af9015_tuner_attach(struct dvb_usb_adapter *adap)
switch (af9015_af9013_config[adap->id].tuner) { switch (af9015_af9013_config[adap->id].tuner) {
case AF9013_TUNER_MT2060: case AF9013_TUNER_MT2060:
case AF9013_TUNER_MT2060_2: case AF9013_TUNER_MT2060_2:
ret = dvb_attach(mt2060_attach, adap->fe_adap[0].fe, &adap->dev->i2c_adap, ret = dvb_attach(mt2060_attach, adap->fe_adap[0].fe,
&af9015_mt2060_config, &adap->dev->i2c_adap, &af9015_mt2060_config,
af9015_config.mt2060_if1[adap->id]) af9015_config.mt2060_if1[adap->id])
== NULL ? -ENODEV : 0; == NULL ? -ENODEV : 0;
break; break;
case AF9013_TUNER_QT1010: case AF9013_TUNER_QT1010:
case AF9013_TUNER_QT1010A: case AF9013_TUNER_QT1010A:
ret = dvb_attach(qt1010_attach, adap->fe_adap[0].fe, &adap->dev->i2c_adap, ret = dvb_attach(qt1010_attach, adap->fe_adap[0].fe,
&adap->dev->i2c_adap,
&af9015_qt1010_config) == NULL ? -ENODEV : 0; &af9015_qt1010_config) == NULL ? -ENODEV : 0;
break; break;
case AF9013_TUNER_TDA18271: case AF9013_TUNER_TDA18271:
...@@ -1434,69 +1434,85 @@ enum af9015_usb_table_entry { ...@@ -1434,69 +1434,85 @@ enum af9015_usb_table_entry {
}; };
static struct usb_device_id af9015_usb_table[] = { static struct usb_device_id af9015_usb_table[] = {
[AFATECH_9015] = [AFATECH_9015] = {
{USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9015_9015)}, USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9015_9015)},
[AFATECH_9016] = [AFATECH_9016] = {
{USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9015_9016)}, USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9015_9016)},
[WINFAST_DTV_GOLD] = [WINFAST_DTV_GOLD] = {
{USB_DEVICE(USB_VID_LEADTEK, USB_PID_WINFAST_DTV_DONGLE_GOLD)}, USB_DEVICE(USB_VID_LEADTEK, USB_PID_WINFAST_DTV_DONGLE_GOLD)},
[PINNACLE_PCTV_71E] = [PINNACLE_PCTV_71E] = {
{USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV71E)}, USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV71E)},
[KWORLD_PLUSTV_399U] = [KWORLD_PLUSTV_399U] = {
{USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_399U)}, USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_399U)},
[TINYTWIN] = {USB_DEVICE(USB_VID_VISIONPLUS, USB_PID_TINYTWIN)}, [TINYTWIN] = {
[AZUREWAVE_TU700] = USB_DEVICE(USB_VID_VISIONPLUS, USB_PID_TINYTWIN)},
{USB_DEVICE(USB_VID_VISIONPLUS, USB_PID_AZUREWAVE_AD_TU700)}, [AZUREWAVE_TU700] = {
[TERRATEC_AF9015] = {USB_DEVICE(USB_VID_TERRATEC, USB_DEVICE(USB_VID_VISIONPLUS, USB_PID_AZUREWAVE_AD_TU700)},
[TERRATEC_AF9015] = {
USB_DEVICE(USB_VID_TERRATEC,
USB_PID_TERRATEC_CINERGY_T_USB_XE_REV2)}, USB_PID_TERRATEC_CINERGY_T_USB_XE_REV2)},
[KWORLD_PLUSTV_PC160] = [KWORLD_PLUSTV_PC160] = {
{USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_PC160_2T)}, USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_PC160_2T)},
[AVERTV_VOLAR_X] = [AVERTV_VOLAR_X] = {
{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_X)}, USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_X)},
[XTENSIONS_380U] = [XTENSIONS_380U] = {
{USB_DEVICE(USB_VID_XTENSIONS, USB_PID_XTENSIONS_XD_380)}, USB_DEVICE(USB_VID_XTENSIONS, USB_PID_XTENSIONS_XD_380)},
[MSI_DIGIVOX_DUO] = [MSI_DIGIVOX_DUO] = {
{USB_DEVICE(USB_VID_MSI_2, USB_PID_MSI_DIGIVOX_DUO)}, USB_DEVICE(USB_VID_MSI_2, USB_PID_MSI_DIGIVOX_DUO)},
[AVERTV_VOLAR_X_REV2] = [AVERTV_VOLAR_X_REV2] = {
{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_X_2)}, USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_X_2)},
[TELESTAR_STARSTICK_2] = [TELESTAR_STARSTICK_2] = {
{USB_DEVICE(USB_VID_TELESTAR, USB_PID_TELESTAR_STARSTICK_2)}, USB_DEVICE(USB_VID_TELESTAR, USB_PID_TELESTAR_STARSTICK_2)},
[AVERMEDIA_A309_USB] = [AVERMEDIA_A309_USB] = {
{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A309)}, USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A309)},
[MSI_DIGIVOX_MINI_III] = [MSI_DIGIVOX_MINI_III] = {
{USB_DEVICE(USB_VID_MSI_2, USB_PID_MSI_DIGI_VOX_MINI_III)}, USB_DEVICE(USB_VID_MSI_2, USB_PID_MSI_DIGI_VOX_MINI_III)},
[KWORLD_E396] = {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_395U)}, [KWORLD_E396] = {
[KWORLD_E39B] = {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_395U_2)}, USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_395U)},
[KWORLD_E395] = {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_395U_3)}, [KWORLD_E39B] = {
[TREKSTOR_DVBT] = {USB_DEVICE(USB_VID_AFATECH, USB_PID_TREKSTOR_DVBT)}, USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_395U_2)},
[AVERTV_A850] = {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A850)}, [KWORLD_E395] = {
[AVERTV_A805] = {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A805)}, USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_395U_3)},
[CONCEPTRONIC_CTVDIGRCU] = [TREKSTOR_DVBT] = {
{USB_DEVICE(USB_VID_KWORLD_2, USB_PID_CONCEPTRONIC_CTVDIGRCU)}, USB_DEVICE(USB_VID_AFATECH, USB_PID_TREKSTOR_DVBT)},
[KWORLD_MC810] = {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_MC810)}, [AVERTV_A850] = {
[GENIUS_TVGO_DVB_T03] = USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A850)},
{USB_DEVICE(USB_VID_KYE, USB_PID_GENIUS_TVGO_DVB_T03)}, [AVERTV_A805] = {
[KWORLD_399U_2] = {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_399U_2)}, USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A805)},
[KWORLD_PC160_T] = [CONCEPTRONIC_CTVDIGRCU] = {
{USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_PC160_T)}, USB_DEVICE(USB_VID_KWORLD_2, USB_PID_CONCEPTRONIC_CTVDIGRCU)},
[SVEON_STV20] = {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_SVEON_STV20)}, [KWORLD_MC810] = {
[TINYTWIN_2] = {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_TINYTWIN_2)}, USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_MC810)},
[WINFAST_DTV2000DS] = [GENIUS_TVGO_DVB_T03] = {
{USB_DEVICE(USB_VID_LEADTEK, USB_PID_WINFAST_DTV2000DS)}, USB_DEVICE(USB_VID_KYE, USB_PID_GENIUS_TVGO_DVB_T03)},
[KWORLD_UB383_T] = [KWORLD_399U_2] = {
{USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_UB383_T)}, USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_399U_2)},
[KWORLD_E39A] = [KWORLD_PC160_T] = {
{USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_395U_4)}, USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_PC160_T)},
[AVERMEDIA_A815M] = [SVEON_STV20] = {
{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A815M)}, USB_DEVICE(USB_VID_KWORLD_2, USB_PID_SVEON_STV20)},
[CINERGY_T_STICK_RC] = {USB_DEVICE(USB_VID_TERRATEC, [TINYTWIN_2] = {
USB_DEVICE(USB_VID_KWORLD_2, USB_PID_TINYTWIN_2)},
[WINFAST_DTV2000DS] = {
USB_DEVICE(USB_VID_LEADTEK, USB_PID_WINFAST_DTV2000DS)},
[KWORLD_UB383_T] = {
USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_UB383_T)},
[KWORLD_E39A] = {
USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_395U_4)},
[AVERMEDIA_A815M] = {
USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A815M)},
[CINERGY_T_STICK_RC] = {
USB_DEVICE(USB_VID_TERRATEC,
USB_PID_TERRATEC_CINERGY_T_STICK_RC)}, USB_PID_TERRATEC_CINERGY_T_STICK_RC)},
[CINERGY_T_DUAL_RC] = {USB_DEVICE(USB_VID_TERRATEC, [CINERGY_T_DUAL_RC] = {
USB_DEVICE(USB_VID_TERRATEC,
USB_PID_TERRATEC_CINERGY_T_STICK_DUAL_RC)}, USB_PID_TERRATEC_CINERGY_T_STICK_DUAL_RC)},
[AVERTV_A850T] = [AVERTV_A850T] = {
{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A850T)}, USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A850T)},
[TINYTWIN_3] = {USB_DEVICE(USB_VID_GTEK, USB_PID_TINYTWIN_3)}, [TINYTWIN_3] = {
[SVEON_STV22] = {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_SVEON_STV22)}, USB_DEVICE(USB_VID_GTEK, USB_PID_TINYTWIN_3)},
[SVEON_STV22] = {
USB_DEVICE(USB_VID_KWORLD_2, USB_PID_SVEON_STV22)},
{ } { }
}; };
MODULE_DEVICE_TABLE(usb, af9015_usb_table); MODULE_DEVICE_TABLE(usb, af9015_usb_table);
...@@ -1517,7 +1533,8 @@ static struct dvb_usb_device_properties af9015_properties[] = { ...@@ -1517,7 +1533,8 @@ static struct dvb_usb_device_properties af9015_properties[] = {
.adapter = { .adapter = {
{ {
.num_frontends = 1, .num_frontends = 1,
.fe = {{ .fe = {
{
.caps = DVB_USB_ADAP_HAS_PID_FILTER | .caps = DVB_USB_ADAP_HAS_PID_FILTER |
DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF, DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
...@@ -1525,21 +1542,21 @@ static struct dvb_usb_device_properties af9015_properties[] = { ...@@ -1525,21 +1542,21 @@ static struct dvb_usb_device_properties af9015_properties[] = {
.pid_filter = af9015_pid_filter, .pid_filter = af9015_pid_filter,
.pid_filter_ctrl = af9015_pid_filter_ctrl, .pid_filter_ctrl = af9015_pid_filter_ctrl,
.frontend_attach = .frontend_attach = af9015_af9013_frontend_attach,
af9015_af9013_frontend_attach,
.tuner_attach = af9015_tuner_attach, .tuner_attach = af9015_tuner_attach,
.stream = { .stream = {
.type = USB_BULK, .type = USB_BULK,
.count = 6, .count = 6,
.endpoint = 0x84, .endpoint = 0x84,
}, },
}}, }
},
}, },
{ {
.num_frontends = 1, .num_frontends = 1,
.fe = {{ .fe = {
.frontend_attach = {
af9015_af9013_frontend_attach, .frontend_attach = af9015_af9013_frontend_attach,
.tuner_attach = af9015_tuner_attach, .tuner_attach = af9015_tuner_attach,
.stream = { .stream = {
.type = USB_BULK, .type = USB_BULK,
...@@ -1547,12 +1564,12 @@ static struct dvb_usb_device_properties af9015_properties[] = { ...@@ -1547,12 +1564,12 @@ static struct dvb_usb_device_properties af9015_properties[] = {
.endpoint = 0x85, .endpoint = 0x85,
.u = { .u = {
.bulk = { .bulk = {
.buffersize = .buffersize = TS_USB20_FRAME_SIZE,
TS_USB20_FRAME_SIZE,
} }
} }
}, },
}}, }
},
} }
}, },
...@@ -1575,102 +1592,67 @@ static struct dvb_usb_device_properties af9015_properties[] = { ...@@ -1575,102 +1592,67 @@ static struct dvb_usb_device_properties af9015_properties[] = {
.cold_ids = { .cold_ids = {
&af9015_usb_table[AFATECH_9015], &af9015_usb_table[AFATECH_9015],
&af9015_usb_table[AFATECH_9016], &af9015_usb_table[AFATECH_9016],
NULL
}, },
.warm_ids = {NULL}, }, {
},
{
.name = "Leadtek WinFast DTV Dongle Gold", .name = "Leadtek WinFast DTV Dongle Gold",
.cold_ids = { .cold_ids = {
&af9015_usb_table[WINFAST_DTV_GOLD], &af9015_usb_table[WINFAST_DTV_GOLD],
NULL
},
.warm_ids = {NULL},
}, },
{ }, {
.name = "Pinnacle PCTV 71e", .name = "Pinnacle PCTV 71e",
.cold_ids = { .cold_ids = {
&af9015_usb_table[PINNACLE_PCTV_71E], &af9015_usb_table[PINNACLE_PCTV_71E],
NULL
},
.warm_ids = {NULL},
}, },
{ }, {
.name = "KWorld PlusTV Dual DVB-T Stick " \ .name = "KWorld PlusTV Dual DVB-T Stick " \
"(DVB-T 399U)", "(DVB-T 399U)",
.cold_ids = { .cold_ids = {
&af9015_usb_table[KWORLD_PLUSTV_399U], &af9015_usb_table[KWORLD_PLUSTV_399U],
&af9015_usb_table[KWORLD_399U_2], &af9015_usb_table[KWORLD_399U_2],
NULL
}, },
.warm_ids = {NULL}, }, {
},
{
.name = "DigitalNow TinyTwin DVB-T Receiver", .name = "DigitalNow TinyTwin DVB-T Receiver",
.cold_ids = { .cold_ids = {
&af9015_usb_table[TINYTWIN], &af9015_usb_table[TINYTWIN],
&af9015_usb_table[TINYTWIN_2], &af9015_usb_table[TINYTWIN_2],
&af9015_usb_table[TINYTWIN_3], &af9015_usb_table[TINYTWIN_3],
NULL
}, },
.warm_ids = {NULL}, }, {
},
{
.name = "TwinHan AzureWave AD-TU700(704J)", .name = "TwinHan AzureWave AD-TU700(704J)",
.cold_ids = { .cold_ids = {
&af9015_usb_table[AZUREWAVE_TU700], &af9015_usb_table[AZUREWAVE_TU700],
NULL
}, },
.warm_ids = {NULL}, }, {
},
{
.name = "TerraTec Cinergy T USB XE", .name = "TerraTec Cinergy T USB XE",
.cold_ids = { .cold_ids = {
&af9015_usb_table[TERRATEC_AF9015], &af9015_usb_table[TERRATEC_AF9015],
NULL
}, },
.warm_ids = {NULL}, }, {
},
{
.name = "KWorld PlusTV Dual DVB-T PCI " \ .name = "KWorld PlusTV Dual DVB-T PCI " \
"(DVB-T PC160-2T)", "(DVB-T PC160-2T)",
.cold_ids = { .cold_ids = {
&af9015_usb_table[KWORLD_PLUSTV_PC160], &af9015_usb_table[KWORLD_PLUSTV_PC160],
NULL
},
.warm_ids = {NULL},
}, },
{ }, {
.name = "AVerMedia AVerTV DVB-T Volar X", .name = "AVerMedia AVerTV DVB-T Volar X",
.cold_ids = { .cold_ids = {
&af9015_usb_table[AVERTV_VOLAR_X], &af9015_usb_table[AVERTV_VOLAR_X],
NULL
},
.warm_ids = {NULL},
}, },
{ }, {
.name = "TerraTec Cinergy T Stick RC", .name = "TerraTec Cinergy T Stick RC",
.cold_ids = { .cold_ids = {
&af9015_usb_table[CINERGY_T_STICK_RC], &af9015_usb_table[CINERGY_T_STICK_RC],
NULL
},
.warm_ids = {NULL},
}, },
{ }, {
.name = "TerraTec Cinergy T Stick Dual RC", .name = "TerraTec Cinergy T Stick Dual RC",
.cold_ids = { .cold_ids = {
&af9015_usb_table[CINERGY_T_DUAL_RC], &af9015_usb_table[CINERGY_T_DUAL_RC],
NULL
},
.warm_ids = {NULL},
}, },
{ }, {
.name = "AverMedia AVerTV Red HD+ (A850T)", .name = "AverMedia AVerTV Red HD+ (A850T)",
.cold_ids = { .cold_ids = {
&af9015_usb_table[AVERTV_A850T], &af9015_usb_table[AVERTV_A850T],
NULL
}, },
.warm_ids = {NULL},
}, },
} }
}, { }, {
...@@ -1687,7 +1669,8 @@ static struct dvb_usb_device_properties af9015_properties[] = { ...@@ -1687,7 +1669,8 @@ static struct dvb_usb_device_properties af9015_properties[] = {
.adapter = { .adapter = {
{ {
.num_frontends = 1, .num_frontends = 1,
.fe = {{ .fe = {
{
.caps = DVB_USB_ADAP_HAS_PID_FILTER | .caps = DVB_USB_ADAP_HAS_PID_FILTER |
DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF, DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
...@@ -1695,21 +1678,21 @@ static struct dvb_usb_device_properties af9015_properties[] = { ...@@ -1695,21 +1678,21 @@ static struct dvb_usb_device_properties af9015_properties[] = {
.pid_filter = af9015_pid_filter, .pid_filter = af9015_pid_filter,
.pid_filter_ctrl = af9015_pid_filter_ctrl, .pid_filter_ctrl = af9015_pid_filter_ctrl,
.frontend_attach = .frontend_attach = af9015_af9013_frontend_attach,
af9015_af9013_frontend_attach,
.tuner_attach = af9015_tuner_attach, .tuner_attach = af9015_tuner_attach,
.stream = { .stream = {
.type = USB_BULK, .type = USB_BULK,
.count = 6, .count = 6,
.endpoint = 0x84, .endpoint = 0x84,
}, },
}}, }
},
}, },
{ {
.num_frontends = 1, .num_frontends = 1,
.fe = {{ .fe = {
.frontend_attach = {
af9015_af9013_frontend_attach, .frontend_attach = af9015_af9013_frontend_attach,
.tuner_attach = af9015_tuner_attach, .tuner_attach = af9015_tuner_attach,
.stream = { .stream = {
.type = USB_BULK, .type = USB_BULK,
...@@ -1717,12 +1700,12 @@ static struct dvb_usb_device_properties af9015_properties[] = { ...@@ -1717,12 +1700,12 @@ static struct dvb_usb_device_properties af9015_properties[] = {
.endpoint = 0x85, .endpoint = 0x85,
.u = { .u = {
.bulk = { .bulk = {
.buffersize = .buffersize = TS_USB20_FRAME_SIZE,
TS_USB20_FRAME_SIZE,
} }
} }
}, },
}}, }
},
} }
}, },
...@@ -1744,51 +1727,33 @@ static struct dvb_usb_device_properties af9015_properties[] = { ...@@ -1744,51 +1727,33 @@ static struct dvb_usb_device_properties af9015_properties[] = {
.name = "Xtensions XD-380", .name = "Xtensions XD-380",
.cold_ids = { .cold_ids = {
&af9015_usb_table[XTENSIONS_380U], &af9015_usb_table[XTENSIONS_380U],
NULL
},
.warm_ids = {NULL},
}, },
{ }, {
.name = "MSI DIGIVOX Duo", .name = "MSI DIGIVOX Duo",
.cold_ids = { .cold_ids = {
&af9015_usb_table[MSI_DIGIVOX_DUO], &af9015_usb_table[MSI_DIGIVOX_DUO],
NULL
},
.warm_ids = {NULL},
}, },
{ }, {
.name = "Fujitsu-Siemens Slim Mobile USB DVB-T", .name = "Fujitsu-Siemens Slim Mobile USB DVB-T",
.cold_ids = { .cold_ids = {
&af9015_usb_table[AVERTV_VOLAR_X_REV2], &af9015_usb_table[AVERTV_VOLAR_X_REV2],
NULL
},
.warm_ids = {NULL},
}, },
{ }, {
.name = "Telestar Starstick 2", .name = "Telestar Starstick 2",
.cold_ids = { .cold_ids = {
&af9015_usb_table[TELESTAR_STARSTICK_2], &af9015_usb_table[TELESTAR_STARSTICK_2],
NULL
}, },
.warm_ids = {NULL}, }, {
},
{
.name = "AVerMedia A309", .name = "AVerMedia A309",
.cold_ids = { .cold_ids = {
&af9015_usb_table[AVERMEDIA_A309_USB], &af9015_usb_table[AVERMEDIA_A309_USB],
NULL
}, },
.warm_ids = {NULL}, }, {
},
{
.name = "MSI Digi VOX mini III", .name = "MSI Digi VOX mini III",
.cold_ids = { .cold_ids = {
&af9015_usb_table[MSI_DIGIVOX_MINI_III], &af9015_usb_table[MSI_DIGIVOX_MINI_III],
NULL
}, },
.warm_ids = {NULL}, }, {
},
{
.name = "KWorld USB DVB-T TV Stick II " \ .name = "KWorld USB DVB-T TV Stick II " \
"(VS-DVB-T 395U)", "(VS-DVB-T 395U)",
.cold_ids = { .cold_ids = {
...@@ -1796,34 +1761,23 @@ static struct dvb_usb_device_properties af9015_properties[] = { ...@@ -1796,34 +1761,23 @@ static struct dvb_usb_device_properties af9015_properties[] = {
&af9015_usb_table[KWORLD_E39B], &af9015_usb_table[KWORLD_E39B],
&af9015_usb_table[KWORLD_E395], &af9015_usb_table[KWORLD_E395],
&af9015_usb_table[KWORLD_E39A], &af9015_usb_table[KWORLD_E39A],
NULL
}, },
.warm_ids = {NULL}, }, {
},
{
.name = "TrekStor DVB-T USB Stick", .name = "TrekStor DVB-T USB Stick",
.cold_ids = { .cold_ids = {
&af9015_usb_table[TREKSTOR_DVBT], &af9015_usb_table[TREKSTOR_DVBT],
NULL
},
.warm_ids = {NULL},
}, },
{ }, {
.name = "AverMedia AVerTV Volar Black HD " \ .name = "AverMedia AVerTV Volar Black HD " \
"(A850)", "(A850)",
.cold_ids = { .cold_ids = {
&af9015_usb_table[AVERTV_A850], &af9015_usb_table[AVERTV_A850],
NULL
},
.warm_ids = {NULL},
}, },
{ }, {
.name = "Sveon STV22 Dual USB DVB-T Tuner HDTV", .name = "Sveon STV22 Dual USB DVB-T Tuner HDTV",
.cold_ids = { .cold_ids = {
&af9015_usb_table[SVEON_STV22], &af9015_usb_table[SVEON_STV22],
NULL
}, },
.warm_ids = {NULL},
}, },
} }
}, { }, {
...@@ -1840,7 +1794,8 @@ static struct dvb_usb_device_properties af9015_properties[] = { ...@@ -1840,7 +1794,8 @@ static struct dvb_usb_device_properties af9015_properties[] = {
.adapter = { .adapter = {
{ {
.num_frontends = 1, .num_frontends = 1,
.fe = {{ .fe = {
{
.caps = DVB_USB_ADAP_HAS_PID_FILTER | .caps = DVB_USB_ADAP_HAS_PID_FILTER |
DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF, DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
...@@ -1848,21 +1803,21 @@ static struct dvb_usb_device_properties af9015_properties[] = { ...@@ -1848,21 +1803,21 @@ static struct dvb_usb_device_properties af9015_properties[] = {
.pid_filter = af9015_pid_filter, .pid_filter = af9015_pid_filter,
.pid_filter_ctrl = af9015_pid_filter_ctrl, .pid_filter_ctrl = af9015_pid_filter_ctrl,
.frontend_attach = .frontend_attach = af9015_af9013_frontend_attach,
af9015_af9013_frontend_attach,
.tuner_attach = af9015_tuner_attach, .tuner_attach = af9015_tuner_attach,
.stream = { .stream = {
.type = USB_BULK, .type = USB_BULK,
.count = 6, .count = 6,
.endpoint = 0x84, .endpoint = 0x84,
}, },
}}, }
},
}, },
{ {
.num_frontends = 1, .num_frontends = 1,
.fe = {{ .fe = {
.frontend_attach = {
af9015_af9013_frontend_attach, .frontend_attach = af9015_af9013_frontend_attach,
.tuner_attach = af9015_tuner_attach, .tuner_attach = af9015_tuner_attach,
.stream = { .stream = {
.type = USB_BULK, .type = USB_BULK,
...@@ -1870,12 +1825,12 @@ static struct dvb_usb_device_properties af9015_properties[] = { ...@@ -1870,12 +1825,12 @@ static struct dvb_usb_device_properties af9015_properties[] = {
.endpoint = 0x85, .endpoint = 0x85,
.u = { .u = {
.bulk = { .bulk = {
.buffersize = .buffersize = TS_USB20_FRAME_SIZE,
TS_USB20_FRAME_SIZE,
} }
} }
}, },
}}, }
},
} }
}, },
...@@ -1897,76 +1852,50 @@ static struct dvb_usb_device_properties af9015_properties[] = { ...@@ -1897,76 +1852,50 @@ static struct dvb_usb_device_properties af9015_properties[] = {
.name = "AverMedia AVerTV Volar GPS 805 (A805)", .name = "AverMedia AVerTV Volar GPS 805 (A805)",
.cold_ids = { .cold_ids = {
&af9015_usb_table[AVERTV_A805], &af9015_usb_table[AVERTV_A805],
NULL
}, },
.warm_ids = {NULL}, }, {
},
{
.name = "Conceptronic USB2.0 DVB-T CTVDIGRCU " \ .name = "Conceptronic USB2.0 DVB-T CTVDIGRCU " \
"V3.0", "V3.0",
.cold_ids = { .cold_ids = {
&af9015_usb_table[CONCEPTRONIC_CTVDIGRCU], &af9015_usb_table[CONCEPTRONIC_CTVDIGRCU],
NULL
},
.warm_ids = {NULL},
}, },
{ }, {
.name = "KWorld Digial MC-810", .name = "KWorld Digial MC-810",
.cold_ids = { .cold_ids = {
&af9015_usb_table[KWORLD_MC810], &af9015_usb_table[KWORLD_MC810],
NULL
},
.warm_ids = {NULL},
}, },
{ }, {
.name = "Genius TVGo DVB-T03", .name = "Genius TVGo DVB-T03",
.cold_ids = { .cold_ids = {
&af9015_usb_table[GENIUS_TVGO_DVB_T03], &af9015_usb_table[GENIUS_TVGO_DVB_T03],
NULL
},
.warm_ids = {NULL},
}, },
{ }, {
.name = "KWorld PlusTV DVB-T PCI Pro Card " \ .name = "KWorld PlusTV DVB-T PCI Pro Card " \
"(DVB-T PC160-T)", "(DVB-T PC160-T)",
.cold_ids = { .cold_ids = {
&af9015_usb_table[KWORLD_PC160_T], &af9015_usb_table[KWORLD_PC160_T],
NULL
},
.warm_ids = {NULL},
}, },
{ }, {
.name = "Sveon STV20 Tuner USB DVB-T HDTV", .name = "Sveon STV20 Tuner USB DVB-T HDTV",
.cold_ids = { .cold_ids = {
&af9015_usb_table[SVEON_STV20], &af9015_usb_table[SVEON_STV20],
NULL
}, },
.warm_ids = {NULL}, }, {
},
{
.name = "Leadtek WinFast DTV2000DS", .name = "Leadtek WinFast DTV2000DS",
.cold_ids = { .cold_ids = {
&af9015_usb_table[WINFAST_DTV2000DS], &af9015_usb_table[WINFAST_DTV2000DS],
NULL
}, },
.warm_ids = {NULL}, }, {
},
{
.name = "KWorld USB DVB-T Stick Mobile " \ .name = "KWorld USB DVB-T Stick Mobile " \
"(UB383-T)", "(UB383-T)",
.cold_ids = { .cold_ids = {
&af9015_usb_table[KWORLD_UB383_T], &af9015_usb_table[KWORLD_UB383_T],
NULL
}, },
.warm_ids = {NULL}, }, {
},
{
.name = "AverMedia AVerTV Volar M (A815Mac)", .name = "AverMedia AVerTV Volar M (A815Mac)",
.cold_ids = { .cold_ids = {
&af9015_usb_table[AVERMEDIA_A815M], &af9015_usb_table[AVERMEDIA_A815M],
NULL
}, },
.warm_ids = {NULL},
}, },
} }
}, },
...@@ -2019,5 +1948,5 @@ static struct usb_driver af9015_usb_driver = { ...@@ -2019,5 +1948,5 @@ static struct usb_driver af9015_usb_driver = {
module_usb_driver(af9015_usb_driver); module_usb_driver(af9015_usb_driver);
MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>"); MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
MODULE_DESCRIPTION("Driver for Afatech AF9015 DVB-T"); MODULE_DESCRIPTION("Afatech AF9015 driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7