diff options
| author | Paulius Zaleckas <paulius.zaleckas@teltonika.lt> | 2008-07-11 22:50:31 +0200 |
|---|---|---|
| committer | Paulius Zaleckas <paulius.zaleckas@teltonika.lt> | 2008-07-11 22:50:31 +0200 |
| commit | aeba0c614e8105f2a9cbf77ff44e622e7949caba (patch) | |
| tree | 5c5ed9dfb79ae26cb2935c86211ff6af8ed385a8 /linux/include | |
| parent | 610e9fdc6f1ffa937eb4e499f202ea75deb1ff03 (diff) | |
| download | mediapointer-dvb-s2-aeba0c614e8105f2a9cbf77ff44e622e7949caba.tar.gz mediapointer-dvb-s2-aeba0c614e8105f2a9cbf77ff44e622e7949caba.tar.bz2 | |
soc_camera: make videobuf independent
Makes SoC camera videobuf independent. Includes all necessary changes for
PXA camera driver (currently the only driver using soc_camera in the mainline).
These changes are important for the future soc_camera based drivers.
Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
Cc: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/media/soc_camera.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/include/media/soc_camera.h b/linux/include/media/soc_camera.h index 6a8c8be7a..b204c0dee 100644 --- a/linux/include/media/soc_camera.h +++ b/linux/include/media/soc_camera.h @@ -13,7 +13,7 @@ #define SOC_CAMERA_H #include <linux/videodev2.h> -#include <media/videobuf-dma-sg.h> +#include <media/videobuf-core.h> struct soc_camera_device { struct list_head list; @@ -55,8 +55,6 @@ struct soc_camera_host { struct list_head list; struct device dev; unsigned char nr; /* Host number */ - size_t msize; - struct videobuf_queue_ops *vbq_ops; void *priv; char *drv_name; struct soc_camera_host_ops *ops; @@ -69,6 +67,8 @@ struct soc_camera_host_ops { int (*set_fmt_cap)(struct soc_camera_device *, __u32, struct v4l2_rect *); int (*try_fmt_cap)(struct soc_camera_device *, struct v4l2_format *); + void (*init_videobuf)(struct videobuf_queue*, spinlock_t *, + struct soc_camera_device *); int (*reqbufs)(struct soc_camera_file *, struct v4l2_requestbuffers *); int (*querycap)(struct soc_camera_host *, struct v4l2_capability *); int (*try_bus_param)(struct soc_camera_device *, __u32); |