diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-26 22:19:36 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-26 22:19:36 -0300 |
| commit | e46833c20d935275819ec7699848db8bf7fc95c6 (patch) | |
| tree | 6bc18657f5b3ea20ebad3d7800380a953b911278 /linux/include/media/soc_camera.h | |
| parent | 2ea01ce1b95e74d54c08e88437218f26d2f5ac87 (diff) | |
| parent | 9f6504985990a61609caaa94fac0724d11be4803 (diff) | |
| download | mediapointer-dvb-s2-e46833c20d935275819ec7699848db8bf7fc95c6.tar.gz mediapointer-dvb-s2-e46833c20d935275819ec7699848db8bf7fc95c6.tar.bz2 | |
merge: http://linuxtv.org/hg/~awalls/cx18
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include/media/soc_camera.h')
| -rw-r--r-- | linux/include/media/soc_camera.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/linux/include/media/soc_camera.h b/linux/include/media/soc_camera.h index 7440d9250..c63a3409f 100644 --- a/linux/include/media/soc_camera.h +++ b/linux/include/media/soc_camera.h @@ -239,15 +239,19 @@ static inline struct v4l2_queryctrl const *soc_camera_find_qctrl( static inline unsigned long soc_camera_bus_param_compatible( unsigned long camera_flags, unsigned long bus_flags) { - unsigned long common_flags, hsync, vsync, pclk; + unsigned long common_flags, hsync, vsync, pclk, data, buswidth, mode; common_flags = camera_flags & bus_flags; hsync = common_flags & (SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_LOW); vsync = common_flags & (SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_LOW); pclk = common_flags & (SOCAM_PCLK_SAMPLE_RISING | SOCAM_PCLK_SAMPLE_FALLING); + data = common_flags & (SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATA_ACTIVE_LOW); + mode = common_flags & (SOCAM_MASTER | SOCAM_SLAVE); + buswidth = common_flags & SOCAM_DATAWIDTH_MASK; - return (!hsync || !vsync || !pclk) ? 0 : common_flags; + return (!hsync || !vsync || !pclk || !data || !mode || !buswidth) ? 0 : + common_flags; } extern unsigned long soc_camera_apply_sensor_flags(struct soc_camera_link *icl, |