aboutsummaryrefslogtreecommitdiffstats
path: root/include/media/videobuf-core.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-10-08 11:20:02 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-09 23:03:14 -0400
commitd4cae5a50021271b9ef4e5e39e71e177d12fa8cb (patch)
tree75f3def69e6b35fc02e46af5661bb45aa006ba9d /include/media/videobuf-core.h
parentd5f1b01644b6fd5e9eb480a4762cd6b569cb1246 (diff)
V4L/DVB (6292): videobuf_core init always require callback implementation
In the past, videobuf_queue_init were used to initialize PCI DMA videobuffers. This patch renames it, to avoid confusion with the previous kernel API, doing: s/videobuf_queue_init/void videobuf_queue_core_init/ Also, the operations is now part of the function parameter. The function will also add a test if this is defined, otherwise producing BUG. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'include/media/videobuf-core.h')
-rw-r--r--include/media/videobuf-core.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h
index 9bae5a2eda66..9fa09fb800a1 100644
--- a/include/media/videobuf-core.h
+++ b/include/media/videobuf-core.h
@@ -181,14 +181,15 @@ int videobuf_iolock(struct videobuf_queue* q, struct videobuf_buffer *vb,
181 181
182void *videobuf_alloc(struct videobuf_queue* q); 182void *videobuf_alloc(struct videobuf_queue* q);
183 183
184void videobuf_queue_init(struct videobuf_queue *q, 184void videobuf_queue_core_init(struct videobuf_queue *q,
185 struct videobuf_queue_ops *ops, 185 struct videobuf_queue_ops *ops,
186 void *dev, 186 void *dev,
187 spinlock_t *irqlock, 187 spinlock_t *irqlock,
188 enum v4l2_buf_type type, 188 enum v4l2_buf_type type,
189 enum v4l2_field field, 189 enum v4l2_field field,
190 unsigned int msize, 190 unsigned int msize,
191 void *priv); 191 void *priv,
192 struct videobuf_qtype_ops *int_ops);
192int videobuf_queue_is_busy(struct videobuf_queue *q); 193int videobuf_queue_is_busy(struct videobuf_queue *q);
193void videobuf_queue_cancel(struct videobuf_queue *q); 194void videobuf_queue_cancel(struct videobuf_queue *q);
194 195