summaryrefslogtreecommitdiff
path: root/linux/include/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-11-04 13:01:36 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-11-04 13:01:36 -0300
commitb34f3787b6bf53efdc2fa0e73c00daf7fad27f63 (patch)
tree570a3f5c6b3acdd46e64dde2010a98c93e854abc /linux/include/media
parent9619f60d3b133c09c79b1a8f2d14c890674e32a8 (diff)
parent4e55561efef55c409316e44b0d90f4a8f23ad20d (diff)
downloadmediapointer-dvb-s2-b34f3787b6bf53efdc2fa0e73c00daf7fad27f63.tar.gz
mediapointer-dvb-s2-b34f3787b6bf53efdc2fa0e73c00daf7fad27f63.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/pending
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include/media')
-rw-r--r--linux/include/media/v4l2-common.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/linux/include/media/v4l2-common.h b/linux/include/media/v4l2-common.h
index ce7df478d..6e7500f1d 100644
--- a/linux/include/media/v4l2-common.h
+++ b/linux/include/media/v4l2-common.h
@@ -150,6 +150,9 @@ enum v4l2_chip_ident {
V4L2_IDENT_CX25841 = 241,
V4L2_IDENT_CX25842 = 242,
V4L2_IDENT_CX25843 = 243,
+
+ /* OmniVision sensors - range 250-299 */
+ V4L2_IDENT_OV7670 = 250,
};
/* audio ioctls */
@@ -257,4 +260,8 @@ struct v4l2_crystal_freq {
If the frequency is not supported, then -EINVAL is returned. */
#define VIDIOC_INT_S_CRYSTAL_FREQ _IOW ('d', 113, struct v4l2_crystal_freq)
+/* Initialize the sensor registors to some sort of reasonable
+ default values. */
+#define VIDIOC_INT_INIT _IOW ('d', 114, u32)
+
#endif /* V4L2_COMMON_H_ */