On 11/04/14 11:20, Hans Verkuil wrote: > Hi Boris, > > On 11/04/14 10:54, Boris Brezillon wrote: >> Rename mediabus formats and move the enum into a separate header file so >> that it can be used by DRM/KMS subsystem without any reference to the V4L2 >> subsystem. >> >> Old V4L2_MBUS_FMT_ definitions are now referencing MEDIA_BUS_FMT_ value. > > I missed earlier that v4l2-mediabus.h contained a struct as well, so it can't be > deprecated and neither can a #warning be added. > > The best approach, I think, is to use a macro in media-bus-format.h > that will either define just the MEDIA_BUS value when compiled in the kernel, or > define both MEDIA_BUS and V4L2_MBUS values when compiled for userspace. > > E.g. something like this: > > #ifdef __KERNEL__ > #define MEDIA_BUS_FMT_ENTRY(name, val) MEDIA_BUS_FMT_ # name = val > #else > /* Keep V4L2_MBUS_FMT for backwards compatibility */ > #define MEDIA_BUS_FMT_ENTRY(name, val) \ > MEDIA_BUS_FMT_ # name = val, \ > V4L2_MBUS_FMT_ # name = val > #endif And v4l2-mediabus.h needs this as well: #ifndef __KERNEL__ /* For backwards compatibility */ #define v4l2_mbus_pixelcode media_bus_format #endif Regards, Hans -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html