public inbox for linux-media@vger.kernel.org
 help / color / mirror / Atom feed
* Re: [PATCH] Ngene cam device name
@ 2011-04-24 11:38 Issa Gorissen
  2011-05-03 23:11 ` Mauro Carvalho Chehab
  0 siblings, 1 reply; 56+ messages in thread
From: Issa Gorissen @ 2011-04-24 11:38 UTC (permalink / raw)
  To: Mauro Carvalho Chehab; +Cc: Ralph Metzler, linux-media, Andreas Oberritter

On 28/03/11 23:40, Mauro Carvalho Chehab wrote:
> Em 27-03-2011 21:44, Ralph Metzler escreveu:
>> Hi,
>>
>> since I just saw cxd2099 appear in staging in the latest git kernel, a
>> simple question which has been pointed out to me before:
>>
>> Why is cxd2099.c in staging regarding the device name question?
>> It has nothing to do with the naming.
> It is not just because of naming. A NACK was given to it, as is, at:
>
> http://www.spinics.net/lists/linux-media/msg28004.html
>
> A previous discussion about this subject were started at:
> 	http://www.mail-archive.com/linux-media@vger.kernel.org/msg22196.html
>
> The point is that an interface meant to be used by satellite were
> used as a ci interface, due to the lack of handling independent CA devices.
>
> As there were no final decision about a proper way to address it, Oliver
> decided to keep it as-is, and I decided to move it to staging while we
> don't properly address the question, extending the DVB API in order to
support
> independent CA devs.
>
> Having the driver at staging allow us to rework at the API and change the
> driver when API changes are done, without needing to pass through kernel 
> process of deprecating old API stuff.
>
> Cheers,
> Mauro
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Hello all,

Here is the patch for the NGene card family and the new caio device.
Can cxd2099 be removed from staging as this patch fixes the raised issue.

Signed-off-by: Issa Gorissen <flop.m@usa.net>
---
 drivers/media/dvb/dvb-core/dvbdev.c  |    2 +-
 drivers/media/dvb/dvb-core/dvbdev.h  |    1 +
 drivers/media/dvb/ngene/ngene-core.c |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/media/dvb/dvb-core/dvbdev.c
b/drivers/media/dvb/dvb-core/dvbdev.c
index f732877..7a64b81 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/drivers/media/dvb/dvb-core/dvbdev.c
@@ -47,7 +47,7 @@ static DEFINE_MUTEX(dvbdev_register_lock);
 
 static const char * const dnames[] = {
 	"video", "audio", "sec", "frontend", "demux", "dvr", "ca",
-	"net", "osd"
+	"net", "osd", "caio"
 };
 
 #ifdef CONFIG_DVB_DYNAMIC_MINORS
diff --git a/drivers/media/dvb/dvb-core/dvbdev.h
b/drivers/media/dvb/dvb-core/dvbdev.h
index fcc6ae9..c63c70d 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.h
+++ b/drivers/media/dvb/dvb-core/dvbdev.h
@@ -47,6 +47,7 @@
 #define DVB_DEVICE_CA         6
 #define DVB_DEVICE_NET        7
 #define DVB_DEVICE_OSD        8
+#define DVB_DEVICE_CAIO       9
 
 #define DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr) \
 	static short adapter_nr[] = \
diff --git a/drivers/media/dvb/ngene/ngene-core.c
b/drivers/media/dvb/ngene/ngene-core.c
index 175a0f6..17cdd38 100644
--- a/drivers/media/dvb/ngene/ngene-core.c
+++ b/drivers/media/dvb/ngene/ngene-core.c
@@ -1523,7 +1523,7 @@ static int init_channel(struct ngene_channel *chan)
 		set_transfer(&chan->dev->channel[2], 1);
 		dvb_register_device(adapter, &chan->ci_dev,
 				    &ngene_dvbdev_ci, (void *) chan,
-				    DVB_DEVICE_SEC);
+				    DVB_DEVICE_CAIO);
 		if (!chan->ci_dev)
 			goto err;
 	}


^ permalink raw reply related	[flat|nested] 56+ messages in thread
* Re: [PATCH] Ngene cam device name
@ 2011-05-06 18:29 Issa Gorissen
  2011-05-08  9:53 ` Andreas Oberritter
  0 siblings, 1 reply; 56+ messages in thread
