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 any other device node)) are uniquely 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, fb, dvb and alsa "devnode" info as deprecated, and just call it as "dev". We can latter add fields specific to each API if needed. 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.
Showing the changes to include/uapi (1 of 4 files). Show all
Unified · Split
| @@ -75,6 +75,20 @@ struct media_entity_desc { · 74 unmodified lines | ||
| 75 | 75 | |
| 76 | 76 | union { |
| 77 | 77 | /* Node specifications */ |
| 78 | + struct { | |
| 79 | + __u32 major; | |
| 80 | + __u32 minor; | |
| 81 | + } dev; | |
| 82 | + | |
| 83 | +#if 1 | |
| 84 | + /* | |
| 85 | + * DEPRECATED: previous node specifications. Kept just to | |
| 86 | + * avoid breaking compilation, but media_entity_desc.dev | |
| 87 | + * should be used instead. In particular, alsa and dvb | |
| 88 | + * fields below are wrong: for all devnodes, there should | |
| 89 | + * be just major/minor inside the struct, as this is enough | |
| 90 | + * to represent any devnode, no matter what type. | |
| 91 | + */ | |
| 78 | 92 | struct { |
| 79 | 93 | __u32 major; |
| 80 | 94 | __u32 minor; |
| @@ -89,6 +103,7 @@ struct media_entity_desc { · 8 unmodified lines | ||
| 89 | 103 | __u32 subdevice; |
| 90 | 104 | } alsa; |
| 91 | 105 | int dvb; |
| 106 | +#endif | |
| 92 | 107 | |
| 93 | 108 | /* Sub-device specifications */ |
| 94 | 109 | /* Nothing needed yet */ |