aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/videodev2.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-06-05 09:26:32 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-25 01:05:05 -0400
commit5e87efa3b29c105f81fea785babafb098e4e046d (patch)
tree7782d36699174e5985ee7ddca3860df130b0bbbb /include/linux/videodev2.h
parent839e4a4acb90fd34e3f6765bef6fe03ee82dbc58 (diff)
V4L/DVB (4068): Removed all references to kernel stuff from videodev.h and videodev2.h
The videodev.h and videodev2.h describe the public API for V4L and V4L2. It shouldn't have there any kernel-specific stuff. Those were moved to v4l2-dev.h. This patch removes some uneeded headers and include v4l2-common.h on all V4L driver. This header includes device implementation of V4L2 API provided on v4l2-dev.h as well as V4L2 internal ioctls that provides connections between master driver and its i2c devices. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'include/linux/videodev2.h')
-rw-r--r--include/linux/videodev2.h18
1 files changed, 4 insertions, 14 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index bb58197ab6b9..795831d9f4d4 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -24,7 +24,6 @@
24 * Common stuff for both V4L1 and V4L2 24 * Common stuff for both V4L1 and V4L2
25 * Moved from videodev.h 25 * Moved from videodev.h
26 */ 26 */
27
28#define VIDEO_MAX_FRAME 32 27#define VIDEO_MAX_FRAME 32
29 28
30#define VID_TYPE_CAPTURE 1 /* Can capture */ 29#define VID_TYPE_CAPTURE 1 /* Can capture */
@@ -200,7 +199,6 @@ struct v4l2_capability
200/* 199/*
201 * V I D E O I M A G E F O R M A T 200 * V I D E O I M A G E F O R M A T
202 */ 201 */
203
204struct v4l2_pix_format 202struct v4l2_pix_format
205{ 203{
206 __u32 width; 204 __u32 width;
@@ -213,7 +211,7 @@ struct v4l2_pix_format
213 __u32 priv; /* private data, depends on pixelformat */ 211 __u32 priv; /* private data, depends on pixelformat */
214}; 212};
215 213
216/* Pixel format FOURCC depth Description */ 214/* Pixel format FOURCC depth Description */
217#define V4L2_PIX_FMT_RGB332 v4l2_fourcc('R','G','B','1') /* 8 RGB-3-3-2 */ 215#define V4L2_PIX_FMT_RGB332 v4l2_fourcc('R','G','B','1') /* 8 RGB-3-3-2 */
218#define V4L2_PIX_FMT_RGB555 v4l2_fourcc('R','G','B','O') /* 16 RGB-5-5-5 */ 216#define V4L2_PIX_FMT_RGB555 v4l2_fourcc('R','G','B','O') /* 16 RGB-5-5-5 */
219#define V4L2_PIX_FMT_RGB565 v4l2_fourcc('R','G','B','P') /* 16 RGB-5-6-5 */ 217#define V4L2_PIX_FMT_RGB565 v4l2_fourcc('R','G','B','P') /* 16 RGB-5-6-5 */
@@ -273,7 +271,6 @@ struct v4l2_fmtdesc
273 271
274#define V4L2_FMT_FLAG_COMPRESSED 0x0001 272#define V4L2_FMT_FLAG_COMPRESSED 0x0001
275 273
276
277/* 274/*
278 * T I M E C O D E 275 * T I M E C O D E
279 */ 276 */
@@ -303,7 +300,6 @@ struct v4l2_timecode
303#define V4L2_TC_USERBITS_8BITCHARS 0x0008 300#define V4L2_TC_USERBITS_8BITCHARS 0x0008
304/* The above is based on SMPTE timecodes */ 301/* The above is based on SMPTE timecodes */
305 302
306
307/* 303/*
308 * M P E G C O M P R E S S I O N P A R A M E T E R S 304 * M P E G C O M P R E S S I O N P A R A M E T E R S
309 * 305 *
@@ -311,8 +307,6 @@ struct v4l2_timecode
311 * ### there will be some incompatible changes. 307 * ### there will be some incompatible changes.
312 * 308 *
313 */ 309 */
314
315
316enum v4l2_bitrate_mode { 310enum v4l2_bitrate_mode {
317 V4L2_BITRATE_NONE = 0, /* not specified */ 311 V4L2_BITRATE_NONE = 0, /* not specified */
318 V4L2_BITRATE_CBR, /* constant bitrate */ 312 V4L2_BITRATE_CBR, /* constant bitrate */
@@ -421,7 +415,6 @@ struct v4l2_jpegcompression
421 * allways use APP0 */ 415 * allways use APP0 */
422}; 416};
423 417
424
425/* 418/*
426 * M E M O R Y - M A P P I N G B U F F E R S 419 * M E M O R Y - M A P P I N G B U F F E R S
427 */ 420 */
@@ -503,7 +496,6 @@ struct v4l2_window
503 void __user *bitmap; 496 void __user *bitmap;
504}; 497};
505 498
506
507/* 499/*
508 * C A P T U R E P A R A M E T E R S 500 * C A P T U R E P A R A M E T E R S
509 */ 501 */
@@ -516,6 +508,7 @@ struct v4l2_captureparm
516 __u32 readbuffers; /* # of buffers for read */ 508 __u32 readbuffers; /* # of buffers for read */
517 __u32 reserved[4]; 509 __u32 reserved[4];
518}; 510};
511
519/* Flags for 'capability' and 'capturemode' fields */ 512/* Flags for 'capability' and 'capturemode' fields */
520#define V4L2_MODE_HIGHQUALITY 0x0001 /* High quality imaging mode */ 513#define V4L2_MODE_HIGHQUALITY 0x0001 /* High quality imaging mode */
521#define V4L2_CAP_TIMEPERFRAME 0x1000 /* timeperframe field is supported */ 514#define V4L2_CAP_TIMEPERFRAME 0x1000 /* timeperframe field is supported */
@@ -533,7 +526,6 @@ struct v4l2_outputparm
533/* 526/*
534 * I N P U T I M A G E C R O P P I N G 527 * I N P U T I M A G E C R O P P I N G
535 */ 528 */
536
537struct v4l2_cropcap { 529struct v4l2_cropcap {
538 enum v4l2_buf_type type; 530 enum v4l2_buf_type type;
539 struct v4l2_rect bounds; 531 struct v4l2_rect bounds;
@@ -640,7 +632,6 @@ struct v4l2_standard
640 __u32 reserved[4]; 632 __u32 reserved[4];
641}; 633};
642 634
643
644/* 635/*
645 * V I D E O I N P U T S 636 * V I D E O I N P U T S
646 */ 637 */
@@ -655,6 +646,7 @@ struct v4l2_input
655 __u32 status; 646 __u32 status;
656 __u32 reserved[4]; 647 __u32 reserved[4];
657}; 648};
649
658/* Values for the 'type' field */ 650/* Values for the 'type' field */
659#define V4L2_INPUT_TYPE_TUNER 1 651#define V4L2_INPUT_TYPE_TUNER 1
660#define V4L2_INPUT_TYPE_CAMERA 2 652#define V4L2_INPUT_TYPE_CAMERA 2
@@ -834,6 +826,7 @@ struct v4l2_audio
834 __u32 mode; 826 __u32 mode;
835 __u32 reserved[2]; 827 __u32 reserved[2];
836}; 828};
829
837/* Flags for the 'capability' field */ 830/* Flags for the 'capability' field */
838#define V4L2_AUDCAP_STEREO 0x00001 831#define V4L2_AUDCAP_STEREO 0x00001
839#define V4L2_AUDCAP_AVL 0x00002 832#define V4L2_AUDCAP_AVL 0x00002
@@ -857,7 +850,6 @@ struct v4l2_audioout
857 */ 850 */
858 851
859/* Raw VBI */ 852/* Raw VBI */
860
861struct v4l2_vbi_format 853struct v4l2_vbi_format
862{ 854{
863 __u32 sampling_rate; /* in 1 Hz */ 855 __u32 sampling_rate; /* in 1 Hz */
@@ -964,8 +956,6 @@ struct v4l2_streamparm
964 } parm; 956 } parm;
965}; 957};
966 958
967
968
969/* 959/*
970 * 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 960 * 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
971 * 961 *