@@ -83,7 +83,16 @@ struct media_entity {
struct media_pipeline *pipe; /* Pipeline this entity belongs to. */
union {
- /* Node specifications */
+ /* For all devnode types */
+ struct {
+ u32 major;
+ u32 minor;
+ } dev;
+
+ /* Sub-device specifications */
+ /* Nothing needed yet */
+
+ /* DEPRECATED: Old node specifications */
struct {
u32 major;
u32 minor;
@@ -98,9 +107,6 @@ struct media_entity {
u32 subdevice;
} alsa;
int dvb;
-
- /* Sub-device specifications */
- /* Nothing needed yet */
} info;
};
The previous provision for DVB media controller support were to define an ID (likely meaning the adapter number) for the DVB devnodes. This is just plain wrong. Just like V4L, DVB devices (and ALSA, or whatever) are identified via a (major, minor) tuple. This is enough to uniquely identify a devnode, no matter what API it implements. So, before we go too far, let's mark the old v4l, dvb and alsa "devnode" info as deprecated, and just call it as "dev". As we don't want to break compilation on already existing apps, let's just keep the old definitions as-is, adding a note that those are deprecated at media-entity.h. Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com> - Laurent, If you accept this patch, I'll respin the DVB media controller series accordingly, and add the missing bits for DVB media controller at at the documentation. Regards, Mauro