V4L/DVB (11490): af9015: add new dvb_usb_device_properties entry for upcoming USB IDs (85d7d7ca) · Commits · 戴 / test

drivers/media/dvb/dvb-usb/af9015.c

+61 −4

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
		static DEFINE_MUTEX(af9015_usb_mutex);

		static struct af9015_config af9015_config;
		static struct dvb_usb_device_properties af9015_properties[2];
		static struct dvb_usb_device_properties af9015_properties[3];
		static int af9015_properties_count = ARRAY_SIZE(af9015_properties);

		static struct af9013_config af9015_af9013_config[] = {
		@@ -1321,7 +1321,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {

		.i2c_algo = &af9015_i2c_algo,

		.num_device_descs = 9,
		.num_device_descs = 9, /* max 9 */
		.devices = {
		{
		.name = "Afatech AF9015 DVB-T USB2.0 stick",
		@@ -1426,7 +1426,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {

		.i2c_algo = &af9015_i2c_algo,

		.num_device_descs = 9,
		.num_device_descs = 9, /* max 9 */
		.devices = {
		{
		.name = "Xtensions XD-380",
		@@ -1478,7 +1478,64 @@ static struct dvb_usb_device_properties af9015_properties[] = {
		.warm_ids = {NULL},
		},
		}
		}, {
		.caps = DVB_USB_IS_AN_I2C_ADAPTER,

		.usb_ctrl = DEVICE_SPECIFIC,
		.download_firmware = af9015_download_firmware,
		.firmware = "dvb-usb-af9015.fw",
		.no_reconnect = 1,

		.size_of_priv = sizeof(struct af9015_state), \

		.num_adapters = 2,
		.adapter = {
		{
		.caps = DVB_USB_ADAP_HAS_PID_FILTER \|
		DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,

		.pid_filter_count = 32,
		.pid_filter = af9015_pid_filter,
		.pid_filter_ctrl = af9015_pid_filter_ctrl,

		.frontend_attach =
		af9015_af9013_frontend_attach,
		.tuner_attach = af9015_tuner_attach,
		.stream = {
		.type = USB_BULK,
		.count = 6,
		.endpoint = 0x84,
		},
		},
		{
		.frontend_attach =
		af9015_af9013_frontend_attach,
		.tuner_attach = af9015_tuner_attach,
		.stream = {
		.type = USB_BULK,
		.count = 6,
		.endpoint = 0x85,
		.u = {
		.bulk = {
		.buffersize =
		TS_USB20_MAX_PACKET_SIZE,
		}
		}
		},
		}
		},

		.identify_state = af9015_identify_state,

		.rc_query = af9015_rc_query,
		.rc_interval = 150,

		.i2c_algo = &af9015_i2c_algo,

		.num_device_descs = 0, /* max 9 */
		.devices = {
		}
		},
		};

		static int af9015_usb_probe(struct usb_interface *intf,

Admin message