xlat: add #enum to v4l2 xlats

* xlat/v4l2_buf_types.in: Add #enum, #include <sys/time.h>, #include
<linux/ioctl.h>, #include <linux/types.h>, and #include
<linux/videodev2.h>.
* xlat/v4l2_colorspaces.in: Likewise.
* xlat/v4l2_control_types.in: Likewise.
* xlat/v4l2_fields.in: Likewise.
* xlat/v4l2_framesize_types.in: Likewise.
* xlat/v4l2_memories.in: Likewise.
* xlat/v4l2_tuner_types.in: Likewise.
* configure.ac (AC_CHECK_DECL(V4L2_*)): Remove.

8 files changed, 35 insertions, 66 deletions

diff --git a/configure.ac b/configure.ac
index 8a5665f74..c9ba5cbcf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -632,72 +632,6 @@ AC_CHECK_DECLS(m4_normalize([
 	PTRACE_POKEUSER
 ]),,, [#include <sys/ptrace.h>])
 
-AC_CHECK_DECLS(m4_normalize([
-	V4L2_FIELD_ANY,
-	V4L2_FIELD_NONE,
-	V4L2_FIELD_TOP,
-	V4L2_FIELD_BOTTOM,
-	V4L2_FIELD_INTERLACED,
-	V4L2_FIELD_SEQ_TB,
-	V4L2_FIELD_SEQ_BT,
-	V4L2_FIELD_ALTERNATE,
-	V4L2_FIELD_INTERLACED_TB,
-	V4L2_FIELD_INTERLACED_BT,
-	V4L2_BUF_TYPE_VIDEO_CAPTURE,
-	V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE,
-	V4L2_BUF_TYPE_VIDEO_OUTPUT,
-	V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
-	V4L2_BUF_TYPE_VIDEO_OVERLAY,
-	V4L2_BUF_TYPE_VBI_CAPTURE,
-	V4L2_BUF_TYPE_VBI_OUTPUT,
-	V4L2_BUF_TYPE_SLICED_VBI_CAPTURE,
-	V4L2_BUF_TYPE_SLICED_VBI_OUTPUT,
-	V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY,
-	V4L2_BUF_TYPE_SDR_CAPTURE,
-	V4L2_BUF_TYPE_SDR_OUTPUT,
-	V4L2_TUNER_RADIO,
-	V4L2_TUNER_ANALOG_TV,
-	V4L2_TUNER_DIGITAL_TV,
-	V4L2_MEMORY_MMAP,
-	V4L2_MEMORY_USERPTR,
-	V4L2_MEMORY_OVERLAY,
-	V4L2_MEMORY_DMABUF,
-	V4L2_COLORSPACE_SMPTE170M,
-	V4L2_COLORSPACE_SMPTE240M,
-	V4L2_COLORSPACE_REC709,
-	V4L2_COLORSPACE_BT878,
-	V4L2_COLORSPACE_470_SYSTEM_M,
-	V4L2_COLORSPACE_470_SYSTEM_BG,
-	V4L2_COLORSPACE_JPEG,
-	V4L2_COLORSPACE_SRGB,
-	V4L2_PRIORITY_UNSET,
-	V4L2_PRIORITY_BACKGROUND,
-	V4L2_PRIORITY_INTERACTIVE,
-	V4L2_PRIORITY_RECORD,
-	V4L2_FRMSIZE_TYPE_DISCRETE,
-	V4L2_FRMSIZE_TYPE_CONTINUOUS,
-	V4L2_FRMSIZE_TYPE_STEPWISE,
-	V4L2_FRMIVAL_TYPE_DISCRETE,
-	V4L2_FRMIVAL_TYPE_CONTINUOUS,
-	V4L2_FRMIVAL_TYPE_STEPWISE,
-	V4L2_CTRL_TYPE_INTEGER,
-	V4L2_CTRL_TYPE_BOOLEAN,
-	V4L2_CTRL_TYPE_MENU,
-	V4L2_CTRL_TYPE_BUTTON,
-	V4L2_CTRL_TYPE_INTEGER64,
-	V4L2_CTRL_TYPE_CTRL_CLASS,
-	V4L2_CTRL_TYPE_STRING,
-	V4L2_CTRL_TYPE_BITMASK,
-	V4L2_CTRL_TYPE_INTEGER_MENU,
-	V4L2_CTRL_TYPE_U8,
-	V4L2_CTRL_TYPE_U16,
-	V4L2_CTRL_TYPE_U32,
-	V4L2_CTRL_TYPE_AREA
-]),,, [#include <sys/time.h>
-#include <linux/ioctl.h>
-#include <linux/types.h>
-#include <linux/videodev2.h>])
-
 AC_CHECK_TYPES(m4_normalize([
 	struct v4l2_create_buffers,
 	struct v4l2_frmsizeenum,
diff --git a/xlat/v4l2_buf_types.in b/xlat/v4l2_buf_types.in
index 1492d5e8e..a3e77bb29 100644
--- a/xlat/v4l2_buf_types.in
+++ b/xlat/v4l2_buf_types.in
@@ -1,4 +1,9 @@
 #value_indexed
+#enum
+#include <sys/time.h>
+#include <linux/ioctl.h>
+#include <linux/types.h>
+#include <linux/videodev2.h>
 V4L2_BUF_TYPE_VIDEO_CAPTURE		1
 V4L2_BUF_TYPE_VIDEO_OUTPUT		2
 V4L2_BUF_TYPE_VIDEO_OVERLAY		3
diff --git a/xlat/v4l2_colorspaces.in b/xlat/v4l2_colorspaces.in
index 6b0e7eac7..4012d2d57 100644
--- a/xlat/v4l2_colorspaces.in
+++ b/xlat/v4l2_colorspaces.in
@@ -1,4 +1,9 @@
 #value_indexed
+#enum
+#include <sys/time.h>
+#include <linux/ioctl.h>
+#include <linux/types.h>
+#include <linux/videodev2.h>
 V4L2_COLORSPACE_DEFAULT		0
 V4L2_COLORSPACE_SMPTE170M	1
 V4L2_COLORSPACE_SMPTE240M	2
diff --git a/xlat/v4l2_control_types.in b/xlat/v4l2_control_types.in
index 1173d27cc..eb8966d7c 100644
--- a/xlat/v4l2_control_types.in
+++ b/xlat/v4l2_control_types.in
@@ -1,4 +1,9 @@
 #sorted
+#enum
+#include <sys/time.h>
+#include <linux/ioctl.h>
+#include <linux/types.h>
+#include <linux/videodev2.h>
 V4L2_CTRL_TYPE_INTEGER			1
 V4L2_CTRL_TYPE_BOOLEAN			2
 V4L2_CTRL_TYPE_MENU			3
diff --git a/xlat/v4l2_fields.in b/xlat/v4l2_fields.in
index ea99844fe..5a8dcf839 100644
--- a/xlat/v4l2_fields.in
+++ b/xlat/v4l2_fields.in
@@ -1,4 +1,9 @@
 #value_indexed
+#enum
+#include <sys/time.h>
+#include <linux/ioctl.h>
+#include <linux/types.h>
+#include <linux/videodev2.h>
 V4L2_FIELD_ANY			0
 V4L2_FIELD_NONE			1
 V4L2_FIELD_TOP			2
diff --git a/xlat/v4l2_framesize_types.in b/xlat/v4l2_framesize_types.in
index c6c370d0a..49ae6a2d9 100644
--- a/xlat/v4l2_framesize_types.in
+++ b/xlat/v4l2_framesize_types.in
@@ -1,4 +1,9 @@
 #value_indexed
+#enum
+#include <sys/time.h>
+#include <linux/ioctl.h>
+#include <linux/types.h>
+#include <linux/videodev2.h>
 V4L2_FRMSIZE_TYPE_DISCRETE	1
 V4L2_FRMSIZE_TYPE_CONTINUOUS	2
 V4L2_FRMSIZE_TYPE_STEPWISE	3
diff --git a/xlat/v4l2_memories.in b/xlat/v4l2_memories.in
index def6d8420..6e9df1909 100644
--- a/xlat/v4l2_memories.in
+++ b/xlat/v4l2_memories.in
@@ -1,4 +1,9 @@
 #value_indexed
+#enum
+#include <sys/time.h>
+#include <linux/ioctl.h>
+#include <linux/types.h>
+#include <linux/videodev2.h>
 V4L2_MEMORY_MMAP	1
 V4L2_MEMORY_USERPTR	2
 V4L2_MEMORY_OVERLAY	3
diff --git a/xlat/v4l2_tuner_types.in b/xlat/v4l2_tuner_types.in
index 0f7b3a120..22e1b2318 100644
--- a/xlat/v4l2_tuner_types.in
+++ b/xlat/v4l2_tuner_types.in
@@ -1,4 +1,9 @@
 #value_indexed
+#enum
+#include <sys/time.h>
+#include <linux/ioctl.h>
+#include <linux/types.h>
+#include <linux/videodev2.h>
 V4L2_TUNER_RADIO	1
 V4L2_TUNER_ANALOG_TV	2
 V4L2_TUNER_DIGITAL_TV	3