Skip to content

Commit

Permalink
V4L/DVB: V4L2 docs: replace spaces by tabs
Browse files Browse the repository at this point in the history
CC: Jonathan Corbet <corbet@lwn.net>
CC: Reviewed-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Mauro Carvalho Chehab committed Feb 26, 2010
1 parent 4b586a3 commit 7cae112
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 23 deletions.
1 change: 0 additions & 1 deletion Documentation/video4linux/v4l2-framework.txt
Original file line number Diff line number Diff line change
Expand Up @@ -609,4 +609,3 @@ scatter/gather method (videobuf-dma-sg), DMA with linear access

Please see Documentation/video4linux/videobuf for more information on how
to use the videobuf layer.

44 changes: 22 additions & 22 deletions Documentation/video4linux/videobuf
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,15 @@ then pass it to the appropriate free routine(s):

/* Scatter/gather drivers */
int videobuf_dma_unmap(struct videobuf_queue *q,
struct videobuf_dmabuf *dma);
struct videobuf_dmabuf *dma);
int videobuf_dma_free(struct videobuf_dmabuf *dma);

/* vmalloc drivers */
void videobuf_vmalloc_free (struct videobuf_buffer *buf);

/* Contiguous drivers */
void videobuf_dma_contig_free(struct videobuf_queue *q,
struct videobuf_buffer *buf);
struct videobuf_buffer *buf);

One way to ensure that a buffer is no longer under I/O is to pass it to:

Expand All @@ -138,21 +138,21 @@ first step is in the open() function, which must initialize the
videobuf queue. The function to use depends on the type of buffer used:

void videobuf_queue_sg_init(struct videobuf_queue *q,
struct videobuf_queue_ops *ops,
struct device *dev,
spinlock_t *irqlock,
enum v4l2_buf_type type,
enum v4l2_field field,
unsigned int msize,
void *priv);
struct videobuf_queue_ops *ops,
struct device *dev,
spinlock_t *irqlock,
enum v4l2_buf_type type,
enum v4l2_field field,
unsigned int msize,
void *priv);

void videobuf_queue_vmalloc_init(struct videobuf_queue *q,
struct videobuf_queue_ops *ops,
struct device *dev,
spinlock_t *irqlock,
enum v4l2_buf_type type,
enum v4l2_field field,
unsigned int msize,
struct videobuf_queue_ops *ops,
struct device *dev,
spinlock_t *irqlock,
enum v4l2_buf_type type,
enum v4l2_field field,
unsigned int msize,
void *priv);

void videobuf_queue_dma_contig_init(struct videobuf_queue *q,
Expand Down Expand Up @@ -183,11 +183,11 @@ easy to do that with the same code. To implement read(), the driver need
only make a call to one of:

ssize_t videobuf_read_one(struct videobuf_queue *q,
char __user *data, size_t count,
char __user *data, size_t count,
loff_t *ppos, int nonblocking);

ssize_t videobuf_read_stream(struct videobuf_queue *q,
char __user *data, size_t count,
char __user *data, size_t count,
loff_t *ppos, int vbihack, int nonblocking);

Either one of these functions will read frame data into data, returning the
Expand Down Expand Up @@ -240,15 +240,15 @@ the many ioctl() commands made available to user space. A number of these
calls. The relevant helper functions are:

int videobuf_reqbufs(struct videobuf_queue *q,
struct v4l2_requestbuffers *req);
struct v4l2_requestbuffers *req);
int videobuf_querybuf(struct videobuf_queue *q, struct v4l2_buffer *b);
int videobuf_qbuf(struct videobuf_queue *q, struct v4l2_buffer *b);
int videobuf_dqbuf(struct videobuf_queue *q, struct v4l2_buffer *b,
int nonblocking);
int videobuf_dqbuf(struct videobuf_queue *q, struct v4l2_buffer *b,
int nonblocking);
int videobuf_streamon(struct videobuf_queue *q);
int videobuf_streamoff(struct videobuf_queue *q);
int videobuf_cgmbuf(struct videobuf_queue *q, struct video_mbuf *mbuf,
int count);
int videobuf_cgmbuf(struct videobuf_queue *q, struct video_mbuf *mbuf,
int count);

So, for example, a VIDIOC_REQBUFS call turns into a call to the driver's
vidioc_reqbufs() callback which, in turn, usually only needs to locate the
Expand Down

0 comments on commit 7cae112

Please sign in to comment.