Sync formatting and a few comments with upstream. No functional change.

1 files changed, 514 insertions, 534 deletions

diff --git a/sys/sys/videoio.h b/sys/sys/videoio.h
index 57381752241..078926acfeb 100644
--- a/sys/sys/videoio.h
+++ b/sys/sys/videoio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: videoio.h,v 1.12 2016/01/01 14:17:12 feinerer Exp $	*/
+/*	$OpenBSD: videoio.h,v 1.13 2016/01/01 15:34:09 feinerer Exp $	*/
 /*
  *  Video for Linux Two header file
  *
@@ -42,17 +42,17 @@
  *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      Header file for v4l or V4L2 drivers and applications
+ *	Header file for v4l or V4L2 drivers and applications
  * with public API.
  * All kernel-specific stuff were moved to media/v4l2-dev.h, so
  * no #if __KERNEL tests are allowed here
  *
- *      See http://linuxtv.org for more info
+ *	See http://linuxtv.org for more info
  *
- *      Author: Bill Dirks <bill@thedirks.org>
- *              Justin Schoeman
+ *	Author: Bill Dirks <bill@thedirks.org>
+ *		Justin Schoeman
  *              Hans Verkuil <hverkuil@xs4all.nl>
- *              et al.
+ *		et al.
  */
 
 #ifndef _SYS_VIDEOIO_H_
@@ -1009,12 +1009,13 @@ typedef __u32 __le32;
 
 /*
  * Common stuff for both V4L1 and V4L2
+ * Moved from videodev.h
  */
 #define VIDEO_MAX_FRAME               32
 #define VIDEO_MAX_PLANES               8
 
 /*
- *      M I S C E L L A N E O U S
+ *	M I S C E L L A N E O U S
  */
 
 /*  Four-character-code (FOURCC) */
@@ -1023,62 +1024,63 @@ typedef __u32 __le32;
 #define v4l2_fourcc_be(a, b, c, d)	(v4l2_fourcc(a, b, c, d) | (1 << 31))
 
 /*
- *      E N U M S
+ *	E N U M S
  */
 enum v4l2_field {
-	V4L2_FIELD_ANY = 0,	/* driver can choose from none, top, bottom,
-				 * interlaced depending on whatever it thinks
-				 * is approximate ... */
-	V4L2_FIELD_NONE = 1,	/* this device has no fields ... */
-	V4L2_FIELD_TOP = 2,	/* top field only */
-	V4L2_FIELD_BOTTOM = 3,	/* bottom field only */
-	V4L2_FIELD_INTERLACED = 4,	/* both fields interlaced */
-	V4L2_FIELD_SEQ_TB = 5,	/* both fields sequential into one buffer,
-				 * top-bottom order */
-	V4L2_FIELD_SEQ_BT = 6,	/* same as above + bottom-top order */
-	V4L2_FIELD_ALTERNATE = 7,	/* both fields alternating into
-					 * separate buffers */
-	V4L2_FIELD_INTERLACED_TB = 8,	/* both fields interlaced, top field
-					 * first and the top field is
-					 * transmitted first */
-	V4L2_FIELD_INTERLACED_BT = 9,	/* both fields interlaced, top field
-					 * first and the bottom field is
-					 * transmitted first */
-};
-#define V4L2_FIELD_HAS_TOP(field)       \
-        ((field) == V4L2_FIELD_TOP      ||\
-         (field) == V4L2_FIELD_INTERLACED ||\
-         (field) == V4L2_FIELD_INTERLACED_TB ||\
-         (field) == V4L2_FIELD_INTERLACED_BT ||\
-         (field) == V4L2_FIELD_SEQ_TB   ||\
-         (field) == V4L2_FIELD_SEQ_BT)
-#define V4L2_FIELD_HAS_BOTTOM(field)    \
-        ((field) == V4L2_FIELD_BOTTOM   ||\
-         (field) == V4L2_FIELD_INTERLACED ||\
-         (field) == V4L2_FIELD_INTERLACED_TB ||\
-         (field) == V4L2_FIELD_INTERLACED_BT ||\
-         (field) == V4L2_FIELD_SEQ_TB   ||\
-         (field) == V4L2_FIELD_SEQ_BT)
-#define V4L2_FIELD_HAS_BOTH(field)      \
-        ((field) == V4L2_FIELD_INTERLACED ||\
-         (field) == V4L2_FIELD_INTERLACED_TB ||\
-         (field) == V4L2_FIELD_INTERLACED_BT ||\
-         (field) == V4L2_FIELD_SEQ_TB ||\
-         (field) == V4L2_FIELD_SEQ_BT)
+	V4L2_FIELD_ANY           = 0, /* driver can choose from none,
+					 top, bottom, interlaced
+					 depending on whatever it thinks
+					 is approximate ... */
+	V4L2_FIELD_NONE          = 1, /* this device has no fields ... */
+	V4L2_FIELD_TOP           = 2, /* top field only */
+	V4L2_FIELD_BOTTOM        = 3, /* bottom field only */
+	V4L2_FIELD_INTERLACED    = 4, /* both fields interlaced */
+	V4L2_FIELD_SEQ_TB        = 5, /* both fields sequential into one
+					 buffer, top-bottom order */
+	V4L2_FIELD_SEQ_BT        = 6, /* same as above + bottom-top order */
+	V4L2_FIELD_ALTERNATE     = 7, /* both fields alternating into
+					 separate buffers */
+	V4L2_FIELD_INTERLACED_TB = 8, /* both fields interlaced, top field
+					 first and the top field is
+					 transmitted first */
+	V4L2_FIELD_INTERLACED_BT = 9, /* both fields interlaced, top field
+					 first and the bottom field is
+					 transmitted first */
+};
+#define V4L2_FIELD_HAS_TOP(field)	\
+	((field) == V4L2_FIELD_TOP 	||\
+	 (field) == V4L2_FIELD_INTERLACED ||\
+	 (field) == V4L2_FIELD_INTERLACED_TB ||\
+	 (field) == V4L2_FIELD_INTERLACED_BT ||\
+	 (field) == V4L2_FIELD_SEQ_TB	||\
+	 (field) == V4L2_FIELD_SEQ_BT)
+#define V4L2_FIELD_HAS_BOTTOM(field)	\
+	((field) == V4L2_FIELD_BOTTOM 	||\
+	 (field) == V4L2_FIELD_INTERLACED ||\
+	 (field) == V4L2_FIELD_INTERLACED_TB ||\
+	 (field) == V4L2_FIELD_INTERLACED_BT ||\
+	 (field) == V4L2_FIELD_SEQ_TB	||\
+	 (field) == V4L2_FIELD_SEQ_BT)
+#define V4L2_FIELD_HAS_BOTH(field)	\
+	((field) == V4L2_FIELD_INTERLACED ||\
+	 (field) == V4L2_FIELD_INTERLACED_TB ||\
+	 (field) == V4L2_FIELD_INTERLACED_BT ||\
+	 (field) == V4L2_FIELD_SEQ_TB ||\
+	 (field) == V4L2_FIELD_SEQ_BT)
 #define V4L2_FIELD_HAS_T_OR_B(field)	\
 	((field) == V4L2_FIELD_BOTTOM ||\
 	 (field) == V4L2_FIELD_TOP ||\
 	 (field) == V4L2_FIELD_ALTERNATE)
 
 enum v4l2_buf_type {
-	V4L2_BUF_TYPE_VIDEO_CAPTURE = 1,
-	V4L2_BUF_TYPE_VIDEO_OUTPUT = 2,
-	V4L2_BUF_TYPE_VIDEO_OVERLAY = 3,
-	V4L2_BUF_TYPE_VBI_CAPTURE = 4,
-	V4L2_BUF_TYPE_VBI_OUTPUT = 5,
-	V4L2_BUF_TYPE_SLICED_VBI_CAPTURE = 6,
-	V4L2_BUF_TYPE_SLICED_VBI_OUTPUT = 7,
-#if 1				/* KEEP */
+	V4L2_BUF_TYPE_VIDEO_CAPTURE        = 1,
+	V4L2_BUF_TYPE_VIDEO_OUTPUT         = 2,
+	V4L2_BUF_TYPE_VIDEO_OVERLAY        = 3,
+	V4L2_BUF_TYPE_VBI_CAPTURE          = 4,
+	V4L2_BUF_TYPE_VBI_OUTPUT           = 5,
+	V4L2_BUF_TYPE_SLICED_VBI_CAPTURE   = 6,
+	V4L2_BUF_TYPE_SLICED_VBI_OUTPUT    = 7,
+#if 1
 	/* Experimental */
 	V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY = 8,
 #endif
@@ -1087,7 +1089,7 @@ enum v4l2_buf_type {
 	V4L2_BUF_TYPE_SDR_CAPTURE          = 11,
 	V4L2_BUF_TYPE_SDR_OUTPUT           = 12,
 	/* Deprecated, do not use */
-	V4L2_BUF_TYPE_PRIVATE = 0x80,
+	V4L2_BUF_TYPE_PRIVATE              = 0x80,
 };
 
 #define V4L2_TYPE_IS_MULTIPLANAR(type)			\
@@ -1104,9 +1106,9 @@ enum v4l2_buf_type {
 	 || (type) == V4L2_BUF_TYPE_SDR_OUTPUT)
 
 enum v4l2_tuner_type {
-	V4L2_TUNER_RADIO = 1,
-	V4L2_TUNER_ANALOG_TV = 2,
-	V4L2_TUNER_DIGITAL_TV = 3,
+	V4L2_TUNER_RADIO	     = 1,
+	V4L2_TUNER_ANALOG_TV	     = 2,
+	V4L2_TUNER_DIGITAL_TV	     = 3,
 	V4L2_TUNER_SDR               = 4,
 	V4L2_TUNER_RF                = 5,
 };
@@ -1115,9 +1117,9 @@ enum v4l2_tuner_type {
 #define V4L2_TUNER_ADC  V4L2_TUNER_SDR
 
 enum v4l2_memory {
-	V4L2_MEMORY_MMAP = 1,
-	V4L2_MEMORY_USERPTR = 2,
-	V4L2_MEMORY_OVERLAY = 3,
+	V4L2_MEMORY_MMAP             = 1,
+	V4L2_MEMORY_USERPTR          = 2,
+	V4L2_MEMORY_OVERLAY          = 3,
 	V4L2_MEMORY_DMABUF           = 4,
 };
 
@@ -1130,19 +1132,19 @@ enum v4l2_colorspace {
 	V4L2_COLORSPACE_DEFAULT       = 0,
 
 	/* SMPTE 170M: used for broadcast NTSC/PAL SDTV */
-	V4L2_COLORSPACE_SMPTE170M = 1,
+	V4L2_COLORSPACE_SMPTE170M     = 1,
 
 	/* Obsolete pre-1998 SMPTE 240M HDTV standard, superseded by Rec 709 */
-	V4L2_COLORSPACE_SMPTE240M = 2,
+	V4L2_COLORSPACE_SMPTE240M     = 2,
 
 	/* Rec.709: used for HDTV */
-	V4L2_COLORSPACE_REC709 = 3,
+	V4L2_COLORSPACE_REC709        = 3,
 
 	/*
 	 * Deprecated, do not use. No driver will ever return this. This was
 	 * based on a misunderstanding of the bt878 datasheet.
 	 */
-	V4L2_COLORSPACE_BT878 = 4,
+	V4L2_COLORSPACE_BT878         = 4,
 
 	/*
 	 * NTSC 1953 colorspace. This only makes sense when dealing with
@@ -1161,7 +1163,7 @@ enum v4l2_colorspace {
 	 * Effectively shorthand for V4L2_COLORSPACE_SRGB, V4L2_YCBCR_ENC_601
 	 * and V4L2_QUANTIZATION_FULL_RANGE. To be used for (Motion-)JPEG.
 	 */
-	V4L2_COLORSPACE_JPEG = 7,
+	V4L2_COLORSPACE_JPEG          = 7,
 
 	/* For RGB colorspaces such as produces by most webcams. */
 	V4L2_COLORSPACE_SRGB          = 8,
@@ -1308,28 +1310,25 @@ enum v4l2_quantization {
 	 V4L2_QUANTIZATION_FULL_RANGE : V4L2_QUANTIZATION_LIM_RANGE))
 
 enum v4l2_priority {
-	V4L2_PRIORITY_UNSET = 0,/* not initialized */
-	V4L2_PRIORITY_BACKGROUND = 1,
+	V4L2_PRIORITY_UNSET       = 0,  /* not initialized */
+	V4L2_PRIORITY_BACKGROUND  = 1,
 	V4L2_PRIORITY_INTERACTIVE = 2,
-	V4L2_PRIORITY_RECORD = 3,
-	V4L2_PRIORITY_DEFAULT = V4L2_PRIORITY_INTERACTIVE,
+	V4L2_PRIORITY_RECORD      = 3,
+	V4L2_PRIORITY_DEFAULT     = V4L2_PRIORITY_INTERACTIVE,
 };
 
 struct v4l2_rect {
-	__s32           left;
-	__s32           top;
-	__u32           width;
-	__u32           height;
+	__s32   left;
+	__s32   top;
+	__u32   width;
+	__u32   height;
 };
 
 struct v4l2_fract {
-	__u32           numerator;
-	__u32           denominator;
+	__u32   numerator;
+	__u32   denominator;
 };
 
-/*
- *      D R I V E R   C A P A B I L I T I E S
- */
 /**
   * struct v4l2_capability - Describes V4L2 device caps returned by VIDIOC_QUERYCAP
   *
@@ -1352,22 +1351,15 @@ struct v4l2_capability {
 };
 
 /* Values for 'capabilities' field */
-#define V4L2_CAP_VIDEO_CAPTURE          0x00000001	/* Is a video capture
-							 * device */
-#define V4L2_CAP_VIDEO_OUTPUT           0x00000002	/* Is a video output
-							 * device */
-#define V4L2_CAP_VIDEO_OVERLAY          0x00000004	/* Can do video overlay */
-#define V4L2_CAP_VBI_CAPTURE            0x00000010	/* Is a raw VBI capture
-							 * device */
-#define V4L2_CAP_VBI_OUTPUT             0x00000020	/* Is a raw VBI output
-							 * device */
-#define V4L2_CAP_SLICED_VBI_CAPTURE     0x00000040	/* Is a sliced VBI
-							 * capture device */
-#define V4L2_CAP_SLICED_VBI_OUTPUT      0x00000080	/* Is a sliced VBI
-							 * output device */
-#define V4L2_CAP_RDS_CAPTURE            0x00000100	/* RDS data capture */
-#define V4L2_CAP_VIDEO_OUTPUT_OVERLAY   0x00000200	/* Can do video output
-							 * overlay */
+#define V4L2_CAP_VIDEO_CAPTURE		0x00000001  /* Is a video capture device */
+#define V4L2_CAP_VIDEO_OUTPUT		0x00000002  /* Is a video output device */
+#define V4L2_CAP_VIDEO_OVERLAY		0x00000004  /* Can do video overlay */
+#define V4L2_CAP_VBI_CAPTURE		0x00000010  /* Is a raw VBI capture device */
+#define V4L2_CAP_VBI_OUTPUT		0x00000020  /* Is a raw VBI output device */
+#define V4L2_CAP_SLICED_VBI_CAPTURE	0x00000040  /* Is a sliced VBI capture device */
+#define V4L2_CAP_SLICED_VBI_OUTPUT	0x00000080  /* Is a sliced VBI output device */
+#define V4L2_CAP_RDS_CAPTURE		0x00000100  /* RDS data capture */
+#define V4L2_CAP_VIDEO_OUTPUT_OVERLAY	0x00000200  /* Can do video output overlay */
 #define V4L2_CAP_HW_FREQ_SEEK		0x00000400  /* Can do hardware frequency seek  */
 #define V4L2_CAP_RDS_OUTPUT		0x00000800  /* Is an RDS encoder */
 
@@ -1379,66 +1371,67 @@ struct v4l2_capability {
 #define V4L2_CAP_VIDEO_M2M_MPLANE	0x00004000
 /* Is a video mem-to-mem device */
 #define V4L2_CAP_VIDEO_M2M		0x00008000
-#define V4L2_CAP_TUNER                  0x00010000	/* has a tuner */
-#define V4L2_CAP_AUDIO                  0x00020000	/* has audio support */
-#define V4L2_CAP_RADIO                  0x00040000	/* is a radio device */
+
+#define V4L2_CAP_TUNER			0x00010000  /* has a tuner */
+#define V4L2_CAP_AUDIO			0x00020000  /* has audio support */
+#define V4L2_CAP_RADIO			0x00040000  /* is a radio device */
 #define V4L2_CAP_MODULATOR		0x00080000  /* has a modulator */
 
 #define V4L2_CAP_SDR_CAPTURE		0x00100000  /* Is a SDR capture device */
 #define V4L2_CAP_EXT_PIX_FORMAT		0x00200000  /* Supports the extended pixel format */
 #define V4L2_CAP_SDR_OUTPUT		0x00400000  /* Is a SDR output device */
 
-#define V4L2_CAP_READWRITE              0x01000000	/* read/write
-							 * systemcalls */
-#define V4L2_CAP_ASYNCIO                0x02000000	/* async I/O */
-#define V4L2_CAP_STREAMING              0x04000000	/* streaming I/O ioctls */
+#define V4L2_CAP_READWRITE              0x01000000  /* read/write systemcalls */
+#define V4L2_CAP_ASYNCIO                0x02000000  /* async I/O */
+#define V4L2_CAP_STREAMING              0x04000000  /* streaming I/O ioctls */
 
 #define V4L2_CAP_DEVICE_CAPS            0x80000000  /* sets device capabilities field */
+
 /*
- *      V I D E O   I M A G E   F O R M A T
+ *	V I D E O   I M A G E   F O R M A T
  */
 struct v4l2_pix_format {
-	__u32           width;
-	__u32           height;
-	__u32           pixelformat;
-	enum v4l2_field field;
-	__u32           bytesperline;	/* for padding, zero if unused */
-	__u32           sizeimage;
-	enum v4l2_colorspace colorspace;
-	__u32           priv;	/* private data, depends on pixelformat */
+	__u32         		width;
+	__u32			height;
+	__u32			pixelformat;
+	__u32			field;		/* enum v4l2_field */
+	__u32            	bytesperline;	/* for padding, zero if unused */
+	__u32          		sizeimage;
+	__u32			colorspace;	/* enum v4l2_colorspace */
+	__u32			priv;		/* private data, depends on pixelformat */
 	__u32			flags;		/* format flags (V4L2_PIX_FMT_FLAG_*) */
 	__u32			ycbcr_enc;	/* enum v4l2_ycbcr_encoding */
 	__u32			quantization;	/* enum v4l2_quantization */
 	__u32			xfer_func;	/* enum v4l2_xfer_func */
 };
 
-/* Pixel format         FOURCC                        depth  Description  */
+/*      Pixel format         FOURCC                          depth  Description  */
 
 /* RGB formats */
-#define V4L2_PIX_FMT_RGB332  v4l2_fourcc('R','G','B','1')	/* 8  RGB-3-3-2     */
-#define V4L2_PIX_FMT_RGB444  v4l2_fourcc('R','4','4','4')	/* 16  xxxxrrrr ggggbbbb */
+#define V4L2_PIX_FMT_RGB332  v4l2_fourcc('R', 'G', 'B', '1') /*  8  RGB-3-3-2     */
+#define V4L2_PIX_FMT_RGB444  v4l2_fourcc('R', '4', '4', '4') /* 16  xxxxrrrr ggggbbbb */
 #define V4L2_PIX_FMT_ARGB444 v4l2_fourcc('A', 'R', '1', '2') /* 16  aaaarrrr ggggbbbb */
 #define V4L2_PIX_FMT_XRGB444 v4l2_fourcc('X', 'R', '1', '2') /* 16  xxxxrrrr ggggbbbb */
-#define V4L2_PIX_FMT_RGB555  v4l2_fourcc('R','G','B','O')	/* 16  RGB-5-5-5     */
+#define V4L2_PIX_FMT_RGB555  v4l2_fourcc('R', 'G', 'B', 'O') /* 16  RGB-5-5-5     */
 #define V4L2_PIX_FMT_ARGB555 v4l2_fourcc('A', 'R', '1', '5') /* 16  ARGB-1-5-5-5  */
 #define V4L2_PIX_FMT_XRGB555 v4l2_fourcc('X', 'R', '1', '5') /* 16  XRGB-1-5-5-5  */
-#define V4L2_PIX_FMT_RGB565  v4l2_fourcc('R','G','B','P')	/* 16  RGB-5-6-5     */
-#define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R','G','B','Q')	/* 16  RGB-5-5-5 BE  */
+#define V4L2_PIX_FMT_RGB565  v4l2_fourcc('R', 'G', 'B', 'P') /* 16  RGB-5-6-5     */
+#define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R', 'G', 'B', 'Q') /* 16  RGB-5-5-5 BE  */
 #define V4L2_PIX_FMT_ARGB555X v4l2_fourcc_be('A', 'R', '1', '5') /* 16  ARGB-5-5-5 BE */
 #define V4L2_PIX_FMT_XRGB555X v4l2_fourcc_be('X', 'R', '1', '5') /* 16  XRGB-5-5-5 BE */
-#define V4L2_PIX_FMT_RGB565X v4l2_fourcc('R','G','B','R')	/* 16  RGB-5-6-5 BE  */
+#define V4L2_PIX_FMT_RGB565X v4l2_fourcc('R', 'G', 'B', 'R') /* 16  RGB-5-6-5 BE  */
 #define V4L2_PIX_FMT_BGR666  v4l2_fourcc('B', 'G', 'R', 'H') /* 18  BGR-6-6-6	  */
-#define V4L2_PIX_FMT_BGR24   v4l2_fourcc('B','G','R','3')	/* 24  BGR-8-8-8     */
-#define V4L2_PIX_FMT_RGB24   v4l2_fourcc('R','G','B','3')	/* 24  RGB-8-8-8     */
-#define V4L2_PIX_FMT_BGR32   v4l2_fourcc('B','G','R','4')	/* 32  BGR-8-8-8-8   */
+#define V4L2_PIX_FMT_BGR24   v4l2_fourcc('B', 'G', 'R', '3') /* 24  BGR-8-8-8     */
+#define V4L2_PIX_FMT_RGB24   v4l2_fourcc('R', 'G', 'B', '3') /* 24  RGB-8-8-8     */
+#define V4L2_PIX_FMT_BGR32   v4l2_fourcc('B', 'G', 'R', '4') /* 32  BGR-8-8-8-8   */
 #define V4L2_PIX_FMT_ABGR32  v4l2_fourcc('A', 'R', '2', '4') /* 32  BGRA-8-8-8-8  */
 #define V4L2_PIX_FMT_XBGR32  v4l2_fourcc('X', 'R', '2', '4') /* 32  BGRX-8-8-8-8  */
-#define V4L2_PIX_FMT_RGB32   v4l2_fourcc('R','G','B','4')	/* 32  RGB-8-8-8-8   */
+#define V4L2_PIX_FMT_RGB32   v4l2_fourcc('R', 'G', 'B', '4') /* 32  RGB-8-8-8-8   */
 #define V4L2_PIX_FMT_ARGB32  v4l2_fourcc('B', 'A', '2', '4') /* 32  ARGB-8-8-8-8  */
 #define V4L2_PIX_FMT_XRGB32  v4l2_fourcc('B', 'X', '2', '4') /* 32  XRGB-8-8-8-8  */
 
 /* Grey formats */
-#define V4L2_PIX_FMT_GREY    v4l2_fourcc('G','R','E','Y')	/* 8  Greyscale     */
+#define V4L2_PIX_FMT_GREY    v4l2_fourcc('G', 'R', 'E', 'Y') /*  8  Greyscale     */
 #define V4L2_PIX_FMT_Y4      v4l2_fourcc('Y', '0', '4', ' ') /*  4  Greyscale     */
 #define V4L2_PIX_FMT_Y6      v4l2_fourcc('Y', '0', '6', ' ') /*  6  Greyscale     */
 #define V4L2_PIX_FMT_Y10     v4l2_fourcc('Y', '1', '0', ' ') /* 10  Greyscale     */
@@ -1450,26 +1443,26 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_Y10BPACK    v4l2_fourcc('Y', '1', '0', 'B') /* 10  Greyscale bit-packed */
 
 /* Palette formats */
-#define V4L2_PIX_FMT_PAL8    v4l2_fourcc('P','A','L','8')	/* 8  8-bit palette */
+#define V4L2_PIX_FMT_PAL8    v4l2_fourcc('P', 'A', 'L', '8') /*  8  8-bit palette */
 
 /* Chrominance formats */
 #define V4L2_PIX_FMT_UV8     v4l2_fourcc('U', 'V', '8', ' ') /*  8  UV 4:4 */
 
 /* Luminance+Chrominance formats */
-#define V4L2_PIX_FMT_YVU410  v4l2_fourcc('Y','V','U','9')	/* 9  YVU 4:1:0     */
-#define V4L2_PIX_FMT_YVU420  v4l2_fourcc('Y','V','1','2')	/* 12  YVU 4:2:0     */
-#define V4L2_PIX_FMT_YUYV    v4l2_fourcc('Y','U','Y','V')	/* 16  YUV 4:2:2     */
+#define V4L2_PIX_FMT_YVU410  v4l2_fourcc('Y', 'V', 'U', '9') /*  9  YVU 4:1:0     */
+#define V4L2_PIX_FMT_YVU420  v4l2_fourcc('Y', 'V', '1', '2') /* 12  YVU 4:2:0     */
+#define V4L2_PIX_FMT_YUYV    v4l2_fourcc('Y', 'U', 'Y', 'V') /* 16  YUV 4:2:2     */
 #define V4L2_PIX_FMT_YYUV    v4l2_fourcc('Y', 'Y', 'U', 'V') /* 16  YUV 4:2:2     */
 #define V4L2_PIX_FMT_YVYU    v4l2_fourcc('Y', 'V', 'Y', 'U') /* 16 YVU 4:2:2 */
-#define V4L2_PIX_FMT_UYVY    v4l2_fourcc('U','Y','V','Y')	/* 16  YUV 4:2:2     */
+#define V4L2_PIX_FMT_UYVY    v4l2_fourcc('U', 'Y', 'V', 'Y') /* 16  YUV 4:2:2     */
 #define V4L2_PIX_FMT_VYUY    v4l2_fourcc('V', 'Y', 'U', 'Y') /* 16  YUV 4:2:2     */
-#define V4L2_PIX_FMT_YUV422P v4l2_fourcc('4','2','2','P')	/* 16  YVU422 planar */
-#define V4L2_PIX_FMT_YUV411P v4l2_fourcc('4','1','1','P')	/* 16  YVU411 planar */
-#define V4L2_PIX_FMT_Y41P    v4l2_fourcc('Y','4','1','P')	/* 12  YUV 4:1:1     */
-#define V4L2_PIX_FMT_YUV444  v4l2_fourcc('Y','4','4','4')	/* 16  xxxxyyyy uuuuvvvv */
-#define V4L2_PIX_FMT_YUV555  v4l2_fourcc('Y','U','V','O')	/* 16  YUV-5-5-5     */
-#define V4L2_PIX_FMT_YUV565  v4l2_fourcc('Y','U','V','P')	/* 16  YUV-5-6-5     */
-#define V4L2_PIX_FMT_YUV32   v4l2_fourcc('Y','U','V','4')	/* 32  YUV-8-8-8-8   */
+#define V4L2_PIX_FMT_YUV422P v4l2_fourcc('4', '2', '2', 'P') /* 16  YVU422 planar */
+#define V4L2_PIX_FMT_YUV411P v4l2_fourcc('4', '1', '1', 'P') /* 16  YVU411 planar */
+#define V4L2_PIX_FMT_Y41P    v4l2_fourcc('Y', '4', '1', 'P') /* 12  YUV 4:1:1     */
+#define V4L2_PIX_FMT_YUV444  v4l2_fourcc('Y', '4', '4', '4') /* 16  xxxxyyyy uuuuvvvv */
+#define V4L2_PIX_FMT_YUV555  v4l2_fourcc('Y', 'U', 'V', 'O') /* 16  YUV-5-5-5     */
+#define V4L2_PIX_FMT_YUV565  v4l2_fourcc('Y', 'U', 'V', 'P') /* 16  YUV-5-6-5     */
+#define V4L2_PIX_FMT_YUV32   v4l2_fourcc('Y', 'U', 'V', '4') /* 32  YUV-8-8-8-8   */
 #define V4L2_PIX_FMT_YUV410  v4l2_fourcc('Y', 'U', 'V', '9') /*  9  YUV 4:1:0     */
 #define V4L2_PIX_FMT_YUV420  v4l2_fourcc('Y', 'U', '1', '2') /* 12  YUV 4:2:0     */
 #define V4L2_PIX_FMT_HI240   v4l2_fourcc('H', 'I', '2', '4') /*  8  8-bit color   */
@@ -1477,8 +1470,8 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_M420    v4l2_fourcc('M', '4', '2', '0') /* 12  YUV 4:2:0 2 lines y, 1 line uv interleaved */
 
 /* two planes -- one Y, one Cr + Cb interleaved  */
-#define V4L2_PIX_FMT_NV12    v4l2_fourcc('N','V','1','2')	/* 12  Y/CbCr 4:2:0  */
-#define V4L2_PIX_FMT_NV21    v4l2_fourcc('N','V','2','1')	/* 12  Y/CrCb 4:2:0  */
+#define V4L2_PIX_FMT_NV12    v4l2_fourcc('N', 'V', '1', '2') /* 12  Y/CbCr 4:2:0  */
+#define V4L2_PIX_FMT_NV21    v4l2_fourcc('N', 'V', '2', '1') /* 12  Y/CrCb 4:2:0  */
 #define V4L2_PIX_FMT_NV16    v4l2_fourcc('N', 'V', '1', '6') /* 16  Y/CbCr 4:2:2  */
 #define V4L2_PIX_FMT_NV61    v4l2_fourcc('N', 'V', '6', '1') /* 16  Y/CrCb 4:2:2  */
 #define V4L2_PIX_FMT_NV24    v4l2_fourcc('N', 'V', '2', '4') /* 24  Y/CbCr 4:4:4  */
@@ -1497,7 +1490,7 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_YVU420M v4l2_fourcc('Y', 'M', '2', '1') /* 12  YVU420 planar */
 
 /* Bayer formats - see http://www.siliconimaging.com/RGB%20Bayer.htm */
-#define V4L2_PIX_FMT_SBGGR8  v4l2_fourcc('B','A','8','1')	/* 8  BGBG.. GRGR.. */
+#define V4L2_PIX_FMT_SBGGR8  v4l2_fourcc('B', 'A', '8', '1') /*  8  BGBG.. GRGR.. */
 #define V4L2_PIX_FMT_SGBRG8  v4l2_fourcc('G', 'B', 'R', 'G') /*  8  GBGB.. RGRG.. */
 #define V4L2_PIX_FMT_SGRBG8  v4l2_fourcc('G', 'R', 'B', 'G') /*  8  GRGR.. BGBG.. */
 #define V4L2_PIX_FMT_SRGGB8  v4l2_fourcc('R', 'G', 'G', 'B') /*  8  RGRG.. GBGB.. */
@@ -1527,10 +1520,10 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_SBGGR16 v4l2_fourcc('B', 'Y', 'R', '2') /* 16  BGBG.. GRGR.. */
 
 /* compressed formats */
-#define V4L2_PIX_FMT_MJPEG    v4l2_fourcc('M','J','P','G')	/* Motion-JPEG   */
-#define V4L2_PIX_FMT_JPEG     v4l2_fourcc('J','P','E','G')	/* JFIF JPEG     */
-#define V4L2_PIX_FMT_DV       v4l2_fourcc('d','v','s','d')	/* 1394          */
-#define V4L2_PIX_FMT_MPEG     v4l2_fourcc('M','P','E','G')	/* MPEG-1/2/4    */
+#define V4L2_PIX_FMT_MJPEG    v4l2_fourcc('M', 'J', 'P', 'G') /* Motion-JPEG   */
+#define V4L2_PIX_FMT_JPEG     v4l2_fourcc('J', 'P', 'E', 'G') /* JFIF JPEG     */
+#define V4L2_PIX_FMT_DV       v4l2_fourcc('d', 'v', 's', 'd') /* 1394          */
+#define V4L2_PIX_FMT_MPEG     v4l2_fourcc('M', 'P', 'E', 'G') /* MPEG-1/2/4 Multiplexed */
 #define V4L2_PIX_FMT_H264     v4l2_fourcc('H', '2', '6', '4') /* H264 with start codes */
 #define V4L2_PIX_FMT_H264_NO_SC v4l2_fourcc('A', 'V', 'C', '1') /* H264 without start codes */
 #define V4L2_PIX_FMT_H264_MVC v4l2_fourcc('M', '2', '6', '4') /* H264 MVC */
@@ -1543,14 +1536,14 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_VC1_ANNEX_L v4l2_fourcc('V', 'C', '1', 'L') /* SMPTE 421M Annex L compliant stream */
 #define V4L2_PIX_FMT_VP8      v4l2_fourcc('V', 'P', '8', '0') /* VP8 */
 
-/* Vendor-specific formats   */
+/*  Vendor-specific formats   */
 #define V4L2_PIX_FMT_CPIA1    v4l2_fourcc('C', 'P', 'I', 'A') /* cpia1 YUV */
-#define V4L2_PIX_FMT_WNVA     v4l2_fourcc('W','N','V','A')	/* Winnov hw compress */
-#define V4L2_PIX_FMT_SN9C10X  v4l2_fourcc('S','9','1','0')	/* SN9C10x compression */
+#define V4L2_PIX_FMT_WNVA     v4l2_fourcc('W', 'N', 'V', 'A') /* Winnov hw compress */
+#define V4L2_PIX_FMT_SN9C10X  v4l2_fourcc('S', '9', '1', '0') /* SN9C10x compression */
 #define V4L2_PIX_FMT_SN9C20X_I420 v4l2_fourcc('S', '9', '2', '0') /* SN9C20x YUV 4:2:0 */
-#define V4L2_PIX_FMT_PWC1     v4l2_fourcc('P','W','C','1')	/* pwc older webcam */
-#define V4L2_PIX_FMT_PWC2     v4l2_fourcc('P','W','C','2')	/* pwc newer webcam */
-#define V4L2_PIX_FMT_ET61X251 v4l2_fourcc('E','6','2','5')	/* ET61X251 compression */
+#define V4L2_PIX_FMT_PWC1     v4l2_fourcc('P', 'W', 'C', '1') /* pwc older webcam */
+#define V4L2_PIX_FMT_PWC2     v4l2_fourcc('P', 'W', 'C', '2') /* pwc newer webcam */
+#define V4L2_PIX_FMT_ET61X251 v4l2_fourcc('E', '6', '2', '5') /* ET61X251 compression */
 #define V4L2_PIX_FMT_SPCA501  v4l2_fourcc('S', '5', '0', '1') /* YUYV per line */
 #define V4L2_PIX_FMT_SPCA505  v4l2_fourcc('S', '5', '0', '5') /* YYUV per line */
 #define V4L2_PIX_FMT_SPCA508  v4l2_fourcc('S', '5', '0', '8') /* YUVY per line */
@@ -1585,15 +1578,15 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_FLAG_PREMUL_ALPHA	0x00000001
 
 /*
- *      F O R M A T   E N U M E R A T I O N
+ *	F O R M A T   E N U M E R A T I O N
  */
 struct v4l2_fmtdesc {
-	__u32           index;	/* Format number      */
+	__u32		    index;             /* Format number      */
 	__u32		    type;              /* enum v4l2_buf_type */
-	__u32           flags;
-	__u8            description[32];	/* Description string */
-	__u32           pixelformat;	/* Format fourcc      */
-	__u32           reserved[4];
+	__u32               flags;
+	__u8		    description[32];   /* Description string */
+	__u32		    pixelformat;       /* Format fourcc      */
+	__u32		    reserved[4];
 };
 
 #define V4L2_FMT_FLAG_COMPRESSED 0x0001
@@ -1602,98 +1595,98 @@ struct v4l2_fmtdesc {
 #if 1
 	/* Experimental Frame Size and frame rate enumeration */
 /*
- *      F R A M E   S I Z E   E N U M E R A T I O N
+ *	F R A M E   S I Z E   E N U M E R A T I O N
  */
 enum v4l2_frmsizetypes {
-	V4L2_FRMSIZE_TYPE_DISCRETE = 1,
-	V4L2_FRMSIZE_TYPE_CONTINUOUS = 2,
-	V4L2_FRMSIZE_TYPE_STEPWISE = 3,
+	V4L2_FRMSIZE_TYPE_DISCRETE	= 1,
+	V4L2_FRMSIZE_TYPE_CONTINUOUS	= 2,
+	V4L2_FRMSIZE_TYPE_STEPWISE	= 3,
 };
 
 struct v4l2_frmsize_discrete {
-	__u32           width;	/* Frame width [pixel] */
-	__u32           height;	/* Frame height [pixel] */
+	__u32			width;		/* Frame width [pixel] */
+	__u32			height;		/* Frame height [pixel] */
 };
 
 struct v4l2_frmsize_stepwise {
-	__u32           min_width;	/* Minimum frame width [pixel] */
-	__u32           max_width;	/* Maximum frame width [pixel] */
-	__u32           step_width;	/* Frame width step size [pixel] */
-	__u32           min_height;	/* Minimum frame height [pixel] */
-	__u32           max_height;	/* Maximum frame height [pixel] */
-	__u32           step_height;	/* Frame height step size [pixel] */
+	__u32			min_width;	/* Minimum frame width [pixel] */
+	__u32			max_width;	/* Maximum frame width [pixel] */
+	__u32			step_width;	/* Frame width step size [pixel] */
+	__u32			min_height;	/* Minimum frame height [pixel] */
+	__u32			max_height;	/* Maximum frame height [pixel] */
+	__u32			step_height;	/* Frame height step size [pixel] */
 };
 
 struct v4l2_frmsizeenum {
-	__u32           index;	/* Frame size number */
-	__u32           pixel_format;	/* Pixel format */
-	__u32           type;	/* Frame size type the device supports. */
+	__u32			index;		/* Frame size number */
+	__u32			pixel_format;	/* Pixel format */
+	__u32			type;		/* Frame size type the device supports. */
 
-	union {			/* Frame size */
-		struct v4l2_frmsize_discrete discrete;
-		struct v4l2_frmsize_stepwise stepwise;
+	union {					/* Frame size */
+		struct v4l2_frmsize_discrete	discrete;
+		struct v4l2_frmsize_stepwise	stepwise;
 	};
 
-	__u32           reserved[2];	/* Reserved space for future use */
+	__u32   reserved[2];			/* Reserved space for future use */
 };
 
 /*
- *      F R A M E   R A T E   E N U M E R A T I O N
+ *	F R A M E   R A T E   E N U M E R A T I O N
  */
 enum v4l2_frmivaltypes {
-	V4L2_FRMIVAL_TYPE_DISCRETE = 1,
-	V4L2_FRMIVAL_TYPE_CONTINUOUS = 2,
-	V4L2_FRMIVAL_TYPE_STEPWISE = 3,
+	V4L2_FRMIVAL_TYPE_DISCRETE	= 1,
+	V4L2_FRMIVAL_TYPE_CONTINUOUS	= 2,
+	V4L2_FRMIVAL_TYPE_STEPWISE	= 3,
 };
 
 struct v4l2_frmival_stepwise {
-	struct v4l2_fract min;	/* Minimum frame interval [s] */
-	struct v4l2_fract max;	/* Maximum frame interval [s] */
-	struct v4l2_fract step;	/* Frame interval step size [s] */
+	struct v4l2_fract	min;		/* Minimum frame interval [s] */
+	struct v4l2_fract	max;		/* Maximum frame interval [s] */
+	struct v4l2_fract	step;		/* Frame interval step size [s] */
 };
 
 struct v4l2_frmivalenum {
-	__u32           index;	/* Frame format index */
-	__u32           pixel_format;	/* Pixel format */
-	__u32           width;	/* Frame width */
-	__u32           height;	/* Frame height */
-	__u32           type;	/* Frame interval type the device supports. */
-
-	union {			/* Frame interval */
-		struct v4l2_fract discrete;
-		struct v4l2_frmival_stepwise stepwise;
+	__u32			index;		/* Frame format index */
+	__u32			pixel_format;	/* Pixel format */
+	__u32			width;		/* Frame width */
+	__u32			height;		/* Frame height */
+	__u32			type;		/* Frame interval type the device supports. */
+
+	union {					/* Frame interval */
+		struct v4l2_fract		discrete;
+		struct v4l2_frmival_stepwise	stepwise;
 	};
 
-	__u32           reserved[2];	/* Reserved space for future use */
+	__u32	reserved[2];			/* Reserved space for future use */
 };
 #endif
 
 /*
- *      T I M E C O D E
+ *	T I M E C O D E
  */
 struct v4l2_timecode {
-	__u32           type;
-	__u32           flags;
-	__u8            frames;
-	__u8            seconds;
-	__u8            minutes;
-	__u8            hours;
-	__u8            userbits[4];
-};
-
-/* Type  */
-#define V4L2_TC_TYPE_24FPS              1
-#define V4L2_TC_TYPE_25FPS              2
-#define V4L2_TC_TYPE_30FPS              3
-#define V4L2_TC_TYPE_50FPS              4
-#define V4L2_TC_TYPE_60FPS              5
-
-/* Flags  */
-#define V4L2_TC_FLAG_DROPFRAME          0x0001	/* "drop-frame" mode */
-#define V4L2_TC_FLAG_COLORFRAME         0x0002
-#define V4L2_TC_USERBITS_field          0x000C
-#define V4L2_TC_USERBITS_USERDEFINED    0x0000
-#define V4L2_TC_USERBITS_8BITCHARS      0x0008
+	__u32	type;
+	__u32	flags;
+	__u8	frames;
+	__u8	seconds;
+	__u8	minutes;
+	__u8	hours;
+	__u8	userbits[4];
+};
+
+/*  Type  */
+#define V4L2_TC_TYPE_24FPS		1
+#define V4L2_TC_TYPE_25FPS		2
+#define V4L2_TC_TYPE_30FPS		3
+#define V4L2_TC_TYPE_50FPS		4
+#define V4L2_TC_TYPE_60FPS		5
+
+/*  Flags  */
+#define V4L2_TC_FLAG_DROPFRAME		0x0001 /* "drop-frame" mode */
+#define V4L2_TC_FLAG_COLORFRAME		0x0002
+#define V4L2_TC_USERBITS_field		0x000C
+#define V4L2_TC_USERBITS_USERDEFINED	0x0000
+#define V4L2_TC_USERBITS_8BITCHARS	0x0008
 /* The above is based on SMPTE timecodes */
 
 struct v4l2_jpegcompression {
@@ -1726,13 +1719,13 @@ struct v4l2_jpegcompression {
 };
 
 /*
- *      M E M O R Y - M A P P I N G   B U F F E R S
+ *	M E M O R Y - M A P P I N G   B U F F E R S
  */
 struct v4l2_requestbuffers {
-	__u32           count;
+	__u32			count;
 	__u32			type;		/* enum v4l2_buf_type */
 	__u32			memory;		/* enum v4l2_memory */
-	__u32           reserved[2];
+	__u32			reserved[2];
 };
 
 /**
@@ -1798,14 +1791,14 @@ struct v4l2_plane {
  * I/O methods.
  */
 struct v4l2_buffer {
-	__u32           index;
+	__u32			index;
 	__u32			type;
-	__u32           bytesused;
-	__u32           flags;
+	__u32			bytesused;
+	__u32			flags;
 	__u32			field;
-	struct timeval  timestamp;
-	struct v4l2_timecode timecode;
-	__u32           sequence;
+	struct timeval		timestamp;
+	struct v4l2_timecode	timecode;
+	__u32			sequence;
 
 	/* memory location */
 	__u32			memory;
@@ -1815,9 +1808,9 @@ struct v4l2_buffer {
 		struct v4l2_plane *planes;
 		__s32		fd;
 	} m;
-	__u32           length;
+	__u32			length;
 	__u32			reserved2;
-	__u32           reserved;
+	__u32			reserved;
 };
 
 /*  Flags for 'flags' field */
@@ -1882,16 +1875,14 @@ struct v4l2_exportbuffer {
 };
 
 /*
- *      O V E R L A Y   P R E V I E W
+ *	O V E R L A Y   P R E V I E W
  */
 struct v4l2_framebuffer {
-	__u32           capability;
-	__u32           flags;
-	/*
-	 * FIXME: in theory we should pass something like PCI device + memory
-	 * region + offset instead of some physical address
-	 */
-	void           *base;
+	__u32			capability;
+	__u32			flags;
+/* FIXME: in theory we should pass something like PCI device + memory
+ * region + offset instead of some physical address */
+	void                    *base;
 	struct {
 		__u32		width;
 		__u32		height;
@@ -1903,77 +1894,77 @@ struct v4l2_framebuffer {
 		__u32		priv;		/* reserved field, set to 0 */
 	} fmt;
 };
-/* Flags for the 'capability' field. Read only */
-#define V4L2_FBUF_CAP_EXTERNOVERLAY     0x0001
-#define V4L2_FBUF_CAP_CHROMAKEY         0x0002
+/*  Flags for the 'capability' field. Read only */
+#define V4L2_FBUF_CAP_EXTERNOVERLAY	0x0001
+#define V4L2_FBUF_CAP_CHROMAKEY		0x0002
 #define V4L2_FBUF_CAP_LIST_CLIPPING     0x0004
-#define V4L2_FBUF_CAP_BITMAP_CLIPPING   0x0008
-#define V4L2_FBUF_CAP_LOCAL_ALPHA       0x0010
-#define V4L2_FBUF_CAP_GLOBAL_ALPHA      0x0020
-#define V4L2_FBUF_CAP_LOCAL_INV_ALPHA   0x0040
+#define V4L2_FBUF_CAP_BITMAP_CLIPPING	0x0008
+#define V4L2_FBUF_CAP_LOCAL_ALPHA	0x0010
+#define V4L2_FBUF_CAP_GLOBAL_ALPHA	0x0020
+#define V4L2_FBUF_CAP_LOCAL_INV_ALPHA	0x0040
 #define V4L2_FBUF_CAP_SRC_CHROMAKEY	0x0080
-/* Flags for the 'flags' field. */
-#define V4L2_FBUF_FLAG_PRIMARY          0x0001
-#define V4L2_FBUF_FLAG_OVERLAY          0x0002
-#define V4L2_FBUF_FLAG_CHROMAKEY        0x0004
-#define V4L2_FBUF_FLAG_LOCAL_ALPHA      0x0008
-#define V4L2_FBUF_FLAG_GLOBAL_ALPHA     0x0010
-#define V4L2_FBUF_FLAG_LOCAL_INV_ALPHA  0x0020
+/*  Flags for the 'flags' field. */
+#define V4L2_FBUF_FLAG_PRIMARY		0x0001
+#define V4L2_FBUF_FLAG_OVERLAY		0x0002
+#define V4L2_FBUF_FLAG_CHROMAKEY	0x0004
+#define V4L2_FBUF_FLAG_LOCAL_ALPHA	0x0008
+#define V4L2_FBUF_FLAG_GLOBAL_ALPHA	0x0010
+#define V4L2_FBUF_FLAG_LOCAL_INV_ALPHA	0x0020
 #define V4L2_FBUF_FLAG_SRC_CHROMAKEY	0x0040
 
 struct v4l2_clip {
-	struct v4l2_rect c;
-	struct v4l2_clip __user *next;
+	struct v4l2_rect        c;
+	struct v4l2_clip	__user *next;
 };
 
 struct v4l2_window {
-	struct v4l2_rect w;
+	struct v4l2_rect        w;
 	__u32			field;	 /* enum v4l2_field */
-	__u32           chromakey;
-	struct v4l2_clip __user *clips;
-	__u32           clipcount;
-	void __user    *bitmap;
-	__u8            global_alpha;
+	__u32			chromakey;
+	struct v4l2_clip	__user *clips;
+	__u32			clipcount;
+	void			__user *bitmap;
+	__u8                    global_alpha;
 };
 
 /*
- *      C A P T U R E   P A R A M E T E R S
+ *	C A P T U R E   P A R A M E T E R S
  */
 struct v4l2_captureparm {
-	__u32           capability;	/* Supported modes */
-	__u32           capturemode;	/* Current mode */
+	__u32		   capability;	  /*  Supported modes */
+	__u32		   capturemode;	  /*  Current mode */
 	struct v4l2_fract  timeperframe;  /*  Time per frame in seconds */
-	__u32           extendedmode;	/* Driver-specific extensions */
-	__u32           readbuffers;	/* # of buffers for read */
-	__u32           reserved[4];
+	__u32		   extendedmode;  /*  Driver-specific extensions */
+	__u32              readbuffers;   /*  # of buffers for read */
+	__u32		   reserved[4];
 };
 
-/* Flags for 'capability' and 'capturemode' fields */
-#define V4L2_MODE_HIGHQUALITY   0x0001	/* High quality imaging mode */
-#define V4L2_CAP_TIMEPERFRAME   0x1000	/* timeperframe field is supported */
+/*  Flags for 'capability' and 'capturemode' fields */
+#define V4L2_MODE_HIGHQUALITY	0x0001	/*  High quality imaging mode */
+#define V4L2_CAP_TIMEPERFRAME	0x1000	/*  timeperframe field is supported */
 
 struct v4l2_outputparm {
-	__u32           capability;	/* Supported modes */
-	__u32           outputmode;	/* Current mode */
-	struct v4l2_fract timeperframe;	/* Time per frame in seconds */
-	__u32           extendedmode;	/* Driver-specific extensions */
-	__u32           writebuffers;	/* # of buffers for write */
-	__u32           reserved[4];
+	__u32		   capability;	 /*  Supported modes */
+	__u32		   outputmode;	 /*  Current mode */
+	struct v4l2_fract  timeperframe; /*  Time per frame in seconds */
+	__u32		   extendedmode; /*  Driver-specific extensions */
+	__u32              writebuffers; /*  # of buffers for write */
+	__u32		   reserved[4];
 };
 
 /*
- *      I N P U T   I M A G E   C R O P P I N G
+ *	I N P U T   I M A G E   C R O P P I N G
  */
 struct v4l2_cropcap {
 	__u32			type;	/* enum v4l2_buf_type */
-	struct v4l2_rect bounds;
-	struct v4l2_rect defrect;
-	struct v4l2_fract pixelaspect;
+	struct v4l2_rect        bounds;
+	struct v4l2_rect        defrect;
+	struct v4l2_fract       pixelaspect;
 };
 
 struct v4l2_crop {
 	__u32			type;	/* enum v4l2_buf_type */
-	struct v4l2_rect c;
+	struct v4l2_rect        c;
 };
 
 /**
@@ -2002,7 +1993,7 @@ struct v4l2_selection {
  *      A N A L O G   V I D E O   S T A N D A R D
  */
 
-typedef __u64   v4l2_std_id;
+typedef __u64 v4l2_std_id;
 
 /* one bit for each */
 #define V4L2_STD_PAL_B          ((v4l2_std_id)0x00000001)
@@ -2037,12 +2028,13 @@ typedef __u64   v4l2_std_id;
 #define V4L2_STD_ATSC_8_VSB     ((v4l2_std_id)0x01000000)
 #define V4L2_STD_ATSC_16_VSB    ((v4l2_std_id)0x02000000)
 
-/*
- * FIXME: Although std_id is 64 bits, there is an issue on PPC32 architecture
- * that makes switch(__u64) to break. So, there's a hack on v4l2-common.c
- * rounding this value to 32 bits. As, currently, the max value is for
- * V4L2_STD_ATSC_16_VSB (30 bits wide), it should work fine. However, if
- * needed to add more than two standards, v4l2-common.c should be fixed.
+/* FIXME:
+   Although std_id is 64 bits, there is an issue on PPC32 architecture that
+   makes switch(__u64) to break. So, there's a hack on v4l2-common.c rounding
+   this value to 32 bits.
+   As, currently, the max value is for V4L2_STD_ATSC_16_VSB (30 bits wide),
+   it should work fine. However, if needed to add more than two standards,
+   v4l2-common.c should be fixed.
  */
 
 /*
@@ -2330,26 +2322,26 @@ struct v4l2_dv_timings_cap {
 
 
 /*
- *      V I D E O   I N P U T S
+ *	V I D E O   I N P U T S
  */
 struct v4l2_input {
-	__u32           index;	/* Which input */
-	__u8            name[32];	/* Label */
-	__u32           type;	/* Type of input */
-	__u32           audioset;	/* Associated audios (bitfield) */
+	__u32	     index;		/*  Which input */
+	__u8	     name[32];		/*  Label */
+	__u32	     type;		/*  Type of input */
+	__u32	     audioset;		/*  Associated audios (bitfield) */
 	__u32        tuner;             /*  enum v4l2_tuner_type */
-	v4l2_std_id     std;
-	__u32           status;
+	v4l2_std_id  std;
+	__u32	     status;
 	__u32	     capabilities;
-	__u32           reserved[3];
+	__u32	     reserved[3];
 };
 
-/* Values for the 'type' field */
-#define V4L2_INPUT_TYPE_TUNER           1
-#define V4L2_INPUT_TYPE_CAMERA          2
+/*  Values for the 'type' field */
+#define V4L2_INPUT_TYPE_TUNER		1
+#define V4L2_INPUT_TYPE_CAMERA		2
 
 /* field 'status' - general */
-#define V4L2_IN_ST_NO_POWER    0x00000001	/* Attached device is off */
+#define V4L2_IN_ST_NO_POWER    0x00000001  /* Attached device is off */
 #define V4L2_IN_ST_NO_SIGNAL   0x00000002
 #define V4L2_IN_ST_NO_COLOR    0x00000004
 
@@ -2359,18 +2351,18 @@ struct v4l2_input {
 #define V4L2_IN_ST_VFLIP       0x00000020 /* Frames are flipped vertically */
 
 /* field 'status' - analog */
-#define V4L2_IN_ST_NO_H_LOCK   0x00000100	/* No horizontal sync lock */
-#define V4L2_IN_ST_COLOR_KILL  0x00000200	/* Color killer is active */
+#define V4L2_IN_ST_NO_H_LOCK   0x00000100  /* No horizontal sync lock */
+#define V4L2_IN_ST_COLOR_KILL  0x00000200  /* Color killer is active */
 
 /* field 'status' - digital */
-#define V4L2_IN_ST_NO_SYNC     0x00010000	/* No synchronization lock */
-#define V4L2_IN_ST_NO_EQU      0x00020000	/* No equalizer lock */
-#define V4L2_IN_ST_NO_CARRIER  0x00040000	/* Carrier recovery failed */
+#define V4L2_IN_ST_NO_SYNC     0x00010000  /* No synchronization lock */
+#define V4L2_IN_ST_NO_EQU      0x00020000  /* No equalizer lock */
+#define V4L2_IN_ST_NO_CARRIER  0x00040000  /* Carrier recovery failed */
 
 /* field 'status' - VCR and set-top box */
-#define V4L2_IN_ST_MACROVISION 0x01000000	/* Macrovision detected */
-#define V4L2_IN_ST_NO_ACCESS   0x02000000	/* Conditional access denied */
-#define V4L2_IN_ST_VTR         0x04000000	/* VTR time constant */
+#define V4L2_IN_ST_MACROVISION 0x01000000  /* Macrovision detected */
+#define V4L2_IN_ST_NO_ACCESS   0x02000000  /* Conditional access denied */
+#define V4L2_IN_ST_VTR         0x04000000  /* VTR time constant */
 
 /* capabilities flags */
 #define V4L2_IN_CAP_DV_TIMINGS		0x00000002 /* Supports S_DV_TIMINGS */
@@ -2379,22 +2371,22 @@ struct v4l2_input {
 #define V4L2_IN_CAP_NATIVE_SIZE		0x00000008 /* Supports setting native size */
 
 /*
- *      V I D E O   O U T P U T S
+ *	V I D E O   O U T P U T S
  */
 struct v4l2_output {
-	__u32           index;	/* Which output */
-	__u8            name[32];	/* Label */
-	__u32           type;	/* Type of output */
-	__u32           audioset;	/* Associated audios (bitfield) */
-	__u32           modulator;	/* Associated modulator */
-	v4l2_std_id     std;
+	__u32	     index;		/*  Which output */
+	__u8	     name[32];		/*  Label */
+	__u32	     type;		/*  Type of output */
+	__u32	     audioset;		/*  Associated audios (bitfield) */
+	__u32	     modulator;         /*  Associated modulator */
+	v4l2_std_id  std;
 	__u32	     capabilities;
-	__u32           reserved[3];
+	__u32	     reserved[3];
 };
-/* Values for the 'type' field */
-#define V4L2_OUTPUT_TYPE_MODULATOR              1
-#define V4L2_OUTPUT_TYPE_ANALOG                 2
-#define V4L2_OUTPUT_TYPE_ANALOGVGAOVERLAY       3
+/*  Values for the 'type' field */
+#define V4L2_OUTPUT_TYPE_MODULATOR		1
+#define V4L2_OUTPUT_TYPE_ANALOG			2
+#define V4L2_OUTPUT_TYPE_ANALOGVGAOVERLAY	3
 
 /* capabilities flags */
 #define V4L2_OUT_CAP_DV_TIMINGS		0x00000002 /* Supports S_DV_TIMINGS */
@@ -2403,20 +2395,20 @@ struct v4l2_output {
 #define V4L2_OUT_CAP_NATIVE_SIZE	0x00000008 /* Supports setting native size */
 
 /*
- *      C O N T R O L S
+ *	C O N T R O L S
  */
 struct v4l2_control {
-	__u32           id;
-	__s32           value;
+	__u32		     id;
+	__s32		     value;
 };
 
 struct v4l2_ext_control {
-	__u32           id;
+	__u32 id;
 	__u32 size;
-	__u32           reserved2[1];
+	__u32 reserved2[1];
 	union {
-		__s32           value;
-		__s64           value64;
+		__s32 value;
+		__s64 value64;
 		char __user *string;
 		__u8 __user *p_u8;
 		__u16 __user *p_u16;
@@ -2426,25 +2418,25 @@ struct v4l2_ext_control {
 } __attribute__ ((packed));
 
 struct v4l2_ext_controls {
-	__u32           ctrl_class;
-	__u32           count;
-	__u32           error_idx;
-	__u32           reserved[2];
+	__u32 ctrl_class;
+	__u32 count;
+	__u32 error_idx;
+	__u32 reserved[2];
 	struct v4l2_ext_control *controls;
 };
 
-#define V4L2_CTRL_ID_MASK         (0x0fffffff)
+#define V4L2_CTRL_ID_MASK      	  (0x0fffffff)
 #define V4L2_CTRL_ID2CLASS(id)    ((id) & 0x0fff0000UL)
 #define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000)
 #define V4L2_CTRL_MAX_DIMS	  (4)
 
 enum v4l2_ctrl_type {
-	V4L2_CTRL_TYPE_INTEGER = 1,
-	V4L2_CTRL_TYPE_BOOLEAN = 2,
-	V4L2_CTRL_TYPE_MENU = 3,
-	V4L2_CTRL_TYPE_BUTTON = 4,
-	V4L2_CTRL_TYPE_INTEGER64 = 5,
-	V4L2_CTRL_TYPE_CTRL_CLASS = 6,
+	V4L2_CTRL_TYPE_INTEGER	     = 1,
+	V4L2_CTRL_TYPE_BOOLEAN	     = 2,
+	V4L2_CTRL_TYPE_MENU	     = 3,
+	V4L2_CTRL_TYPE_BUTTON	     = 4,
+	V4L2_CTRL_TYPE_INTEGER64     = 5,
+	V4L2_CTRL_TYPE_CTRL_CLASS    = 6,
 	V4L2_CTRL_TYPE_STRING        = 7,
 	V4L2_CTRL_TYPE_BITMASK       = 8,
 	V4L2_CTRL_TYPE_INTEGER_MENU  = 9,
@@ -2458,15 +2450,15 @@ enum v4l2_ctrl_type {
 
 /*  Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
 struct v4l2_queryctrl {
-	__u32           id;
+	__u32		     id;
 	__u32		     type;	/* enum v4l2_ctrl_type */
-	__u8            name[32];	/* Whatever */
-	__s32           minimum;/* Note signedness */
-	__s32           maximum;
-	__s32           step;
-	__s32           default_value;
-	__u32           flags;
-	__u32           reserved[2];
+	__u8		     name[32];	/* Whatever */
+	__s32		     minimum;	/* Note signedness */
+	__s32		     maximum;
+	__s32		     step;
+	__s32		     default_value;
+	__u32                flags;
+	__u32		     reserved[2];
 };
 
 /*  Used in the VIDIOC_QUERY_EXT_CTRL ioctl for querying extended controls */
@@ -2486,54 +2478,54 @@ struct v4l2_query_ext_ctrl {
 	__u32		     reserved[32];
 };
 
-/* Used in the VIDIOC_QUERYMENU ioctl for querying menu items */
+/*  Used in the VIDIOC_QUERYMENU ioctl for querying menu items */
 struct v4l2_querymenu {
-	__u32           id;
-	__u32           index;
+	__u32		id;
+	__u32		index;
 	union {
 		__u8	name[32];	/* Whatever */
 		__s64	value;
 	};
-	__u32           reserved;
+	__u32		reserved;
 } __attribute__ ((packed));
 
-/* Control flags  */
-#define V4L2_CTRL_FLAG_DISABLED         0x0001
-#define V4L2_CTRL_FLAG_GRABBED          0x0002
-#define V4L2_CTRL_FLAG_READ_ONLY        0x0004
-#define V4L2_CTRL_FLAG_UPDATE           0x0008
-#define V4L2_CTRL_FLAG_INACTIVE         0x0010
-#define V4L2_CTRL_FLAG_SLIDER           0x0020
+/*  Control flags  */
+#define V4L2_CTRL_FLAG_DISABLED		0x0001
+#define V4L2_CTRL_FLAG_GRABBED		0x0002
+#define V4L2_CTRL_FLAG_READ_ONLY 	0x0004
+#define V4L2_CTRL_FLAG_UPDATE 		0x0008
+#define V4L2_CTRL_FLAG_INACTIVE 	0x0010
+#define V4L2_CTRL_FLAG_SLIDER 		0x0020
 #define V4L2_CTRL_FLAG_WRITE_ONLY 	0x0040
 #define V4L2_CTRL_FLAG_VOLATILE		0x0080
 #define V4L2_CTRL_FLAG_HAS_PAYLOAD	0x0100
 #define V4L2_CTRL_FLAG_EXECUTE_ON_WRITE	0x0200
 
 /*  Query flags, to be ORed with the control ID */
-#define V4L2_CTRL_FLAG_NEXT_CTRL        0x80000000
+#define V4L2_CTRL_FLAG_NEXT_CTRL	0x80000000
 #define V4L2_CTRL_FLAG_NEXT_COMPOUND	0x40000000
 
-/* User-class control IDs defined by V4L2 */
+/*  User-class control IDs defined by V4L2 */
 #define V4L2_CID_MAX_CTRLS		1024
-/* IDs reserved for driver specific controls */
-#define V4L2_CID_PRIVATE_BASE           0x08000000
+/*  IDs reserved for driver specific controls */
+#define V4L2_CID_PRIVATE_BASE		0x08000000
 
 
 /*
- *      T U N I N G
+ *	T U N I N G
  */
 struct v4l2_tuner {
-	__u32           index;
-	__u8            name[32];
+	__u32                   index;
+	__u8			name[32];
 	__u32			type;	/* enum v4l2_tuner_type */
-	__u32           capability;
-	__u32           rangelow;
-	__u32           rangehigh;
-	__u32           rxsubchans;
-	__u32           audmode;
-	__s32           signal;
-	__s32           afc;
-	__u32           reserved[4];
+	__u32			capability;
+	__u32			rangelow;
+	__u32			rangehigh;
+	__u32			rxsubchans;
+	__u32			audmode;
+	__s32			signal;
+	__s32			afc;
+	__u32			reserved[4];
 };
 
 struct v4l2_modulator {
@@ -2547,15 +2539,15 @@ struct v4l2_modulator {
 	__u32			reserved[3];
 };
 
-/* Flags for the 'capability' field */
-#define V4L2_TUNER_CAP_LOW              0x0001
-#define V4L2_TUNER_CAP_NORM             0x0002
+/*  Flags for the 'capability' field */
+#define V4L2_TUNER_CAP_LOW		0x0001
+#define V4L2_TUNER_CAP_NORM		0x0002
 #define V4L2_TUNER_CAP_HWSEEK_BOUNDED	0x0004
 #define V4L2_TUNER_CAP_HWSEEK_WRAP	0x0008
-#define V4L2_TUNER_CAP_STEREO           0x0010
-#define V4L2_TUNER_CAP_LANG2            0x0020
-#define V4L2_TUNER_CAP_SAP              0x0020
-#define V4L2_TUNER_CAP_LANG1            0x0040
+#define V4L2_TUNER_CAP_STEREO		0x0010
+#define V4L2_TUNER_CAP_LANG2		0x0020
+#define V4L2_TUNER_CAP_SAP		0x0020
+#define V4L2_TUNER_CAP_LANG1		0x0040
 #define V4L2_TUNER_CAP_RDS		0x0080
 #define V4L2_TUNER_CAP_RDS_BLOCK_IO	0x0100
 #define V4L2_TUNER_CAP_RDS_CONTROLS	0x0200
@@ -2563,27 +2555,27 @@ struct v4l2_modulator {
 #define V4L2_TUNER_CAP_HWSEEK_PROG_LIM	0x0800
 #define V4L2_TUNER_CAP_1HZ		0x1000
 
-/* Flags for the 'rxsubchans' field */
-#define V4L2_TUNER_SUB_MONO             0x0001
-#define V4L2_TUNER_SUB_STEREO           0x0002
-#define V4L2_TUNER_SUB_LANG2            0x0004
-#define V4L2_TUNER_SUB_SAP              0x0004
-#define V4L2_TUNER_SUB_LANG1            0x0008
+/*  Flags for the 'rxsubchans' field */
+#define V4L2_TUNER_SUB_MONO		0x0001
+#define V4L2_TUNER_SUB_STEREO		0x0002
+#define V4L2_TUNER_SUB_LANG2		0x0004
+#define V4L2_TUNER_SUB_SAP		0x0004
+#define V4L2_TUNER_SUB_LANG1		0x0008
 #define V4L2_TUNER_SUB_RDS		0x0010
 
-/* Values for the 'audmode' field */
-#define V4L2_TUNER_MODE_MONO            0x0000
-#define V4L2_TUNER_MODE_STEREO          0x0001
-#define V4L2_TUNER_MODE_LANG2           0x0002
-#define V4L2_TUNER_MODE_SAP             0x0002
-#define V4L2_TUNER_MODE_LANG1           0x0003
-#define V4L2_TUNER_MODE_LANG1_LANG2     0x0004
+/*  Values for the 'audmode' field */
+#define V4L2_TUNER_MODE_MONO		0x0000
+#define V4L2_TUNER_MODE_STEREO		0x0001
+#define V4L2_TUNER_MODE_LANG2		0x0002
+#define V4L2_TUNER_MODE_SAP		0x0002
+#define V4L2_TUNER_MODE_LANG1		0x0003
+#define V4L2_TUNER_MODE_LANG1_LANG2	0x0004
 
 struct v4l2_frequency {
-	__u32           tuner;
+	__u32	tuner;
 	__u32	type;	/* enum v4l2_tuner_type */
-	__u32           frequency;
-	__u32           reserved[8];
+	__u32	frequency;
+	__u32	reserved[8];
 };
 
 #define V4L2_BAND_MODULATION_VSB	(1 << 1)
@@ -2634,29 +2626,29 @@ struct v4l2_rds_data {
 #define V4L2_RDS_BLOCK_ERROR 	 0x80
 
 /*
- *      A U D I O
+ *	A U D I O
  */
 struct v4l2_audio {
-	__u32           index;
-	__u8            name[32];
-	__u32           capability;
-	__u32           mode;
-	__u32           reserved[2];
+	__u32	index;
+	__u8	name[32];
+	__u32	capability;
+	__u32	mode;
+	__u32	reserved[2];
 };
 
-/* Flags for the 'capability' field */
-#define V4L2_AUDCAP_STEREO              0x00001
-#define V4L2_AUDCAP_AVL                 0x00002
+/*  Flags for the 'capability' field */
+#define V4L2_AUDCAP_STEREO		0x00001
+#define V4L2_AUDCAP_AVL			0x00002
 
-/* Flags for the 'mode' field */
-#define V4L2_AUDMODE_AVL                0x00001
+/*  Flags for the 'mode' field */
+#define V4L2_AUDMODE_AVL		0x00001
 
 struct v4l2_audioout {
-	__u32           index;
-	__u8            name[32];
-	__u32           capability;
-	__u32           mode;
-	__u32           reserved[2];
+	__u32	index;
+	__u8	name[32];
+	__u32	capability;
+	__u32	mode;
+	__u32	reserved[2];
 };
 
 /*
@@ -2757,26 +2749,26 @@ struct v4l2_decoder_cmd {
 
 
 /*
- *      D A T A   S E R V I C E S   ( V B I )
+ *	D A T A   S E R V I C E S   ( V B I )
  *
- *      Data services API by Michael Schimek
+ *	Data services API by Michael Schimek
  */
 
 /* Raw VBI */
 struct v4l2_vbi_format {
-	__u32           sampling_rate;	/* in 1 Hz */
-	__u32           offset;
-	__u32           samples_per_line;
-	__u32           sample_format;	/* V4L2_PIX_FMT_* */
-	__s32           start[2];
-	__u32           count[2];
-	__u32           flags;	/* V4L2_VBI_* */
-	__u32           reserved[2];	/* must be zero */
+	__u32	sampling_rate;		/* in 1 Hz */
+	__u32	offset;
+	__u32	samples_per_line;
+	__u32	sample_format;		/* V4L2_PIX_FMT_* */
+	__s32	start[2];
+	__u32	count[2];
+	__u32	flags;			/* V4L2_VBI_* */
+	__u32	reserved[2];		/* must be zero */
 };
 
-/* VBI flags  */
-#define V4L2_VBI_UNSYNC         (1<< 0)
-#define V4L2_VBI_INTERLACED     (1<< 1)
+/*  VBI flags  */
+#define V4L2_VBI_UNSYNC		(1 << 0)
+#define V4L2_VBI_INTERLACED	(1 << 1)
 
 /* ITU-R start lines for each field */
 #define V4L2_VBI_ITU_525_F1_START (1)
@@ -2784,32 +2776,28 @@ struct v4l2_vbi_format {
 #define V4L2_VBI_ITU_625_F1_START (1)
 #define V4L2_VBI_ITU_625_F2_START (314)
 
-/*
- * Sliced VBI
- * 
- * This implements is a proposal V4L2 API to allow SLICED VBI required for some
- * hardware encoders. It should change without notice in the definitive
- * implementation.
+/* Sliced VBI
+ *
+ *    This implements is a proposal V4L2 API to allow SLICED VBI
+ * required for some hardware encoders. It should change without
+ * notice in the definitive implementation.
  */
 
 struct v4l2_sliced_vbi_format {
-	__u16           service_set;
-	/*
-	 * service_lines[0][...] specifies lines 0-23 (1-23 used) of the
-	 * first field service_lines[1][...] specifies lines 0-23 (1-23 used)
-	 * of the second field (equals frame lines 313-336 for 625 line video
-	 * standards, 263-286 for 525 line standards)
-	 */
-	__u16           service_lines[2][24];
-	__u32           io_size;
-	__u32           reserved[2];	/* must be zero */
-};
-
-/*
- * Teletext World System Teletext (WST), defined on ITU-R BT.653-2
- */
+	__u16   service_set;
+	/* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field
+	   service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field
+				 (equals frame lines 313-336 for 625 line video
+				  standards, 263-286 for 525 line standards) */
+	__u16   service_lines[2][24];
+	__u32   io_size;
+	__u32   reserved[2];            /* must be zero */
+};
+
+/* Teletext World System Teletext
+   (WST), defined on ITU-R BT.653-2 */
 #define V4L2_SLICED_TELETEXT_B          (0x0001)
-/* Video Program System, defined on ETS 300 231 */
+/* Video Program System, defined on ETS 300 231*/
 #define V4L2_SLICED_VPS                 (0x0400)
 /* Closed Caption, defined on EIA-608 */
 #define V4L2_SLICED_CAPTION_525         (0x1000)
@@ -2820,24 +2808,22 @@ struct v4l2_sliced_vbi_format {
 #define V4L2_SLICED_VBI_625             (V4L2_SLICED_TELETEXT_B | V4L2_SLICED_VPS | V4L2_SLICED_WSS_625)
 
 struct v4l2_sliced_vbi_cap {
-	__u16           service_set;
-	/*
-	 * service_lines[0][...] specifies lines 0-23 (1-23 used) of the
-	 * first field service_lines[1][...] specifies lines 0-23 (1-23 used)
-	 * of the second field (equals frame lines 313-336 for 625 line video
-	 * standards, 263-286 for 525 line standards)
-	 */
-	__u16           service_lines[2][24];
+	__u16   service_set;
+	/* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field
+	   service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field
+				 (equals frame lines 313-336 for 625 line video
+				  standards, 263-286 for 525 line standards) */
+	__u16   service_lines[2][24];
 	__u32	type;		/* enum v4l2_buf_type */
-	__u32           reserved[3];	/* must be 0 */
+	__u32   reserved[3];    /* must be 0 */
 };
 
 struct v4l2_sliced_vbi_data {
-	__u32           id;
-	__u32           field;	/* 0: first field, 1: second field */
-	__u32           line;	/* 1-23 */
-	__u32           reserved;	/* must be 0 */
-	__u8            data[48];
+	__u32   id;
+	__u32   field;          /* 0: first field, 1: second field */
+	__u32   line;           /* 1-23 */
+	__u32   reserved;       /* must be 0 */
+	__u8    data[48];
 };
 
 /*
@@ -2888,7 +2874,7 @@ struct v4l2_mpeg_vbi_fmt_ivtv {
 } __attribute__ ((packed));
 
 /*
- *      A G G R E G A T E   S T R U C T U R E S
+ *	A G G R E G A T E   S T R U C T U R E S
  */
 
 /**
@@ -2958,32 +2944,25 @@ struct v4l2_sdr_format {
 struct v4l2_format {
 	__u32	 type;
 	union {
-		struct v4l2_pix_format pix;
-		              //V4L2_BUF_TYPE_VIDEO_CAPTURE
+		struct v4l2_pix_format		pix;     /* V4L2_BUF_TYPE_VIDEO_CAPTURE */
 		struct v4l2_pix_format_mplane	pix_mp;  /* V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE */
-		struct v4l2_window win;
-		              //V4L2_BUF_TYPE_VIDEO_OVERLAY
-		struct v4l2_vbi_format vbi;
-		              //V4L2_BUF_TYPE_VBI_CAPTURE
-		struct v4l2_sliced_vbi_format sliced;
-		              //V4L2_BUF_TYPE_SLICED_VBI_CAPTURE
+		struct v4l2_window		win;     /* V4L2_BUF_TYPE_VIDEO_OVERLAY */
+		struct v4l2_vbi_format		vbi;     /* V4L2_BUF_TYPE_VBI_CAPTURE */
+		struct v4l2_sliced_vbi_format	sliced;  /* V4L2_BUF_TYPE_SLICED_VBI_CAPTURE */
 		struct v4l2_sdr_format		sdr;     /* V4L2_BUF_TYPE_SDR_CAPTURE */
-		__u8 raw_data[200];
-		              //user - defined
-	}               fmt;
+		__u8	raw_data[200];                   /* user-defined */
+	} fmt;
 };
 
-
-/*
- * Stream type-dependent parameters
+/*	Stream type-dependent parameters
  */
 struct v4l2_streamparm {
 	__u32	 type;			/* enum v4l2_buf_type */
 	union {
-		struct v4l2_captureparm capture;
-		struct v4l2_outputparm output;
-		__u8            raw_data[200];	/* user-defined */
-	}               parm;
+		struct v4l2_captureparm	capture;
+		struct v4l2_outputparm	output;
+		__u8	raw_data[200];  /* user-defined */
+	} parm;
 };
 
 /*
@@ -3138,75 +3117,75 @@ struct v4l2_create_buffers {
 };
 
 /*
- *      I O C T L   C O D E S   F O R   V I D E O   D E V I C E S
+ *	I O C T L   C O D E S   F O R   V I D E O   D E V I C E S
  *
  */
-#define VIDIOC_QUERYCAP         _IOR  ('V',  0, struct v4l2_capability)
-#define VIDIOC_RESERVED         _IO   ('V',  1)
-#define VIDIOC_ENUM_FMT         _IOWR ('V',  2, struct v4l2_fmtdesc)
-#define VIDIOC_G_FMT            _IOWR ('V',  4, struct v4l2_format)
-#define VIDIOC_S_FMT            _IOWR ('V',  5, struct v4l2_format)
-#define VIDIOC_REQBUFS          _IOWR ('V',  8, struct v4l2_requestbuffers)
-#define VIDIOC_QUERYBUF         _IOWR ('V',  9, struct v4l2_buffer)
-#define VIDIOC_G_FBUF           _IOR  ('V', 10, struct v4l2_framebuffer)
-#define VIDIOC_S_FBUF           _IOW  ('V', 11, struct v4l2_framebuffer)
-#define VIDIOC_OVERLAY          _IOW  ('V', 14, int)
-#define VIDIOC_QBUF             _IOWR ('V', 15, struct v4l2_buffer)
+#define VIDIOC_QUERYCAP		 _IOR('V',  0, struct v4l2_capability)
+#define VIDIOC_RESERVED		  _IO('V',  1)
+#define VIDIOC_ENUM_FMT         _IOWR('V',  2, struct v4l2_fmtdesc)
+#define VIDIOC_G_FMT		_IOWR('V',  4, struct v4l2_format)
+#define VIDIOC_S_FMT		_IOWR('V',  5, struct v4l2_format)
+#define VIDIOC_REQBUFS		_IOWR('V',  8, struct v4l2_requestbuffers)
+#define VIDIOC_QUERYBUF		_IOWR('V',  9, struct v4l2_buffer)
+#define VIDIOC_G_FBUF		 _IOR('V', 10, struct v4l2_framebuffer)
+#define VIDIOC_S_FBUF		 _IOW('V', 11, struct v4l2_framebuffer)
+#define VIDIOC_OVERLAY		 _IOW('V', 14, int)
+#define VIDIOC_QBUF		_IOWR('V', 15, struct v4l2_buffer)
 #define VIDIOC_EXPBUF		_IOWR('V', 16, struct v4l2_exportbuffer)
-#define VIDIOC_DQBUF            _IOWR ('V', 17, struct v4l2_buffer)
-#define VIDIOC_STREAMON         _IOW  ('V', 18, int)
-#define VIDIOC_STREAMOFF        _IOW  ('V', 19, int)
-#define VIDIOC_G_PARM           _IOWR ('V', 21, struct v4l2_streamparm)
-#define VIDIOC_S_PARM           _IOWR ('V', 22, struct v4l2_streamparm)
-#define VIDIOC_G_STD            _IOR  ('V', 23, v4l2_std_id)
-#define VIDIOC_S_STD            _IOW  ('V', 24, v4l2_std_id)
-#define VIDIOC_ENUMSTD          _IOWR ('V', 25, struct v4l2_standard)
-#define VIDIOC_ENUMINPUT        _IOWR ('V', 26, struct v4l2_input)
-#define VIDIOC_G_CTRL           _IOWR ('V', 27, struct v4l2_control)
-#define VIDIOC_S_CTRL           _IOWR ('V', 28, struct v4l2_control)
-#define VIDIOC_G_TUNER          _IOWR ('V', 29, struct v4l2_tuner)
-#define VIDIOC_S_TUNER          _IOW  ('V', 30, struct v4l2_tuner)
-#define VIDIOC_G_AUDIO          _IOR  ('V', 33, struct v4l2_audio)
-#define VIDIOC_S_AUDIO          _IOW  ('V', 34, struct v4l2_audio)
-#define VIDIOC_QUERYCTRL        _IOWR ('V', 36, struct v4l2_queryctrl)
-#define VIDIOC_QUERYMENU        _IOWR ('V', 37, struct v4l2_querymenu)
-#define VIDIOC_G_INPUT          _IOR  ('V', 38, int)
-#define VIDIOC_S_INPUT          _IOWR ('V', 39, int)
+#define VIDIOC_DQBUF		_IOWR('V', 17, struct v4l2_buffer)
+#define VIDIOC_STREAMON		 _IOW('V', 18, int)
+#define VIDIOC_STREAMOFF	 _IOW('V', 19, int)
+#define VIDIOC_G_PARM		_IOWR('V', 21, struct v4l2_streamparm)
+#define VIDIOC_S_PARM		_IOWR('V', 22, struct v4l2_streamparm)
+#define VIDIOC_G_STD		 _IOR('V', 23, v4l2_std_id)
+#define VIDIOC_S_STD		 _IOW('V', 24, v4l2_std_id)
+#define VIDIOC_ENUMSTD		_IOWR('V', 25, struct v4l2_standard)
+#define VIDIOC_ENUMINPUT	_IOWR('V', 26, struct v4l2_input)
+#define VIDIOC_G_CTRL		_IOWR('V', 27, struct v4l2_control)
+#define VIDIOC_S_CTRL		_IOWR('V', 28, struct v4l2_control)
+#define VIDIOC_G_TUNER		_IOWR('V', 29, struct v4l2_tuner)
+#define VIDIOC_S_TUNER		 _IOW('V', 30, struct v4l2_tuner)
+#define VIDIOC_G_AUDIO		 _IOR('V', 33, struct v4l2_audio)
+#define VIDIOC_S_AUDIO		 _IOW('V', 34, struct v4l2_audio)
+#define VIDIOC_QUERYCTRL	_IOWR('V', 36, struct v4l2_queryctrl)
+#define VIDIOC_QUERYMENU	_IOWR('V', 37, struct v4l2_querymenu)
+#define VIDIOC_G_INPUT		 _IOR('V', 38, int)
+#define VIDIOC_S_INPUT		_IOWR('V', 39, int)
 /* Ignore as we do not have v4l2-common.h */
 #if 0
 #define VIDIOC_G_EDID		_IOWR('V', 40, struct v4l2_edid)
 #define VIDIOC_S_EDID		_IOWR('V', 41, struct v4l2_edid)
 #endif
-#define VIDIOC_G_OUTPUT         _IOR  ('V', 46, int)
-#define VIDIOC_S_OUTPUT         _IOWR ('V', 47, int)
-#define VIDIOC_ENUMOUTPUT       _IOWR ('V', 48, struct v4l2_output)
-#define VIDIOC_G_AUDOUT         _IOR  ('V', 49, struct v4l2_audioout)
-#define VIDIOC_S_AUDOUT         _IOW  ('V', 50, struct v4l2_audioout)
-#define VIDIOC_G_MODULATOR      _IOWR ('V', 54, struct v4l2_modulator)
-#define VIDIOC_S_MODULATOR      _IOW  ('V', 55, struct v4l2_modulator)
-#define VIDIOC_G_FREQUENCY      _IOWR ('V', 56, struct v4l2_frequency)
-#define VIDIOC_S_FREQUENCY      _IOW  ('V', 57, struct v4l2_frequency)
-#define VIDIOC_CROPCAP          _IOWR ('V', 58, struct v4l2_cropcap)
-#define VIDIOC_G_CROP           _IOWR ('V', 59, struct v4l2_crop)
-#define VIDIOC_S_CROP           _IOW  ('V', 60, struct v4l2_crop)
-#define VIDIOC_G_JPEGCOMP       _IOR  ('V', 61, struct v4l2_jpegcompression)
-#define VIDIOC_S_JPEGCOMP       _IOW  ('V', 62, struct v4l2_jpegcompression)
-#define VIDIOC_QUERYSTD         _IOR  ('V', 63, v4l2_std_id)
-#define VIDIOC_TRY_FMT          _IOWR ('V', 64, struct v4l2_format)
-#define VIDIOC_ENUMAUDIO        _IOWR ('V', 65, struct v4l2_audio)
-#define VIDIOC_ENUMAUDOUT       _IOWR ('V', 66, struct v4l2_audioout)
+#define VIDIOC_G_OUTPUT		 _IOR('V', 46, int)
+#define VIDIOC_S_OUTPUT		_IOWR('V', 47, int)
+#define VIDIOC_ENUMOUTPUT	_IOWR('V', 48, struct v4l2_output)
+#define VIDIOC_G_AUDOUT		 _IOR('V', 49, struct v4l2_audioout)
+#define VIDIOC_S_AUDOUT		 _IOW('V', 50, struct v4l2_audioout)
+#define VIDIOC_G_MODULATOR	_IOWR('V', 54, struct v4l2_modulator)
+#define VIDIOC_S_MODULATOR	 _IOW('V', 55, struct v4l2_modulator)
+#define VIDIOC_G_FREQUENCY	_IOWR('V', 56, struct v4l2_frequency)
+#define VIDIOC_S_FREQUENCY	 _IOW('V', 57, struct v4l2_frequency)
+#define VIDIOC_CROPCAP		_IOWR('V', 58, struct v4l2_cropcap)
+#define VIDIOC_G_CROP		_IOWR('V', 59, struct v4l2_crop)
+#define VIDIOC_S_CROP		 _IOW('V', 60, struct v4l2_crop)
+#define VIDIOC_G_JPEGCOMP	 _IOR('V', 61, struct v4l2_jpegcompression)
+#define VIDIOC_S_JPEGCOMP	 _IOW('V', 62, struct v4l2_jpegcompression)
+#define VIDIOC_QUERYSTD      	 _IOR('V', 63, v4l2_std_id)
+#define VIDIOC_TRY_FMT      	_IOWR('V', 64, struct v4l2_format)
+#define VIDIOC_ENUMAUDIO	_IOWR('V', 65, struct v4l2_audio)
+#define VIDIOC_ENUMAUDOUT	_IOWR('V', 66, struct v4l2_audioout)
 #define VIDIOC_G_PRIORITY	 _IOR('V', 67, __u32) /* enum v4l2_priority */
 #define VIDIOC_S_PRIORITY	 _IOW('V', 68, __u32) /* enum v4l2_priority */
-#define VIDIOC_G_SLICED_VBI_CAP _IOWR ('V', 69, struct v4l2_sliced_vbi_cap)
-#define VIDIOC_LOG_STATUS       _IO   ('V', 70)
-#define VIDIOC_G_EXT_CTRLS      _IOWR ('V', 71, struct v4l2_ext_controls)
-#define VIDIOC_S_EXT_CTRLS      _IOWR ('V', 72, struct v4l2_ext_controls)
-#define VIDIOC_TRY_EXT_CTRLS    _IOWR ('V', 73, struct v4l2_ext_controls)
-#define VIDIOC_ENUM_FRAMESIZES  _IOWR ('V', 74, struct v4l2_frmsizeenum)
-#define VIDIOC_ENUM_FRAMEINTERVALS      _IOWR ('V', 75, struct v4l2_frmivalenum)
-#define VIDIOC_G_ENC_INDEX      _IOR  ('V', 76, struct v4l2_enc_idx)
-#define VIDIOC_ENCODER_CMD      _IOWR ('V', 77, struct v4l2_encoder_cmd)
-#define VIDIOC_TRY_ENCODER_CMD  _IOWR ('V', 78, struct v4l2_encoder_cmd)
+#define VIDIOC_G_SLICED_VBI_CAP _IOWR('V', 69, struct v4l2_sliced_vbi_cap)
+#define VIDIOC_LOG_STATUS         _IO('V', 70)
+#define VIDIOC_G_EXT_CTRLS	_IOWR('V', 71, struct v4l2_ext_controls)
+#define VIDIOC_S_EXT_CTRLS	_IOWR('V', 72, struct v4l2_ext_controls)
+#define VIDIOC_TRY_EXT_CTRLS	_IOWR('V', 73, struct v4l2_ext_controls)
+#define VIDIOC_ENUM_FRAMESIZES	_IOWR('V', 74, struct v4l2_frmsizeenum)
+#define VIDIOC_ENUM_FRAMEINTERVALS _IOWR('V', 75, struct v4l2_frmivalenum)
+#define VIDIOC_G_ENC_INDEX       _IOR('V', 76, struct v4l2_enc_idx)
+#define VIDIOC_ENCODER_CMD      _IOWR('V', 77, struct v4l2_encoder_cmd)
+#define VIDIOC_TRY_ENCODER_CMD  _IOWR('V', 78, struct v4l2_encoder_cmd)
 
 /* Experimental, meant for debugging, testing and internal use.
    Only implemented if CONFIG_VIDEO_ADV_DEBUG is defined.
@@ -3252,8 +3231,9 @@ struct v4l2_create_buffers {
 
 #define VIDIOC_QUERY_EXT_CTRL	_IOWR('V', 103, struct v4l2_query_ext_ctrl)
 
+/* Reminder: when adding new ioctls please add support for them to
+   drivers/media/v4l2-core/v4l2-compat-ioctl32.c as well! */
 
-
-#define BASE_VIDIOC_PRIVATE     192	/* 192-255 are private */
+#define BASE_VIDIOC_PRIVATE	192		/* 192-255 are private */
 
 #endif				/* _SYS_VIDEOIO_H */