From: Issa Gorissen @ 2011-05-06 18:29 UTC (permalink / raw)
  To: Andreas Oberritter; +Cc: Martin Vidovic, Ralph Metzler, linux-media

From: Andreas Oberritter <obi@linuxtv.org>
> On 05/06/2011 03:47 PM, Issa Gorissen wrote:
> > From: Andreas Oberritter <obi@linuxtv.org>
> >>> The best would be to create independent adapters for each independent
CA
> >>> device (ca0/caio0 pair) - they are independent after all (physically
and
> >>> in the way they're used).
> >>
> >> Physically, it's a general purpose TS I/O interface of the nGene
> >> chipset. It just happens to be connected to a CI slot. On another board,
> >> it might be connected to a modulator or just to some kind of socket.
> >>
> >> If the next version gets a connector for two switchable CI modules, then
> >> the physical independence is gone. You'd have two ca nodes but only one
> >> caio node. Or two caio nodes, that can't be used concurrently.
> >>
> >> Maybe the next version gets the ability to directly connect the TS input
> >> from the frontend to the TS output to the CI slot to save copying around
> >> the data, by using some kind of pin mux. Not physically independent
either.
> >>
> >> It just looks physically independent in the one configuration
> >> implemented now.
> > 
> > 
> > When I read the cxd2099ar datasheet, I can see that in dual slot
> > configuration, there is still one communication channel for the TS and one
for
> > the control.
> 
> It doesn't matter how the cxd2099ar works, because I'm talking about the
> nGene chipset in place of any chipset having at least two TS inputs and
> one TS output.


Don't know the ngene bridge enough to comment on this.


> 
> Btw., I don't think the cxd2099 driver has any obvious problems. It's
> the nGene driver that registers the sec/caio interface.
> 
> > Also, it seems linux en50221 stack provides for the slot selection. So,
why
> > would you need two ca nodes ?
> 
> Because it's the most obvious way to use it. And more importantly
> because the API sucks, if you have more than one device per node. You
> can have only one reader, one writer, one poll function per node. For
> example, you can't use one instance of mplayer to watch one channel with
> fe0+dmx0+ca0 and a second instance of mplayer to watch or record another
> channel with fe1+dmx1+ca0. You won't know which device has an event if
> you use poll. The API even allows mixing multiple CI slots and built-in
> descramblers in the same node. But try calling CA_RESET on a specific
> slot or on a descrambler. It won't work. It's broken by design.


You need to write a userspace soft which will handle the concurrent access of
your ca device...

But for your given example, is there any card allowing you to do that (one ci
slot, two tuners) ?


^ permalink raw reply	[flat|nested] 56+ messages in thread
* Re: [PATCH] Ngene cam device name
@ 2011-05-06 13:47 Issa Gorissen
  2011-05-06 16:07 ` Andreas Oberritter
  0 siblings, 1 reply; 56+ messages in thread
From: Issa Gorissen @ 2011-05-06 13:47 UTC (permalink / raw)
  To: Andreas Oberritter, Martin Vidovic; +Cc: Ralph Metzler, linux-media

From: Andreas Oberritter <obi@linuxtv.org>
> > The best would be to create independent adapters for each independent CA
> > device (ca0/caio0 pair) - they are independent after all (physically and
> > in the way they're used).
> 
> Physically, it's a general purpose TS I/O interface of the nGene
> chipset. It just happens to be connected to a CI slot. On another board,
> it might be connected to a modulator or just to some kind of socket.
> 
> If the next version gets a connector for two switchable CI modules, then
> the physical independence is gone. You'd have two ca nodes but only one
> caio node. Or two caio nodes, that can't be used concurrently.
> 
> Maybe the next version gets the ability to directly connect the TS input
> from the frontend to the TS output to the CI slot to save copying around
> the data, by using some kind of pin mux. Not physically independent either.
> 
> It just looks physically independent in the one configuration
> implemented now.


When I read the cxd2099ar datasheet, I can see that in dual slot
configuration, there is still one communication channel for the TS and one for
the control.
Also, it seems linux en50221 stack provides for the slot selection. So, why
would you need two ca nodes ?


^ permalink raw reply	[flat|nested] 56+ messages in thread
* Re: [PATCH] Ngene cam device name
@ 2011-05-04 14:51 Issa Gorissen
  0 siblings, 0 replies; 56+ messages in thread
From: Issa Gorissen @ 2011-05-04 14:51 UTC (permalink / raw)
  To: Andreas Oberritter; +Cc: linux-media@vger.kernel.org

From: Andreas Oberritter <obi@linuxtv.org>
> 
> I don't think this is going to happen, as nobody really seems to care
> (me included). I was just pointing out ways that I consider more likely
> to succeed.
> 
> Regards,
> Andreas


If you don't care, why fueling all this fuss ???



^ permalink raw reply	[flat|nested] 56+ messages in thread
* Re: [PATCH] Ngene cam device name
@ 2011-05-04 14:05 Issa Gorissen
  2011-05-04 14:27 ` Andreas Oberritter
  0 siblings, 1 reply; 56+ messages in thread
From: Issa Gorissen @ 2011-05-04 14:05 UTC (permalink / raw)
  To: Andreas Oberritter; +Cc: linux-media

From: Andreas Oberritter <obi@linuxtv.org>
> >> Last but not least, using a different adapter number wouldn't fit
> >> either, because a DVB adapter is supposed to
> >> - be one independent piece of hardware
> >> - provide at least a frontend and a demux device
> > 
> > 
> > How would you support device like the Hauppauge WinTV-CI ? This one comes
on a
> > USB port and does not provide any frontend and demux device.
> 
> Yes, as an exception, this device indeed wouldn't have a frontend,
> because it doesn't exist physycally.
> 
> It wouldn't have multiple adapters numbers either.


What do you mean by they shouldn't have mulitple adapters numbers ? Multiple
WinTV-CI devices should have distinct node parents, ie
/dev/dvb/adapter[01]/<node>



> > With the transmitted keys changed frequently (at least for viaccess),
what's
> > the point in supporting offline descrambling when it will not work
reliably
> > for all ?
> 
> The reliability of offline descrambling depends on the network operators
> policy. So while it won't be useful for everybody in the world, it might
> well be useful to all customers of certain operators.
> 
> > As for descrambling multiple tv channels from different transponders with
only
> > one cam, this is already possible. An example is what Digital Devices
calls
> > MTD (Multi Transponder Decrypting). But this is CAM dependent, some do
not
> > support it.
> 
> What's the point if it doesn't work reliably for everybody? ;-)


