| Message ID | 1415369269-5064-11-git-send-email-boris.brezillon@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Nitpicks: On 11/07/14 15:07, Boris Brezillon wrote: > Place v4l2_mbus_pixelcode in a #ifndef __KERNEL__ section so that kernel > users don't have access to these definitions. > > We have to keep this definition for user-space users even though they're > encouraged to move to the new media_bus_format enum. > > Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> > --- > include/uapi/linux/v4l2-mediabus.h | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/include/uapi/linux/v4l2-mediabus.h b/include/uapi/linux/v4l2-mediabus.h > index 3d87db7..4f31d0e 100644 > --- a/include/uapi/linux/v4l2-mediabus.h > +++ b/include/uapi/linux/v4l2-mediabus.h > @@ -15,6 +15,14 @@ > #include <linux/videodev2.h> > #include <linux/media-bus-format.h> > > +#ifndef __KERNEL__ > + > +/* > + * enum v4l2_mbus_pixelcode and its defintions are now deprecated, and defintions -> definitions > + * MEDIA_BUS_FMT_ defintions (defined in media-bus-format.h) should be and again... > + * used instead. I would also add something like this: "New defines should only be added to media-bus-format.h. The v4l2_mbus_pixelcode enum is frozen." > + */ > + > #define V4L2_MBUS_FROM_MEDIA_BUS_FMT(name) \ > MEDIA_BUS_FMT_ ## name = V4L2_MBUS_FMT_ ## name > > @@ -102,6 +110,7 @@ enum v4l2_mbus_pixelcode { > > V4L2_MBUS_FROM_MEDIA_BUS_FMT(AHSV8888_1X32), > }; > +#endif /* __KERNEL__ */ > > /** > * struct v4l2_mbus_framefmt - frame format on the media bus > Can you move this struct forward to before the v4l2_mbus_pixelcode enum? That way the obsolete code is at the end of the header. People might miss this struct otherwise. Regards, Hans
On Fri, 07 Nov 2014 15:47:41 +0100 Hans Verkuil <hverkuil@xs4all.nl> wrote: > Nitpicks: > > On 11/07/14 15:07, Boris Brezillon wrote: > > Place v4l2_mbus_pixelcode in a #ifndef __KERNEL__ section so that kernel > > users don't have access to these definitions. > > > > We have to keep this definition for user-space users even though they're > > encouraged to move to the new media_bus_format enum. > > > > Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> > > --- > > include/uapi/linux/v4l2-mediabus.h | 9 +++++++++ > > 1 file changed, 9 insertions(+) > > > > diff --git a/include/uapi/linux/v4l2-mediabus.h b/include/uapi/linux/v4l2-mediabus.h > > index 3d87db7..4f31d0e 100644 > > --- a/include/uapi/linux/v4l2-mediabus.h > > +++ b/include/uapi/linux/v4l2-mediabus.h > > @@ -15,6 +15,14 @@ > > #include <linux/videodev2.h> > > #include <linux/media-bus-format.h> > > > > +#ifndef __KERNEL__ > > + > > +/* > > + * enum v4l2_mbus_pixelcode and its defintions are now deprecated, and > > defintions -> definitions > > > + * MEDIA_BUS_FMT_ defintions (defined in media-bus-format.h) should be > > and again... > > > + * used instead. > > I would also add something like this: > > "New defines should only be added to media-bus-format.h. The v4l2_mbus_pixelcode > enum is frozen." I'll fix those typos and add this sentence. > > > + */ > > + > > #define V4L2_MBUS_FROM_MEDIA_BUS_FMT(name) \ > > MEDIA_BUS_FMT_ ## name = V4L2_MBUS_FMT_ ## name > > > > @@ -102,6 +110,7 @@ enum v4l2_mbus_pixelcode { > > > > V4L2_MBUS_FROM_MEDIA_BUS_FMT(AHSV8888_1X32), > > }; > > +#endif /* __KERNEL__ */ > > > > /** > > * struct v4l2_mbus_framefmt - frame format on the media bus > > > > Can you move this struct forward to before the v4l2_mbus_pixelcode enum? That way > the obsolete code is at the end of the header. People might miss this struct > otherwise. Sure. Regards, Boris
diff --git a/include/uapi/linux/v4l2-mediabus.h b/include/uapi/linux/v4l2-mediabus.h index 3d87db7..4f31d0e 100644 --- a/include/uapi/linux/v4l2-mediabus.h +++ b/include/uapi/linux/v4l2-mediabus.h @@ -15,6 +15,14 @@ #include <linux/videodev2.h> #include <linux/media-bus-format.h> +#ifndef __KERNEL__ + +/* + * enum v4l2_mbus_pixelcode and its defintions are now deprecated, and + * MEDIA_BUS_FMT_ defintions (defined in media-bus-format.h) should be + * used instead. + */ + #define V4L2_MBUS_FROM_MEDIA_BUS_FMT(name) \ MEDIA_BUS_FMT_ ## name = V4L2_MBUS_FMT_ ## name @@ -102,6 +110,7 @@ enum v4l2_mbus_pixelcode { V4L2_MBUS_FROM_MEDIA_BUS_FMT(AHSV8888_1X32), }; +#endif /* __KERNEL__ */ /** * struct v4l2_mbus_framefmt - frame format on the media bus
Place v4l2_mbus_pixelcode in a #ifndef __KERNEL__ section so that kernel users don't have access to these definitions. We have to keep this definition for user-space users even though they're encouraged to move to the new media_bus_format enum. Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> --- include/uapi/linux/v4l2-mediabus.h | 9 +++++++++ 1 file changed, 9 insertions(+)