Thread (24 messages) 24 messages, 5 authors, 2014-11-10

[PATCH v3 10/10] [media] v4l: Forbid usage of V4L2_MBUS_FMT definitions inside the kernel

From: Boris Brezillon <hidden>
Date: 2014-11-07 15:31:48
Also in: linux-api, linux-media, lkml

On Fri, 07 Nov 2014 15:47:41 +0100
Hans Verkuil [off-list ref] wrote:
Nitpicks:

On 11/07/14 15:07, Boris Brezillon wrote:
quoted
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 <redacted>
---
 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
quoted
+ * MEDIA_BUS_FMT_ defintions (defined in media-bus-format.h) should be
and again...
quoted
+ * 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.
quoted
+ */
+
 #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

-- 
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help