Well, isn't it easier to change a CAM than an operator ? For many of us in
France/Belgium, you might even have no choice at all for the operator.


> >> Why don't you just create a new device, e.g. ciX, deprecate the use of
> >> caX for CI devices, inherit CI-related existing ioctls from the CA API,
> >> translate the existing read and write funtions to ioctls and then use
> >> read and write for TS I/O? IIRC, Ralph suggested something similar. I'm
> >> pretty sure this can be done without too much code and in a backwards
> >> compatible way.
> > 
> > 
> > I'm open to this idea, but is there a consensus on this big API change ?
> > (deprecating ca device) If yes, I will try to prepare something.
> 
> The existing API could be copied to linux/dvb/ci.h and then simplified
> and reviewed.
> 

As I said, if you can create a consensus behind your idea, then I will try to
prepare something.


^ permalink raw reply	[flat|nested] 56+ messages in thread
* Re: [PATCH] Ngene cam device name
@ 2011-05-04 11:09 Issa Gorissen
  0 siblings, 0 replies; 56+ messages in thread
From: Issa Gorissen @ 2011-05-04 11:09 UTC (permalink / raw)
  To: linux-media

From: Mauro Carvalho Chehab <mchehab@redhat.com>
> 
> It is not that simple. The question is not just how to name the interface, 
> but that such interface will work on a different way than the current 
> ca interface.
> 
> In other words, the DVB API should clearly explain why this
> interface is different, when it should be used and how.
> 
> Cheers,
> Mauro.
> 

Ok, please give me the location of the DVB API. Could not find it under the
linux/Documentation folder.


