diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-02-23 12:13:24 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 12:42:53 -0300 |
| commit | f7f41483bec8e8ddf3a6bd905b549d0a8d488fdb (patch) | |
| tree | 97682fdf1d37e57f4163baa08250e5c79b77e0de /include | |
| parent | 4f67130ad35d6760c27984cf94b13a8cb85e4034 (diff) | |
| download | blackbird-op-linux-f7f41483bec8e8ddf3a6bd905b549d0a8d488fdb.tar.gz blackbird-op-linux-f7f41483bec8e8ddf3a6bd905b549d0a8d488fdb.zip | |
V4L/DVB (10675): soc-camera: extend soc_camera_bus_param_compatible with more tests
Add data signal polarity, mode, and bus-width tests to
soc_camera_bus_param_compatible().
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/soc_camera.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h index 7440d9250665..c63a3409ffb7 100644 --- a/include/media/soc_camera.h +++ b/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, |
