diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-10 10:29:15 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-24 14:26:49 -0500 |
commit | c7b0ac0546985fc6361a8d92cf808d46da797677 (patch) | |
tree | 2147eb2f6dd7b2b82e0d7b4b9a26e12ef5193252 /drivers/media/video/cx88/cx88-alsa.c | |
parent | b2fd16b4ff2508ac16ae994f4bcd941f97754c00 (diff) |
V4L/DVB (3516): Make video_buf more generic
Video_buf were concerned to allow PCI devices to be used as
video capture devices. This patch extends video_buf features
by virtualizing pci-dependent functions and allowing other
type of devices to use it.
It is still DMA centric, although it may be used also by
devices that emulates scatter/gather behavior or a DMA device
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx88/cx88-alsa.c')
-rw-r--r-- | drivers/media/video/cx88/cx88-alsa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c index 3170b8f72c68..f9d87b86492c 100644 --- a/drivers/media/video/cx88/cx88-alsa.c +++ b/drivers/media/video/cx88/cx88-alsa.c | |||
@@ -303,7 +303,7 @@ static int dsp_buffer_free(snd_cx88_card_t *chip) | |||
303 | BUG_ON(!chip->dma_size); | 303 | BUG_ON(!chip->dma_size); |
304 | 304 | ||
305 | dprintk(2,"Freeing buffer\n"); | 305 | dprintk(2,"Freeing buffer\n"); |
306 | videobuf_dma_pci_unmap(chip->pci, &chip->dma_risc); | 306 | videobuf_pci_dma_unmap(chip->pci, &chip->dma_risc); |
307 | videobuf_dma_free(&chip->dma_risc); | 307 | videobuf_dma_free(&chip->dma_risc); |
308 | btcx_riscmem_free(chip->pci,&chip->buf->risc); | 308 | btcx_riscmem_free(chip->pci,&chip->buf->risc); |
309 | kfree(chip->buf); | 309 | kfree(chip->buf); |
@@ -429,7 +429,7 @@ static int snd_cx88_hw_params(struct snd_pcm_substream * substream, | |||
429 | videobuf_dma_init_kernel(&buf->vb.dma,PCI_DMA_FROMDEVICE, | 429 | videobuf_dma_init_kernel(&buf->vb.dma,PCI_DMA_FROMDEVICE, |
430 | (PAGE_ALIGN(buf->vb.size) >> PAGE_SHIFT)); | 430 | (PAGE_ALIGN(buf->vb.size) >> PAGE_SHIFT)); |
431 | 431 | ||
432 | videobuf_dma_pci_map(chip->pci,&buf->vb.dma); | 432 | videobuf_pci_dma_map(chip->pci,&buf->vb.dma); |
433 | 433 | ||
434 | 434 | ||
435 | cx88_risc_databuffer(chip->pci, &buf->risc, | 435 | cx88_risc_databuffer(chip->pci, &buf->risc, |