diff options
author | Jonathan Corbet <corbet-v4l@lwn.net> | 2006-11-04 07:22:27 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-10 05:51:12 -0500 |
commit | 9c4dfadbde3cfa78b92c28597125b8c41d36ffd0 (patch) | |
tree | f3c38f6e890f3bba3dc7cb6d63598d7c3e18ee57 | |
parent | 589d069cfe7f2bb37c4836641ddffe9e2b51e74e (diff) |
V4L/DVB (4796): A couple of V4L2 defines needed by Cafe Camara driver
Two defines for V4L2, needed by the Cafe camera driver:
1) Add the RGB444 image format
2) Add the "init" internal command which is separate from "reset".
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | include/linux/videodev2.h | 1 | ||||
-rw-r--r-- | include/media/v4l2-common.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index df5c4654360d..5cb380a559fd 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h | |||
@@ -244,6 +244,7 @@ struct v4l2_pix_format | |||
244 | #define V4L2_PIX_FMT_YYUV v4l2_fourcc('Y','Y','U','V') /* 16 YUV 4:2:2 */ | 244 | #define V4L2_PIX_FMT_YYUV v4l2_fourcc('Y','Y','U','V') /* 16 YUV 4:2:2 */ |
245 | #define V4L2_PIX_FMT_HI240 v4l2_fourcc('H','I','2','4') /* 8 8-bit color */ | 245 | #define V4L2_PIX_FMT_HI240 v4l2_fourcc('H','I','2','4') /* 8 8-bit color */ |
246 | #define V4L2_PIX_FMT_HM12 v4l2_fourcc('H','M','1','2') /* 8 YUV 4:2:0 16x16 macroblocks */ | 246 | #define V4L2_PIX_FMT_HM12 v4l2_fourcc('H','M','1','2') /* 8 YUV 4:2:0 16x16 macroblocks */ |
247 | #define V4L2_PIX_FMT_RGB444 v4l2_fourcc('R','4','4','4') /* 16 xxxxrrrr ggggbbbb */ | ||
247 | 248 | ||
248 | /* see http://www.siliconimaging.com/RGB%20Bayer.htm */ | 249 | /* see http://www.siliconimaging.com/RGB%20Bayer.htm */ |
249 | #define V4L2_PIX_FMT_SBGGR8 v4l2_fourcc('B','A','8','1') /* 8 BGBG.. GRGR.. */ | 250 | #define V4L2_PIX_FMT_SBGGR8 v4l2_fourcc('B','A','8','1') /* 8 BGBG.. GRGR.. */ |
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h index aecc946980a3..8263ea00ca6f 100644 --- a/include/media/v4l2-common.h +++ b/include/media/v4l2-common.h | |||
@@ -251,4 +251,8 @@ struct v4l2_crystal_freq { | |||
251 | If the frequency is not supported, then -EINVAL is returned. */ | 251 | If the frequency is not supported, then -EINVAL is returned. */ |
252 | #define VIDIOC_INT_S_CRYSTAL_FREQ _IOW ('d', 113, struct v4l2_crystal_freq) | 252 | #define VIDIOC_INT_S_CRYSTAL_FREQ _IOW ('d', 113, struct v4l2_crystal_freq) |
253 | 253 | ||
254 | /* Initialize the sensor registors to some sort of reasonable | ||
255 | default values. */ | ||
256 | #define VIDIOC_INT_INIT _IOW ('d', 114, u32) | ||
257 | |||
254 | #endif /* V4L2_COMMON_H_ */ | 258 | #endif /* V4L2_COMMON_H_ */ |