aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Schimek <mschimek@gmx.at>2005-11-08 21:38:24 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 07:56:27 -0800
commitc12097fd9adb07810fb28f70df5462c0603463cc (patch)
tree59266c11892e2fbb87bb773a1a75d17af5ee6451
parentf3b512fd42b4ed6ff47a8afb4f42ac3cc325ddad (diff)
[PATCH] v4l: 876: moved some user defines to be out of kernel define
- Moved some user defines to be out of __KERNEL__ define. Signed-off-by: Michael Schimek <mschimek@gmx.at> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/linux/videodev2.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index cbe15edbe66..e8a0d22df54 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -31,6 +31,21 @@
#define VIDEO_MAX_FRAME 32
+#define VID_TYPE_CAPTURE 1 /* Can capture */
+#define VID_TYPE_TUNER 2 /* Can tune */
+#define VID_TYPE_TELETEXT 4 /* Does teletext */
+#define VID_TYPE_OVERLAY 8 /* Overlay onto frame buffer */
+#define VID_TYPE_CHROMAKEY 16 /* Overlay by chromakey */
+#define VID_TYPE_CLIPPING 32 /* Can clip */
+#define VID_TYPE_FRAMERAM 64 /* Uses the frame buffer memory */
+#define VID_TYPE_SCALES 128 /* Scalable */
+#define VID_TYPE_MONOCHROME 256 /* Monochrome only */
+#define VID_TYPE_SUBCAPTURE 512 /* Can capture subareas of the image */
+#define VID_TYPE_MPEG_DECODER 1024 /* Can decode MPEG streams */
+#define VID_TYPE_MPEG_ENCODER 2048 /* Can encode MPEG streams */
+#define VID_TYPE_MJPEG_DECODER 4096 /* Can decode MJPEG streams */
+#define VID_TYPE_MJPEG_ENCODER 8192 /* Can encode MJPEG streams */
+
#ifdef __KERNEL__
#define VFL_TYPE_GRABBER 0
@@ -72,21 +87,6 @@ struct video_device
#define VIDEO_MAJOR 81
-#define VID_TYPE_CAPTURE 1 /* Can capture */
-#define VID_TYPE_TUNER 2 /* Can tune */
-#define VID_TYPE_TELETEXT 4 /* Does teletext */
-#define VID_TYPE_OVERLAY 8 /* Overlay onto frame buffer */
-#define VID_TYPE_CHROMAKEY 16 /* Overlay by chromakey */
-#define VID_TYPE_CLIPPING 32 /* Can clip */
-#define VID_TYPE_FRAMERAM 64 /* Uses the frame buffer memory */
-#define VID_TYPE_SCALES 128 /* Scalable */
-#define VID_TYPE_MONOCHROME 256 /* Monochrome only */
-#define VID_TYPE_SUBCAPTURE 512 /* Can capture subareas of the image */
-#define VID_TYPE_MPEG_DECODER 1024 /* Can decode MPEG streams */
-#define VID_TYPE_MPEG_ENCODER 2048 /* Can encode MPEG streams */
-#define VID_TYPE_MJPEG_DECODER 4096 /* Can decode MJPEG streams */
-#define VID_TYPE_MJPEG_ENCODER 8192 /* Can encode MJPEG streams */
-
extern int video_register_device(struct video_device *, int type, int nr);
extern void video_unregister_device(struct video_device *);
extern int video_usercopy(struct inode *inode, struct file *file,