LKML Archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] Added Technisat Skystar USB HD CI
@ 2010-07-06 10:23 Renzo Dani
  2010-07-10 12:04 ` Mauro Carvalho Chehab
  0 siblings, 1 reply; 2+ messages in thread
From: Renzo Dani @ 2010-07-06 10:23 UTC (permalink / raw
  To: mchehab
  Cc: arons7, rdunlap, o.endriss, awalls, crope, manu, linux-media,
	linux-kernel, linux-doc

From: Renzo Dani <arons7@gmail.com>


Signed-off-by: Renzo Dani <arons7@gmail.com>
---
 drivers/media/dvb/dvb-usb/az6027.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/drivers/media/dvb/dvb-usb/az6027.c b/drivers/media/dvb/dvb-usb/az6027.c
index d7290b2..445851a 100644
--- a/drivers/media/dvb/dvb-usb/az6027.c
+++ b/drivers/media/dvb/dvb-usb/az6027.c
@@ -1103,13 +1103,23 @@ static struct dvb_usb_device_properties az6027_properties = {
 	.rc_query         = az6027_rc_query,
 	.i2c_algo         = &az6027_i2c_algo,
 
-	.num_device_descs = 1,
+	.num_device_descs = 3,
 	.devices = {
 		{
 			.name = "AZUREWAVE DVB-S/S2 USB2.0 (AZ6027)",
 			.cold_ids = { &az6027_usb_table[0], NULL },
 			.warm_ids = { NULL },
 		},
+		{
+		    .name = " Terratec DVB 2 CI",
+			.cold_ids = { &az6027_usb_table[1], NULL },
+			.warm_ids = { NULL },
+		},
+		{
+		    .name = "TechniSat SkyStar USB 2 HD CI (AZ6027)",
+			.cold_ids = { &az6027_usb_table[2], NULL },
+			.warm_ids = { NULL },
+		},
 		{ NULL },
 	}
 };
@@ -1118,7 +1128,7 @@ static struct dvb_usb_device_properties az6027_properties = {
 static struct usb_driver az6027_usb_driver = {
 	.name		= "dvb_usb_az6027",
 	.probe 		= az6027_usb_probe,
-	.disconnect 	= az6027_usb_disconnect,
+	.disconnect	= az6027_usb_disconnect,
 	.id_table 	= az6027_usb_table,
 };
 
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH 1/2] Added Technisat Skystar USB HD CI
  2010-07-06 10:23 [PATCH 1/2] Added Technisat Skystar USB HD CI Renzo Dani
@ 2010-07-10 12:04 ` Mauro Carvalho Chehab
  0 siblings, 0 replies; 2+ messages in thread
From: Mauro Carvalho Chehab @ 2010-07-10 12:04 UTC (permalink / raw
  To: Renzo Dani
  Cc: rdunlap, o.endriss, awalls, crope, manu, linux-media,
	linux-kernel, linux-doc

Em 06-07-2010 07:23, Renzo Dani escreveu:
> From: Renzo Dani <arons7@gmail.com>
> 
> 
> Signed-off-by: Renzo Dani <arons7@gmail.com>
> ---
>  drivers/media/dvb/dvb-usb/az6027.c |   14 ++++++++++++--
>  1 files changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/media/dvb/dvb-usb/az6027.c b/drivers/media/dvb/dvb-usb/az6027.c
> index d7290b2..445851a 100644
> --- a/drivers/media/dvb/dvb-usb/az6027.c
> +++ b/drivers/media/dvb/dvb-usb/az6027.c
> @@ -1103,13 +1103,23 @@ static struct dvb_usb_device_properties az6027_properties = {
>  	.rc_query         = az6027_rc_query,
>  	.i2c_algo         = &az6027_i2c_algo,
>  
> -	.num_device_descs = 1,
> +	.num_device_descs = 3,

Your patch is not based on the current verson of az6027 driver. It currently have
5 devices, and it includes 2 Terratec and 2 Technisat USB ID's:

static struct usb_device_id az6027_usb_table[] = {
        { USB_DEVICE(USB_VID_AZUREWAVE, USB_PID_AZUREWAVE_AZ6027) },
        { USB_DEVICE(USB_VID_TERRATEC,  USB_PID_TERRATEC_DVBS2CI_V1) },
        { USB_DEVICE(USB_VID_TERRATEC,  USB_PID_TERRATEC_DVBS2CI_V2) },
       	{ USB_DEVICE(USB_VID_TECHNISAT, USB_PID_TECHNISAT_USB2_HDCI_V1) },
        { USB_DEVICE(USB_VID_TECHNISAT, USB_PID_TECHNISAT_USB2_HDCI_V2) },
       	{ },
};

The corresponding USB ID's for those devices, according with
drivers/media/dvb/dvb-usb/dvb-usb-ids.h, are:

#define USB_PID_TERRATEC_DVBS2CI_V1			0x10a4
#define USB_PID_TERRATEC_DVBS2CI_V2			0x10ac
#define USB_PID_TECHNISAT_USB2_HDCI_V1			0x0001
#define USB_PID_TECHNISAT_USB2_HDCI_V2			0x0002

>  	.devices = {
>  		{
>  			.name = "AZUREWAVE DVB-S/S2 USB2.0 (AZ6027)",
>  			.cold_ids = { &az6027_usb_table[0], NULL },
>  			.warm_ids = { NULL },
>  		},
> +		{
> +		    .name = " Terratec DVB 2 CI",
> +			.cold_ids = { &az6027_usb_table[1], NULL },

Your patch should be adding a new USB ID entry at az6027_usb_table.

> +			.warm_ids = { NULL },
> +		},
> +		{
> +		    .name = "TechniSat SkyStar USB 2 HD CI (AZ6027)",
> +			.cold_ids = { &az6027_usb_table[2], NULL },
> +			.warm_ids = { NULL },
> +		},
>  		{ NULL },
>  	}
>  };
> @@ -1118,7 +1128,7 @@ static struct dvb_usb_device_properties az6027_properties = {
>  static struct usb_driver az6027_usb_driver = {
>  	.name		= "dvb_usb_az6027",
>  	.probe 		= az6027_usb_probe,
> -	.disconnect 	= az6027_usb_disconnect,
> +	.disconnect	= az6027_usb_disconnect,
>  	.id_table 	= az6027_usb_table,
>  };
>  

Please check if the existing USB ID's correspond to the devices that you're
adding. If not, please rebase your patch against devel/for_v2.6.36 branch of my
git tree, at http://git.linuxtv.org/v4l-dvb.git.

Cheers,
Mauro

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-07-10 12:04 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-06 10:23 [PATCH 1/2] Added Technisat Skystar USB HD CI Renzo Dani
2010-07-10 12:04 ` Mauro Carvalho Chehab

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).