Commit 9abb6e6f authored by Pascal Terjan's avatar Pascal Terjan Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (10825): Add ids for Yuan PD378S DVB adapter 



Signed-off-by: default avatarArnaud Patard <apatard@mandriva.com>
Signed-off-by: default avatarPascal Terjan <pterjan@mandriva.com>
Cc: Patrick Boettcher <patrick.boettcher@desy.de>
[mchehab@redhat.com: Fixed a small merge conflict]
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 0a6e1ed2

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

+6 −1
Original line number Diff line number Diff line
@@ -1420,6 +1420,7 @@ struct usb_device_id dib0700_usb_id_table[] = { 
	{ USB_DEVICE(USB_VID_TERRATEC,

			USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY_2) },

	{ USB_DEVICE(USB_VID_SONY,	USB_PID_SONY_PLAYTV) },

/* 45 */{ USB_DEVICE(USB_VID_YUAN,      USB_PID_YUAN_PD378S) },

	{ 0 }		/* Terminating entry */

};

MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
@@ -1619,7 +1620,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { 
			},

		},



		.num_device_descs = 9,

		.num_device_descs = 10,

		.devices = {

			{   "DiBcom STK7070P reference design",

				{ &dib0700_usb_id_table[15], NULL },
@@ -1657,6 +1658,10 @@ struct dvb_usb_device_properties dib0700_devices[] = { 
				{ &dib0700_usb_id_table[33], NULL },

				{ NULL },

			},

			{   "Yuan PD378S",

				{ &dib0700_usb_id_table[45], NULL },

				{ NULL },

			},

		},



		.rc_interval      = DEFAULT_RC_INTERVAL,

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

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ 
#define USB_PID_ASUS_U3100				0x173f

#define USB_PID_YUAN_EC372S				0x1edc

#define USB_PID_YUAN_STK7700PH				0x1f08

#define USB_PID_YUAN_PD378S				0x2edc

#define USB_PID_DW2102					0x2102

#define USB_PID_XTENSIONS_XD_380			0x0381

#define USB_PID_TELESTAR_STARSTICK_2			0x8000

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

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ struct dvb_usb_device_properties { 
	int generic_bulk_ctrl_endpoint;



	int num_device_descs;

	struct dvb_usb_device_description devices[9];

	struct dvb_usb_device_description devices[10];

};



/**