^ permalink raw reply	[flat|nested] 56+ messages in thread
* Re: [PATCH] Ngene cam device name
@ 2011-05-04 11:07 Issa Gorissen
  2011-05-04 13:51 ` Andreas Oberritter
  0 siblings, 1 reply; 56+ messages in thread
From: Issa Gorissen @ 2011-05-04 11:07 UTC (permalink / raw)
  To: linux-media

From: Andreas Oberritter <obi@linuxtv.org>
> 
> Of course I'm referring to devices connected to the same physical
> adapter. Otherwise they would all be called ca0. Device enumeration
> always starts at 0, for each adapter. What you're describing just
> doesn't make sense.


Yes indeed you're right, I answered too quickly.


> Last but not least, using a different adapter number wouldn't fit
> either, because a DVB adapter is supposed to
> - be one independent piece of hardware
> - provide at least a frontend and a demux device


How would you support device like the Hauppauge WinTV-CI ? This one comes on a
USB port and does not provide any frontend and demux device.


> 
> At least on embedded devices, it simply isn't feasible to copy a TS to
> userspace from a demux, just to copy it back to the kernel and again
> back to userspace through a caio device, when live streaming. But you
> may want to provide a way to use the caio device for
> offline-descrambling. Unless you want to force users to buy multiple
> modules and multiple subscriptions for a single receiver, which in turn
> would need multiple CI slots, you need a way to make sure caio can not
> be used during live streaming. If this dependency is between different
> adapters, then something is really, really wrong.


With the transmitted keys changed frequently (at least for viaccess), what's
the point in supporting offline descrambling when it will not work reliably
for all ?

As for descrambling multiple tv channels from different transponders with only
one cam, this is already possible. An example is what Digital Devices calls
MTD (Multi Transponder Decrypting). But this is CAM dependent, some do not
support it.

Question is, where does this belong ? kernel or userspace ?


> 
> Why don't you just create a new device, e.g. ciX, deprecate the use of
> caX for CI devices, inherit CI-related existing ioctls from the CA API,
> translate the existing read and write funtions to ioctls and then use
> read and write for TS I/O? IIRC, Ralph suggested something similar. I'm
> pretty sure this can be done without too much code and in a backwards
> compatible way.


I'm open to this idea, but is there a consensus on this big API change ?
(deprecating ca device) If yes, I will try to prepare something.


^ permalink raw reply	[flat|nested] 56+ messages in thread
* Re: [PATCH] Ngene cam device name
@ 2011-05-04  8:27 Issa Gorissen
  2011-05-04  9:59 ` Andreas Oberritter
  0 siblings, 1 reply; 56+ messages in thread
From: Issa Gorissen @ 2011-05-04  8:27 UTC (permalink / raw)
  To: linux-media

From: Andreas Oberritter <obi@linuxtv.org>
> Also, there's still no mapping between ca and caio devices. Imagine a
> built-in descrambler ca0 and two CI slots ca1 and ca2.
> 
> ca0 won't get a caio device, at least for now.
> ca1 and ca2 might or might not have a caio device.
> 
> If there is caio0, how am I supposed to know that it's related to ca1 or
> ca2 (or ca0, if someone implements a caio device to bypass the software
> demux to use a built-in descrambler)? You must not assume that there are
> either none or two (or three) caio interfaces. You need to be able to
> detect (or set up) the connection between the interfaces. Otherwise this
> "API" will be a mess.
> 
> Regards,
> Andreas


To my understanding, in such a described case, 

- ca0 would be reached from /dev/dvb/adapter0/ca0
- ca[12], depending on if they are connected to the same physical adapter
(PCI, USB, ...), would be reached from /dev/dvb/adapter1/ca[12] or
/dev/dvb/adapter1/ca1 and /dev/dvb/adapter2/ca2 and there respective caio
devices.

- If the 3 ca devices are on the same adapter, then the driver writer should
take care of the order of the mapping so that ca1 always map caio1 and
ca2/caio2, ...; and if this is not feasable, then the driver writer should
span the ca/caio devices on different /dev/dvb/adapter folders.


^ permalink raw reply	[flat|nested] 56+ messages in thread
* Re: [PATCH] Ngene cam device name
@ 2011-03-12 15:39 Issa Gorissen
  0 siblings, 0 replies; 56+ messages in thread
From: Issa Gorissen @ 2011-03-12 15:39 UTC (permalink / raw)
  To: Andreas Oberritter; +Cc: linux-media

From: Andreas Oberritter <obi@linuxtv.org>
> 
> I'm not against adding a new node if its behaviour is well defined and
> documented and if it integrates well into the existing API.


