Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c899bce authored by Andre Weidemann's avatar Andre Weidemann Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (7472): reworked patch to support TT connect S-2400 



Added support for Technotrend connect S-2400.

Signed-off-by: default avatarAndre Weidemann <Andre.Weidemann@web.de>
Signed-off-by: default avatarPatrick Boettcher <pb@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent ca06fa79

drivers/media/dvb/dvb-usb/dvb-usb-ids.h

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#define USB_VID_MSI				0x0db0

#define USB_VID_OPERA1				0x695c

#define USB_VID_PINNACLE			0x2304

#define USB_VID_TECHNOTREND			0x0b48

#define USB_VID_TERRATEC			0x0ccd

#define USB_VID_VISIONPLUS			0x13d3

#define USB_VID_TWINHAN				0x1822
@@ -134,6 +135,7 @@ 
#define USB_PID_AVERMEDIA_EXPRESS			0xb568

#define USB_PID_AVERMEDIA_VOLAR				0xa807

#define USB_PID_AVERMEDIA_VOLAR_2			0xb808

#define USB_PID_TECHNOTREND_CONNECT_S2400               0x3006

#define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY	0x005a

#define USB_PID_PINNACLE_PCTV2000E			0x022c

#define USB_PID_PINNACLE_PCTV_DVB_T_FLASH		0x0228

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

+58 −4
Original line number Diff line number Diff line
@@ -176,16 +176,22 @@ static int ttusb2_tuner_attach(struct dvb_usb_adapter *adap) 


/* DVB USB Driver stuff */

static struct dvb_usb_device_properties ttusb2_properties;

static struct dvb_usb_device_properties ttusb2_properties_s2400;



static int ttusb2_probe(struct usb_interface *intf,

		const struct usb_device_id *id)

{

	return dvb_usb_device_init(intf,&ttusb2_properties,THIS_MODULE,NULL);

	if (dvb_usb_device_init(intf, &ttusb2_properties, THIS_MODULE, NULL) == 0 ||

		dvb_usb_device_init(intf, &ttusb2_properties_s2400, THIS_MODULE, NULL) == 0)

		return 0;

	return -ENODEV;

}



static struct usb_device_id ttusb2_table [] = {

	{ USB_DEVICE(USB_VID_PINNACLE, USB_PID_PCTV_400E) },

	{ USB_DEVICE(USB_VID_PINNACLE, USB_PID_PCTV_450E) },

	{ USB_DEVICE(USB_VID_TECHNOTREND,

		USB_PID_TECHNOTREND_CONNECT_S2400) },

	{}		/* Terminating entry */

};

MODULE_DEVICE_TABLE (usb, ttusb2_table);
@@ -242,6 +248,54 @@ static struct dvb_usb_device_properties ttusb2_properties = { 
	}

};



static struct dvb_usb_device_properties ttusb2_properties_s2400 = {

	.caps = DVB_USB_IS_AN_I2C_ADAPTER,



	.usb_ctrl = CYPRESS_FX2,

	.firmware = "dvb-usb-tt-s2400-01.fw",



	.size_of_priv = sizeof(struct ttusb2_state),



	.num_adapters = 1,

	.adapter = {

		{

			.streaming_ctrl   = NULL,



			.frontend_attach  = ttusb2_frontend_attach,

			.tuner_attach     = ttusb2_tuner_attach,



			/* parameter for the MPEG2-data transfer */

			.stream = {

				.type = USB_ISOC,

				.count = 5,

				.endpoint = 0x02,

				.u = {

					.isoc = {

						.framesperurb = 4,

						.framesize = 940,

						.interval = 1,

					}

				}

			}

		}

	},



	.power_ctrl       = ttusb2_power_ctrl,

	.identify_state   = ttusb2_identify_state,



	.i2c_algo         = &ttusb2_i2c_algo,



	.generic_bulk_ctrl_endpoint = 0x01,



	.num_device_descs = 1,

	.devices = {

		{   "Technotrend TT-connect S-2400",

			{ &ttusb2_table[2], NULL },

			{ NULL },

		},

	}

};



static struct usb_driver ttusb2_driver = {

	.name		= "dvb_usb_ttusb2",

	.probe		= ttusb2_probe,