diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-23 15:37:49 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-09 21:14:55 -0400 |
commit | c1accaa21bdef38ec0f36eaaf7ce3384fff9d0c5 (patch) | |
tree | 3a2c8206555af6c9e2eecdb20b052be70e6b93dd /drivers/media/common/saa7146_vbi.c | |
parent | 7a7d9a89d0307b1743d782197e2c5fc5ddf183f3 (diff) |
V4L/DVB (6252): Adapt drivers to use the newer videobuf modules
PCI-dependent videobuf_foo methods were renamed as videobuf_pci_foo.
Also, videobuf_dmabuf is now part of videobuf-dma-sg private struct.
So, to access it, a subroutine call is needed.
This patch renames all occurences of those function calls to be
consistent with the video-buf split.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
http://thread.gmane.org/gmane.comp.video.video4linux/34978/focus=34981
Reviewed-by: Ricardo Cerqueira <v4l@cerqueira.org>
Diffstat (limited to 'drivers/media/common/saa7146_vbi.c')
-rw-r--r-- | drivers/media/common/saa7146_vbi.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/media/common/saa7146_vbi.c b/drivers/media/common/saa7146_vbi.c index 063608462ebe..6103484e4442 100644 --- a/drivers/media/common/saa7146_vbi.c +++ b/drivers/media/common/saa7146_vbi.c | |||
@@ -165,7 +165,7 @@ static void saa7146_set_vbi_capture(struct saa7146_dev *dev, struct saa7146_buf | |||
165 | /* we don't wait here for the first field anymore. this is different from the video | 165 | /* we don't wait here for the first field anymore. this is different from the video |
166 | capture and might cause that the first buffer is only half filled (with only | 166 | capture and might cause that the first buffer is only half filled (with only |
167 | one field). but since this is some sort of streaming data, this is not that negative. | 167 | one field). but since this is some sort of streaming data, this is not that negative. |
168 | but by doing this, we can use the whole engine from video-buf.c... */ | 168 | but by doing this, we can use the whole engine from videobuf-dma-sg.c... */ |
169 | 169 | ||
170 | /* | 170 | /* |
171 | WRITE_RPS1(CMD_PAUSE | CMD_OAN | CMD_SIG1 | e_wait); | 171 | WRITE_RPS1(CMD_PAUSE | CMD_OAN | CMD_SIG1 | e_wait); |
@@ -239,6 +239,8 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,e | |||
239 | saa7146_dma_free(dev,q,buf); | 239 | saa7146_dma_free(dev,q,buf); |
240 | 240 | ||
241 | if (STATE_NEEDS_INIT == buf->vb.state) { | 241 | if (STATE_NEEDS_INIT == buf->vb.state) { |
242 | struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb); | ||
243 | |||
242 | buf->vb.width = llength; | 244 | buf->vb.width = llength; |
243 | buf->vb.height = lines; | 245 | buf->vb.height = lines; |
244 | buf->vb.size = size; | 246 | buf->vb.size = size; |
@@ -250,7 +252,8 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,e | |||
250 | err = videobuf_iolock(q,&buf->vb, NULL); | 252 | err = videobuf_iolock(q,&buf->vb, NULL); |
251 | if (err) | 253 | if (err) |
252 | goto oops; | 254 | goto oops; |
253 | err = saa7146_pgtable_build_single(dev->pci, &buf->pt[2], buf->vb.dma.sglist, buf->vb.dma.sglen); | 255 | err = saa7146_pgtable_build_single(dev->pci, &buf->pt[2], |
256 | dma->sglist, dma->sglen); | ||
254 | if (0 != err) | 257 | if (0 != err) |
255 | return err; | 258 | return err; |
256 | } | 259 | } |
@@ -404,7 +407,7 @@ static int vbi_open(struct saa7146_dev *dev, struct file *file) | |||
404 | fh->vbi_fmt.start[1] = 312; | 407 | fh->vbi_fmt.start[1] = 312; |
405 | fh->vbi_fmt.count[1] = 16; | 408 | fh->vbi_fmt.count[1] = 16; |
406 | 409 | ||
407 | videobuf_queue_init(&fh->vbi_q, &vbi_qops, | 410 | videobuf_queue_pci_init(&fh->vbi_q, &vbi_qops, |
408 | dev->pci, &dev->slock, | 411 | dev->pci, &dev->slock, |
409 | V4L2_BUF_TYPE_VBI_CAPTURE, | 412 | V4L2_BUF_TYPE_VBI_CAPTURE, |
410 | V4L2_FIELD_SEQ_TB, // FIXME: does this really work? | 413 | V4L2_FIELD_SEQ_TB, // FIXME: does this really work? |