Integration is okay; current API is left untouched.
The behaviour is defined as a write encrypted stream / read decrypted stream
device.


> 
> > You might find that adding a new node is lazy, but there are advantages:
> > - current API isn't broken, namely, ca devices are still used for the
control
> > messages, nothing more;
> 
> "nothing more" is wrong, as ca devices are used for descramblers, too.


I don't understand your point here, do you mean these DVB descramblers
currently use ca device for more than the control messages ?


> 
> > - for applications using the DVB API, it is also easier to debug while
reading
> > the code, in my opinion, because of the usage of two distinct devices (ca
/
> > cam) instead of one (ca / ioctls);
> 
> That's just a matter of taste.

Okay, so you agree that choosing ca/ioctls over ca/cam is just a matter of
taste.


^ permalink raw reply	[flat|nested] 56+ messages in thread
* Re: [PATCH] Ngene cam device name
@ 2011-03-12 14:34 Issa Gorissen
  2011-03-12 14:58 ` Andreas Oberritter
  0 siblings, 1 reply; 56+ messages in thread
From: Issa Gorissen @ 2011-03-12 14:34 UTC (permalink / raw)
  To: Ralph Metzler, Andreas Oberritter; +Cc: linux-media

From: Ralph Metzler <rjkm@metzlerbros.de>
> Andreas Oberritter writes:
>  > > Unless you want to move the writing to/reading from the CI module into
>  > > ioctls of the ci device you need another node. 
>  > > Even nicer would be having the control messages moved to ioctls and
the
>  > > TS IO in read/write of ci, but this would break the old interface.
>  > 
>  > It's possible to keep compatibility. Just add ioctls to get and set the
>  > interface version. Default to the current version, not supporting TS
>  > I/O. If the version is set to e.g. 1, switch from the current interface
>  > to the new one, using ioctls for control messages.
> 
> A possibility, but also requires rewrites in existing software like
libdvben50221.
> Right now you can e.g. tune with /dev/dvb/adapter0/frontend0, point an
unchanged
> libdvben50221 to /dev/dvb/adapter1/ci0 (separate adapter since it can even
> be on a different card) and pipe all PIDs of cam_pmt of the program
> you are watching through /dev/dvb/adapter1/sec0(cam0) and it is decoded.

This is KISS compliant by the way.

Andreas, please explain what *really* bothers you with this architecture
choice of having a new node, leaving the current API as is.

You might find that adding a new node is lazy, but there are advantages:
- current API isn't broken, namely, ca devices are still used for the control
messages, nothing more;
- for applications using the DVB API, it is also easier to debug while reading
the code, in my opinion, because of the usage of two distinct devices (ca /
cam) instead of one (ca / ioctls);


--
Issa


^ permalink raw reply	[flat|nested] 56+ messages in thread
* Re: [PATCH] Ngene cam device name
@ 2011-03-12 14:10 Issa Gorissen
  2011-03-12 14:48 ` Andreas Oberritter
  0 siblings, 1 reply; 56+ messages in thread
From: Issa Gorissen @ 2011-03-12 14:10 UTC (permalink / raw)
  To: linux-media

From: Andreas Oberritter <obi@linuxtv.org>
> On 03/11/2011 10:44 PM, Martin Vidovic wrote:
> > Andreas Oberritter wrote:
> >> It's rather unintuitive that some CAMs appear as ca0, while others as
> >> cam0.
> >>   
> > Ngene CI appears as both ca0 and cam0 (or sec0). The ca0 node is used
> > as usual, to setup the CAM. The cam0 (or sec0) node is used to read/write
> > transport stream. To me it  looks like an extension of the current API.
> 
> I see. This raises another problem. How to find out, which ca device
> cam0 relates to, in case there are more ca devices than cam devices?
> 

Are you sure there can be more ca devices than cam devices ? Shouldn't they
come by pair ?


