aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorPaulius Zaleckas <paulius.zaleckas@teltonika.lt>2008-07-11 19:50:31 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 06:25:17 -0400
commit092d3921195c4553a1818e698cee7a281ab361f4 (patch)
treedc888fdf713a8b4736b622be9e5b94ec23c76872 /include/media
parent439d0e4250b6fc9df3fc9183db38cf8a23d4ad93 (diff)
V4L/DVB (8337): 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> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/soc_camera.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index 6a8c8be7a1ae..b204c0dee956 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -13,7 +13,7 @@
13#define SOC_CAMERA_H 13#define SOC_CAMERA_H
14 14
15#include <linux/videodev2.h> 15#include <linux/videodev2.h>
16#include <media/videobuf-dma-sg.h> 16#include <media/videobuf-core.h>
17 17
18struct soc_camera_device { 18struct soc_camera_device {
19 struct list_head list; 19 struct list_head list;
@@ -55,8 +55,6 @@ struct soc_camera_host {
55 struct list_head list; 55 struct list_head list;
56 struct device dev; 56 struct device dev;
57 unsigned char nr; /* Host number */ 57 unsigned char nr; /* Host number */
58 size_t msize;
59 struct videobuf_queue_ops *vbq_ops;
60 void *priv; 58 void *priv;
61 char *drv_name; 59 char *drv_name;
62 struct soc_camera_host_ops *ops; 60 struct soc_camera_host_ops *ops;
@@ -69,6 +67,8 @@ struct soc_camera_host_ops {
69 int (*set_fmt_cap)(struct soc_camera_device *, __u32, 67 int (*set_fmt_cap)(struct soc_camera_device *, __u32,
70 struct v4l2_rect *); 68 struct v4l2_rect *);
71 int (*try_fmt_cap)(struct soc_camera_device *, struct v4l2_format *); 69 int (*try_fmt_cap)(struct soc_camera_device *, struct v4l2_format *);
70 void (*init_videobuf)(struct videobuf_queue*, spinlock_t *,
71 struct soc_camera_device *);
72 int (*reqbufs)(struct soc_camera_file *, struct v4l2_requestbuffers *); 72 int (*reqbufs)(struct soc_camera_file *, struct v4l2_requestbuffers *);
73 int (*querycap)(struct soc_camera_host *, struct v4l2_capability *); 73 int (*querycap)(struct soc_camera_host *, struct v4l2_capability *);
74 int (*try_bus_param)(struct soc_camera_device *, __u32); 74 int (*try_bus_param)(struct soc_camera_device *, __u32);