diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-11-04 13:01:36 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-11-04 13:01:36 -0300 |
| commit | b34f3787b6bf53efdc2fa0e73c00daf7fad27f63 (patch) | |
| tree | 570a3f5c6b3acdd46e64dde2010a98c93e854abc /linux/include | |
| parent | 9619f60d3b133c09c79b1a8f2d14c890674e32a8 (diff) | |
| parent | 4e55561efef55c409316e44b0d90f4a8f23ad20d (diff) | |
| download | mediapointer-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')
| -rw-r--r-- | linux/include/linux/i2c-id.h | 2 | ||||
| -rw-r--r-- | linux/include/linux/videodev2.h | 1 | ||||
| -rw-r--r-- | linux/include/media/v4l2-common.h | 7 |
3 files changed, 10 insertions, 0 deletions
diff --git a/linux/include/linux/i2c-id.h b/linux/include/linux/i2c-id.h index 0a8f750cb..0f4cf34b6 100644 --- a/linux/include/linux/i2c-id.h +++ b/linux/include/linux/i2c-id.h @@ -159,6 +159,7 @@ #define I2C_DRIVERID_ASB100 1043 #define I2C_DRIVERID_FSCHER 1046 #define I2C_DRIVERID_W83L785TS 1047 +#define I2C_DRIVERID_OV7670 1048 /* Omnivision 7670 camera */ /* * ---- Adapter types ---------------------------------------------------- @@ -250,6 +251,7 @@ #define I2C_HW_SMBUS_OV518 0x04000f /* OV518(+) USB 1.1 webcam ICs */ #define I2C_HW_SMBUS_OV519 0x040010 /* OV519 USB 1.1 webcam IC */ #define I2C_HW_SMBUS_OVFX2 0x040011 /* Cypress/OmniVision FX2 webcam */ +#define I2C_HW_SMBUS_CAFE 0x040012 /* Marvell 88ALP01 "CAFE" cam */ /* --- ISA pseudo-adapter */ #define I2C_HW_ISA 0x050000 diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index bd484d60a..b3c297b7b 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -244,6 +244,7 @@ struct v4l2_pix_format #define V4L2_PIX_FMT_YYUV v4l2_fourcc('Y','Y','U','V') /* 16 YUV 4:2:2 */ #define V4L2_PIX_FMT_HI240 v4l2_fourcc('H','I','2','4') /* 8 8-bit color */ #define V4L2_PIX_FMT_HM12 v4l2_fourcc('H','M','1','2') /* 8 YUV 4:2:0 16x16 macroblocks */ +#define V4L2_PIX_FMT_RGB444 v4l2_fourcc('R','4','4','4') /* 16 xxxxrrrr ggggbbbb */ /* see http://www.siliconimaging.com/RGB%20Bayer.htm */ #define V4L2_PIX_FMT_SBGGR8 v4l2_fourcc('B','A','8','1') /* 8 BGBG.. GRGR.. */ 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_ */ |