^ permalink raw reply	[flat|nested] 56+ messages in thread
* Re: [PATCH] Ngene cam device name
@ 2011-03-11 18:33 Issa Gorissen
  2011-03-11 20:39 ` Andreas Oberritter
  0 siblings, 1 reply; 56+ messages in thread
From: Issa Gorissen @ 2011-03-11 18:33 UTC (permalink / raw)
  To: Andreas Oberritter; +Cc: linux-media, rjkm

From: Andreas Oberritter <obi@linuxtv.org>
To: Issa Gorissen <flop.m@usa.net>Cc: linux-media@vger.kernel.org,
rjkm@metzlerbros.de
Subject: Re: [PATCH] Ngene cam device name

> On 03/10/2011 04:29 PM, Issa Gorissen wrote:
> > As the cxd20099 driver is in staging due to abuse of the sec0 device,
this
> > patch renames it to cam0. The sec0 device is not in use and can be
removed
> 
> That doesn't solve anything. Besides, your patch doesn't even do what
> you describe.
> 
> Wouldn't it be possible to extend the current CA API? If not, shouldn't
> a new API be created that covers both old and new requirements?
> 
> It's rather unintuitive that some CAMs appear as ca0, while others as cam0.
> 
> If it was that easy to fix, it wouldn't be in staging today.
> 
> Regards,
> Andreas


Yes indeed, this patch is missing the update of dnames arrays in dvbdev.c

Now, according to Mauro comments, he has put this code into staging because of
the usage of sec0 name for a cam device.

Please comment on Oliver's explanations from this thread

http://www.mail-archive.com/linux-media@vger.kernel.org/msg26901.html


Thx
--
Issa


> 
> > Signed-off-by: Issa Gorissen <flop.m@usa.net>
> > ---
> >  drivers/media/dvb/dvb-core/dvbdev.h  |    2 +-
> >  drivers/media/dvb/ngene/ngene-core.c |    2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/media/dvb/dvb-core/dvbdev.h 
> > b/drivers/media/dvb/dvb-core/dvbdev.h
> > index fcc6ae9..dcac27d 100644
> > --- a/drivers/media/dvb/dvb-core/dvbdev.h
> > +++ b/drivers/media/dvb/dvb-core/dvbdev.h
> > @@ -40,7 +40,7 @@
> >  
> >  #define DVB_DEVICE_VIDEO      0
> >  #define DVB_DEVICE_AUDIO      1
> > -#define DVB_DEVICE_SEC        2
> > +#define DVB_DEVICE_CAM        2
> >  #define DVB_DEVICE_FRONTEND   3
> >  #define DVB_DEVICE_DEMUX      4
> >  #define DVB_DEVICE_DVR        5
> > diff --git a/drivers/media/dvb/ngene/ngene-core.c 
> > b/drivers/media/dvb/ngene/ngene-core.c
> > index 175a0f6..6be2d7c 100644
> > --- a/drivers/media/dvb/ngene/ngene-core.c
> > +++ b/drivers/media/dvb/ngene/ngene-core.c
> > @@ -1523,7 +1523,7 @@ static int init_channel(struct ngene_channel *chan)
> >                 set_transfer(&chan->dev->channel[2], 1);
> >                 dvb_register_device(adapter, &chan->ci_dev,
> >                                     &ngene_dvbdev_ci, (void *) chan,
> > -                                   DVB_DEVICE_SEC);
> > +                                   DVB_DEVICE_CAM);
> >                 if (!chan->ci_dev)
> >                         goto err;
> >         }
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-media" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 



^ permalink raw reply	[flat|nested] 56+ messages in thread
* [PATCH] Ngene cam device name
@ 2011-03-10 15:29 Issa Gorissen
  2011-03-11 15:52 ` Andreas Oberritter
  0 siblings, 1 reply; 56+ messages in thread
From: Issa Gorissen @ 2011-03-10 15:29 UTC (permalink / raw)
  To: linux-media; +Cc: rjkm

As the cxd20099 driver is in staging due to abuse of the sec0 device, this
patch renames it to cam0. The sec0 device is not in use and can be removed

Signed-off-by: Issa Gorissen <flop.m@usa.net>
---
 drivers/media/dvb/dvb-core/dvbdev.h  |    2 +-
 drivers/media/dvb/ngene/ngene-core.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/dvb/dvb-core/dvbdev.h 
b/drivers/media/dvb/dvb-core/dvbdev.h
index fcc6ae9..dcac27d 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.h
+++ b/drivers/media/dvb/dvb-core/dvbdev.h
@@ -40,7 +40,7 @@
 
 #define DVB_DEVICE_VIDEO      0
 #define DVB_DEVICE_AUDIO      1
-#define DVB_DEVICE_SEC        2
+#define DVB_DEVICE_CAM        2
 #define DVB_DEVICE_FRONTEND   3
 #define DVB_DEVICE_DEMUX      4
 #define DVB_DEVICE_DVR        5
diff --git a/drivers/media/dvb/ngene/ngene-core.c 
b/drivers/media/dvb/ngene/ngene-core.c
index 175a0f6..6be2d7c 100644
--- a/drivers/media/dvb/ngene/ngene-core.c
+++ b/drivers/media/dvb/ngene/ngene-core.c
@@ -1523,7 +1523,7 @@ static int init_channel(struct ngene_channel *chan)
                set_transfer(&chan->dev->channel[2], 1);
                dvb_register_device(adapter, &chan->ci_dev,
                                    &ngene_dvbdev_ci, (void *) chan,
-                                   DVB_DEVICE_SEC);
+                                   DVB_DEVICE_CAM);
                if (!chan->ci_dev)
                        goto err;
        }

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

end of thread, other threads:[~2011-05-09 11:44 UTC | newest]

Thread overview: 56+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-24 11:38 [PATCH] Ngene cam device name Issa Gorissen
2011-05-03 23:11 ` Mauro Carvalho Chehab
2011-05-04  7:24   ` Andreas Oberritter
  -- strict thread matches above, loose matches on Subject: below --
2011-05-06 18:29 Issa Gorissen
2011-05-08  9:53 ` Andreas Oberritter
2011-05-08 10:30   ` Issa Gorissen
2011-05-06 13:47 Issa Gorissen
2011-05-06 16:07 ` Andreas Oberritter
2011-05-04 14:51 Issa Gorissen
2011-05-04 14:05 Issa Gorissen
2011-05-04 14:27 ` Andreas Oberritter
2011-05-04 11:09 Issa Gorissen
2011-05-04 11:07 Issa Gorissen
2011-05-04 13:51 ` Andreas Oberritter
2011-05-04  8:27 Issa Gorissen
2011-05-04  9:59 ` Andreas Oberritter
2011-05-04 11:20   ` Ralph Metzler
2011-05-04 12:30     ` Andreas Oberritter
2011-05-04 13:15       ` Ralph Metzler
2011-05-04 13:35       ` Martin Vidovic
2011-05-04 14:46         ` Andreas Oberritter
2011-05-05 14:43           ` Martin Vidovic
2011-05-06 12:17             ` Andreas Oberritter
2011-05-06 13:43               ` Walter Van Eetvelt
2011-05-08 10:05               ` Martin Vidovic
2011-05-08 17:58                 ` Andreas Oberritter
2011-05-08 23:55                   ` Martin Vidovic
2011-05-09 11:44                     ` Andreas Oberritter
2011-03-12 15:39 Issa Gorissen
2011-03-12 14:34 Issa Gorissen
2011-03-12 14:58 ` Andreas Oberritter
2011-03-28  0:44   ` Ralph Metzler
2011-03-28 21:40     ` Mauro Carvalho Chehab
2011-04-24  9:31       ` Issa Gorissen
2011-03-28 22:57     ` Oliver Endriss
2011-04-05 21:50       ` Issa Gorissen
2011-03-12 14:10 Issa Gorissen
2011-03-12 14:48 ` Andreas Oberritter
2011-03-12 14:57   ` Martin Vidovic
2011-03-12 15:06     ` Andreas Oberritter
2011-03-11 18:33 Issa Gorissen
2011-03-11 20:39 ` Andreas Oberritter
2011-03-11 21:46   ` Ralph Metzler
2011-03-12 13:25     ` Andreas Oberritter
2011-03-12 13:55       ` Ralph Metzler
2011-03-10 15:29 Issa Gorissen
2011-03-11 15:52 ` Andreas Oberritter
2011-03-11 21:44   ` Martin Vidovic
2011-03-12 13:29     ` Andreas Oberritter
2011-03-12 14:05       ` Ralph Metzler
2011-03-12 14:38         ` Andreas Oberritter
2011-03-12 15:06           ` Ralph Metzler
2011-03-12 23:42       ` Oliver Endriss
2011-03-13 10:47         ` Martin Vidovic
2011-03-16 22:07           ` Issa Gorissen
2011-03-18 20:20             ` Martin Vidovic

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox