public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-21 06:50:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[media] saa7164: convert buffering structs to be more generic

Browse source 
Current structs assume transport, making a number of changes to
switch to generic functions allowing a smoother integration
for the analog encoder.

Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Steven Toth 2010-07-31 14:43:07 -03:00 • committed by Mauro Carvalho Chehab
parent 335961ca2e
commit add3f580a4
5 changed files with 178 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/media/video/saa7164/saa7164-api.c
View file

@ -24,7 +24,7 @@
#include "saa7164.h" #include "saa7164.h"
int saa7164_api_transition_port(struct saa7164_tsport *port, u8 mode) int saa7164_api_transition_port(struct saa7164_port *port, u8 mode)
{ {
int ret; int ret;
@ -63,7 +63,7 @@ int saa7164_api_read_eeprom(struct saa7164_dev *dev, u8 *buf, int buflen)
int saa7164_api_configure_port_mpeg2ts(struct saa7164_dev *dev, int saa7164_api_configure_port_mpeg2ts(struct saa7164_dev *dev,
struct saa7164_tsport *port, struct saa7164_port *port,
tmComResTSFormatDescrHeader_t *tsfmt) tmComResTSFormatDescrHeader_t *tsfmt)
{ {
dprintk(DBGLVL_API, " bFormatIndex = 0x%x\n", tsfmt->bFormatIndex); dprintk(DBGLVL_API, " bFormatIndex = 0x%x\n", tsfmt->bFormatIndex);
@ -98,7 +98,7 @@ int saa7164_api_configure_port_mpeg2ts(struct saa7164_dev *dev,
int saa7164_api_dump_subdevs(struct saa7164_dev *dev, u8 *buf, int len) int saa7164_api_dump_subdevs(struct saa7164_dev *dev, u8 *buf, int len)
{ {
struct saa7164_tsport *port = 0; struct saa7164_port *port = 0;
u32 idx, next_offset; u32 idx, next_offset;
int i; int i;
tmComResDescrHeader_t *hdr, *t; tmComResDescrHeader_t *hdr, *t;

129
drivers/media/video/saa7164/saa7164-buffer.c
View file

@ -66,12 +66,33 @@
| etc | etc
*/ */
void saa7164_buffer_display(struct saa7164_buffer *buf)
{
struct saa7164_dev *dev = buf->port->dev;
int i;
dprintk(DBGLVL_BUF, "%s() buffer @ 0x%p nr=%d\n",
__func__, buf, buf->idx);
dprintk(DBGLVL_BUF, " pci_cpu @ 0x%p dma @ 0x%p len = 0x%x\n",
buf->cpu, (void *)buf->dma, buf->pci_size);
dprintk(DBGLVL_BUF, " pt_cpu @ 0x%p pt_dma @ 0x%p len = 0x%x\n",
buf->pt_cpu, (void *)buf->pt_dma, buf->pt_size);
/* Format the Page Table Entries to point into the data buffer */
for (i = 0 ; i < SAA7164_PT_ENTRIES; i++) {
dprintk(DBGLVL_BUF, " pt[%02d] = 0x%p -> 0x%llx\n",
i, buf->pt_cpu, (u64)*(buf->pt_cpu));
}
}
/* Allocate a new buffer structure and associated PCI space in bytes. /* Allocate a new buffer structure and associated PCI space in bytes.
* len must be a multiple of sizeof(u64) * len must be a multiple of sizeof(u64)
*/ */
struct saa7164_buffer *saa7164_buffer_alloc(struct saa7164_tsport *port, struct saa7164_buffer *saa7164_buffer_alloc(struct saa7164_port *port,
u32 len) u32 len)
{ {
tmHWStreamParameters_t *params = &port->hw_streamingparams;
struct saa7164_buffer *buf = 0; struct saa7164_buffer *buf = 0;
struct saa7164_dev *dev = port->dev; struct saa7164_dev *dev = port->dev;
int i; int i;
@ -87,8 +108,11 @@ struct saa7164_buffer *saa7164_buffer_alloc(struct saa7164_tsport *port,
goto ret; goto ret;
} }
buf->idx = -1;
buf->port = port; buf->port = port;
buf->flags = SAA7164_BUFFER_FREE; buf->flags = SAA7164_BUFFER_FREE;
buf->pos = 0;
buf->actual_size = params->pitch * params->numberoflines;
/* TODO: arg len is being ignored */ /* TODO: arg len is being ignored */
buf->pci_size = SAA7164_PT_ENTRIES * 0x1000; buf->pci_size = SAA7164_PT_ENTRIES * 0x1000;
buf->pt_size = (SAA7164_PT_ENTRIES * sizeof(u64)) + 0x1000; buf->pt_size = (SAA7164_PT_ENTRIES * sizeof(u64)) + 0x1000;
@ -108,7 +132,8 @@ struct saa7164_buffer *saa7164_buffer_alloc(struct saa7164_tsport *port,
memset(buf->cpu, 0xff, buf->pci_size); memset(buf->cpu, 0xff, buf->pci_size);
memset(buf->pt_cpu, 0xff, buf->pt_size); memset(buf->pt_cpu, 0xff, buf->pt_size);
dprintk(DBGLVL_BUF, "%s() allocated buffer @ 0x%p\n", __func__, buf); dprintk(DBGLVL_BUF, "%s() allocated buffer @ 0x%p\n",
__func__, buf);
dprintk(DBGLVL_BUF, " pci_cpu @ 0x%p dma @ 0x%08lx len = 0x%x\n", dprintk(DBGLVL_BUF, " pci_cpu @ 0x%p dma @ 0x%08lx len = 0x%x\n",
buf->cpu, (long)buf->dma, buf->pci_size); buf->cpu, (long)buf->dma, buf->pci_size);
dprintk(DBGLVL_BUF, " pt_cpu @ 0x%p pt_dma @ 0x%08lx len = 0x%x\n", dprintk(DBGLVL_BUF, " pt_cpu @ 0x%p pt_dma @ 0x%08lx len = 0x%x\n",
@ -133,26 +158,110 @@ ret:
return buf; return buf;
} }
int saa7164_buffer_dealloc(struct saa7164_tsport *port, int saa7164_buffer_dealloc(struct saa7164_buffer *buf)
struct saa7164_buffer *buf)
{ {
struct saa7164_dev *dev; struct saa7164_dev *dev;
if (!buf || !port) if (!buf || !buf->port)
return SAA_ERR_BAD_PARAMETER; return SAA_ERR_BAD_PARAMETER;
dev = port->dev; dev = buf->port->dev;
dprintk(DBGLVL_BUF, "%s() deallocating buffer @ 0x%p\n", __func__, buf); dprintk(DBGLVL_BUF, "%s() deallocating buffer @ 0x%p\n",
__func__, buf);
if (buf->flags != SAA7164_BUFFER_FREE) if (buf->flags != SAA7164_BUFFER_FREE)
log_warn(" freeing a non-free buffer\n"); log_warn(" freeing a non-free buffer\n");
pci_free_consistent(port->dev->pci, buf->pci_size, buf->cpu, buf->dma); pci_free_consistent(dev->pci, buf->pci_size, buf->cpu, buf->dma);
pci_free_consistent(port->dev->pci, buf->pt_size, buf->pt_cpu, pci_free_consistent(dev->pci, buf->pt_size, buf->pt_cpu, buf->pt_dma);
buf->pt_dma);
kfree(buf); kfree(buf);
return SAA_OK; return SAA_OK;
} }
/* Write a buffer into the hardware */
int saa7164_buffer_activate(struct saa7164_buffer *buf, int i)
{
struct saa7164_port *port = buf->port;
struct saa7164_dev *dev = port->dev;
if ((i < 0) || (i >= port->hwcfg.buffercount))
return -EINVAL;
dprintk(DBGLVL_BUF, "%s(idx = %d)\n", __func__, i);
buf->idx = i; /* Note of which buffer list index position we occupy */
buf->flags = SAA7164_BUFFER_BUSY;
buf->pos = 0;
/* TODO: Review this in light of 32v64 assignments */
saa7164_writel(port->bufoffset + (sizeof(u32) * i), 0);
saa7164_writel(port->bufptr32h + ((sizeof(u32) * 2) * i), buf->pt_dma);
saa7164_writel(port->bufptr32l + ((sizeof(u32) * 2) * i), 0);
dprintk(DBGLVL_BUF, " buf[%d] offset 0x%llx (0x%x) "
"buf 0x%llx/%llx (0x%x/%x) nr=%d\n",
buf->idx,
(u64)port->bufoffset + (i * sizeof(u32)),
saa7164_readl(port->bufoffset + (sizeof(u32) * i)),
(u64)port->bufptr32h + ((sizeof(u32) * 2) * i),
(u64)port->bufptr32l + ((sizeof(u32) * 2) * i),
saa7164_readl(port->bufptr32h + ((sizeof(u32) * i) * 2)),
saa7164_readl(port->bufptr32l + ((sizeof(u32) * i) * 2)),
buf->idx);
return 0;
}
int saa7164_buffer_cfg_port(struct saa7164_port *port)
{
tmHWStreamParameters_t *params = &port->hw_streamingparams;
struct saa7164_dev *dev = port->dev;
struct saa7164_buffer *buf;
struct list_head *c, *n;
int i = 0;
dprintk(DBGLVL_BUF, "%s(port=%d)\n", __func__, port->nr);
saa7164_writel(port->bufcounter, 0);
saa7164_writel(port->pitch, params->pitch);
saa7164_writel(port->bufsize, params->pitch * params->numberoflines);
dprintk(DBGLVL_BUF, " configured:\n");
dprintk(DBGLVL_BUF, " lmmio 0x%p\n", dev->lmmio);
dprintk(DBGLVL_BUF, " bufcounter 0x%x = 0x%x\n", port->bufcounter,
saa7164_readl(port->bufcounter));
dprintk(DBGLVL_BUF, " pitch 0x%x = %d\n", port->pitch,
saa7164_readl(port->pitch));
dprintk(DBGLVL_BUF, " bufsize 0x%x = %d\n", port->bufsize,
saa7164_readl(port->bufsize));
dprintk(DBGLVL_BUF, " buffercount = %d\n", port->hwcfg.buffercount);
dprintk(DBGLVL_BUF, " bufoffset = 0x%x\n", port->bufoffset);
dprintk(DBGLVL_BUF, " bufptr32h = 0x%x\n", port->bufptr32h);
dprintk(DBGLVL_BUF, " bufptr32l = 0x%x\n", port->bufptr32l);
/* Poke the buffers and offsets into PCI space */
mutex_lock(&port->dmaqueue_lock);
list_for_each_safe(c, n, &port->dmaqueue.list) {
buf = list_entry(c, struct saa7164_buffer, list);
if (buf->flags != SAA7164_BUFFER_FREE)
BUG();
/* Place the buffer in the h/w queue */
saa7164_buffer_activate(buf, i);
/* Don't exceed the device maximum # bufs */
if (i++ > port->hwcfg.buffercount)
BUG();
}
mutex_unlock(&port->dmaqueue_lock);
return 0;
}

12
drivers/media/video/saa7164/saa7164-core.c
View file

@ -74,7 +74,7 @@ static void saa7164_work_cmdhandler(struct work_struct *w)
static void saa7164_buffer_deliver(struct saa7164_buffer *buf) static void saa7164_buffer_deliver(struct saa7164_buffer *buf)
{ {
struct saa7164_tsport *port = buf->port; struct saa7164_port *port = buf->port;
/* Feed the transport payload into the kernel demux */ /* Feed the transport payload into the kernel demux */
dvb_dmx_swfilter_packets(&port->dvb.demux, (u8 *)buf->cpu, dvb_dmx_swfilter_packets(&port->dvb.demux, (u8 *)buf->cpu,
@ -82,7 +82,7 @@ static void saa7164_buffer_deliver(struct saa7164_buffer *buf)
} }
static irqreturn_t saa7164_irq_ts(struct saa7164_tsport *port) static irqreturn_t saa7164_irq_ts(struct saa7164_port *port)
{ {
struct saa7164_dev *dev = port->dev; struct saa7164_dev *dev = port->dev;
struct saa7164_buffer *buf; struct saa7164_buffer *buf;
@ -107,7 +107,7 @@ static irqreturn_t saa7164_irq_ts(struct saa7164_tsport *port)
if (i++ > port->hwcfg.buffercount) if (i++ > port->hwcfg.buffercount)
BUG(); BUG();
if (buf->nr == rp) { if (buf->idx == rp) {
/* Found the buffer, deal with it */ /* Found the buffer, deal with it */
dprintk(DBGLVL_IRQ, "%s() wp: %d processing: %d\n", dprintk(DBGLVL_IRQ, "%s() wp: %d processing: %d\n",
__func__, wp, rp); __func__, wp, rp);
@ -446,20 +446,18 @@ static int saa7164_dev_setup(struct saa7164_dev *dev)
/* Transport port A Defaults / setup */ /* Transport port A Defaults / setup */
dev->ts1.dev = dev; dev->ts1.dev = dev;
dev->ts1.nr = 0; dev->ts1.nr = 0;
dev->ts1.type = SAA7164_MPEG_UNDEFINED;
mutex_init(&dev->ts1.dvb.lock); mutex_init(&dev->ts1.dvb.lock);
INIT_LIST_HEAD(&dev->ts1.dmaqueue.list); INIT_LIST_HEAD(&dev->ts1.dmaqueue.list);
INIT_LIST_HEAD(&dev->ts1.dummy_dmaqueue.list);
mutex_init(&dev->ts1.dmaqueue_lock); mutex_init(&dev->ts1.dmaqueue_lock);
mutex_init(&dev->ts1.dummy_dmaqueue_lock);
/* Transport port B Defaults / setup */ /* Transport port B Defaults / setup */
dev->ts2.dev = dev; dev->ts2.dev = dev;
dev->ts2.nr = 1; dev->ts2.nr = 1;
dev->ts2.type = SAA7164_MPEG_UNDEFINED;
mutex_init(&dev->ts2.dvb.lock); mutex_init(&dev->ts2.dvb.lock);
INIT_LIST_HEAD(&dev->ts2.dmaqueue.list); INIT_LIST_HEAD(&dev->ts2.dmaqueue.list);
INIT_LIST_HEAD(&dev->ts2.dummy_dmaqueue.list);
mutex_init(&dev->ts2.dmaqueue_lock); mutex_init(&dev->ts2.dmaqueue_lock);
mutex_init(&dev->ts2.dummy_dmaqueue_lock);
if (get_resources(dev) < 0) { if (get_resources(dev) < 0) {
printk(KERN_ERR "CORE %s No more PCIe resources for " printk(KERN_ERR "CORE %s No more PCIe resources for "

101
drivers/media/video/saa7164/saa7164-dvb.c
View file

@ -82,7 +82,7 @@ static struct s5h1411_config hauppauge_s5h1411_config = {
.mpeg_timing = S5H1411_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK, .mpeg_timing = S5H1411_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK,
}; };
static int saa7164_dvb_stop_tsport(struct saa7164_tsport *port) static int saa7164_dvb_stop_port(struct saa7164_port *port)
{ {
struct saa7164_dev *dev = port->dev; struct saa7164_dev *dev = port->dev;
int ret; int ret;
@ -100,7 +100,7 @@ static int saa7164_dvb_stop_tsport(struct saa7164_tsport *port)
return ret; return ret;
} }
static int saa7164_dvb_acquire_tsport(struct saa7164_tsport *port) static int saa7164_dvb_acquire_port(struct saa7164_port *port)
{ {
struct saa7164_dev *dev = port->dev; struct saa7164_dev *dev = port->dev;
int ret; int ret;
@ -118,7 +118,7 @@ static int saa7164_dvb_acquire_tsport(struct saa7164_tsport *port)
return ret; return ret;
} }
static int saa7164_dvb_pause_tsport(struct saa7164_tsport *port) static int saa7164_dvb_pause_port(struct saa7164_port *port)
{ {
struct saa7164_dev *dev = port->dev; struct saa7164_dev *dev = port->dev;
int ret; int ret;
@ -140,90 +140,28 @@ static int saa7164_dvb_pause_tsport(struct saa7164_tsport *port)
* the part through AVStream / KS Windows stages, forwards or backwards. * the part through AVStream / KS Windows stages, forwards or backwards.
* States are: stopped, acquired (h/w), paused, started. * States are: stopped, acquired (h/w), paused, started.
*/ */
static int saa7164_dvb_stop_streaming(struct saa7164_tsport *port) static int saa7164_dvb_stop_streaming(struct saa7164_port *port)
{ {
struct saa7164_dev *dev = port->dev; struct saa7164_dev *dev = port->dev;
int ret; int ret;
dprintk(DBGLVL_DVB, "%s(port=%d)\n", __func__, port->nr); dprintk(DBGLVL_DVB, "%s(port=%d)\n", __func__, port->nr);
ret = saa7164_dvb_pause_tsport(port); ret = saa7164_dvb_pause_port(port);
ret = saa7164_dvb_acquire_tsport(port); ret = saa7164_dvb_acquire_port(port);
ret = saa7164_dvb_stop_tsport(port); ret = saa7164_dvb_stop_port(port);
return ret; return ret;
} }
static int saa7164_dvb_cfg_tsport(struct saa7164_tsport *port) static int saa7164_dvb_start_port(struct saa7164_port *port)
{
tmHWStreamParameters_t *params = &port->hw_streamingparams;
struct saa7164_dev *dev = port->dev;
struct saa7164_buffer *buf;
struct list_head *c, *n;
int i = 0;
dprintk(DBGLVL_DVB, "%s(port=%d)\n", __func__, port->nr);
saa7164_writel(port->pitch, params->pitch);
saa7164_writel(port->bufsize, params->pitch * params->numberoflines);
dprintk(DBGLVL_DVB, " configured:\n");
dprintk(DBGLVL_DVB, " lmmio 0x%p\n", dev->lmmio);
dprintk(DBGLVL_DVB, " bufcounter 0x%x = 0x%x\n", port->bufcounter,
saa7164_readl(port->bufcounter));
dprintk(DBGLVL_DVB, " pitch 0x%x = %d\n", port->pitch,
saa7164_readl(port->pitch));
dprintk(DBGLVL_DVB, " bufsize 0x%x = %d\n", port->bufsize,
saa7164_readl(port->bufsize));
dprintk(DBGLVL_DVB, " buffercount = %d\n", port->hwcfg.buffercount);
dprintk(DBGLVL_DVB, " bufoffset = 0x%x\n", port->bufoffset);
dprintk(DBGLVL_DVB, " bufptr32h = 0x%x\n", port->bufptr32h);
dprintk(DBGLVL_DVB, " bufptr32l = 0x%x\n", port->bufptr32l);
/* Poke the buffers and offsets into PCI space */
mutex_lock(&port->dmaqueue_lock);
list_for_each_safe(c, n, &port->dmaqueue.list) {
buf = list_entry(c, struct saa7164_buffer, list);
/* TODO: Review this in light of 32v64 assignments */
saa7164_writel(port->bufoffset + (sizeof(u32) * i), 0);
saa7164_writel(port->bufptr32h + ((sizeof(u32) * 2) * i),
buf->pt_dma);
saa7164_writel(port->bufptr32l + ((sizeof(u32) * 2) * i), 0);
dprintk(DBGLVL_DVB,
" buf[%d] offset 0x%llx (0x%x) "
"buf 0x%llx/%llx (0x%x/%x)\n",
i,
(u64)port->bufoffset + (i * sizeof(u32)),
saa7164_readl(port->bufoffset + (sizeof(u32) * i)),
(u64)port->bufptr32h + ((sizeof(u32) * 2) * i),
(u64)port->bufptr32l + ((sizeof(u32) * 2) * i),
saa7164_readl(port->bufptr32h + ((sizeof(u32) * i)
* 2)),
saa7164_readl(port->bufptr32l + ((sizeof(u32) * i)
* 2)));
if (i++ > port->hwcfg.buffercount)
BUG();
}
mutex_unlock(&port->dmaqueue_lock);
return 0;
}
static int saa7164_dvb_start_tsport(struct saa7164_tsport *port)
{ {
struct saa7164_dev *dev = port->dev; struct saa7164_dev *dev = port->dev;
int ret = 0, result; int ret = 0, result;
dprintk(DBGLVL_DVB, "%s(port=%d)\n", __func__, port->nr); dprintk(DBGLVL_DVB, "%s(port=%d)\n", __func__, port->nr);
saa7164_dvb_cfg_tsport(port); saa7164_buffer_cfg_port(port);
/* Acquire the hardware */ /* Acquire the hardware */
result = saa7164_api_transition_port(port, SAA_DMASTATE_ACQUIRE); result = saa7164_api_transition_port(port, SAA_DMASTATE_ACQUIRE);
@ -284,7 +222,7 @@ out:
static int saa7164_dvb_start_feed(struct dvb_demux_feed *feed) static int saa7164_dvb_start_feed(struct dvb_demux_feed *feed)
{ {
struct dvb_demux *demux = feed->demux; struct dvb_demux *demux = feed->demux;
struct saa7164_tsport *port = (struct saa7164_tsport *) demux->priv; struct saa7164_port *port = (struct saa7164_port *) demux->priv;
struct saa7164_dvb *dvb = &port->dvb; struct saa7164_dvb *dvb = &port->dvb;
struct saa7164_dev *dev = port->dev; struct saa7164_dev *dev = port->dev;
int ret = 0; int ret = 0;
@ -298,7 +236,7 @@ static int saa7164_dvb_start_feed(struct dvb_demux_feed *feed)
mutex_lock(&dvb->lock); mutex_lock(&dvb->lock);
if (dvb->feeding++ == 0) { if (dvb->feeding++ == 0) {
/* Start transport */ /* Start transport */
ret = saa7164_dvb_start_tsport(port); ret = saa7164_dvb_start_port(port);
} }
mutex_unlock(&dvb->lock); mutex_unlock(&dvb->lock);
dprintk(DBGLVL_DVB, "%s(port=%d) now feeding = %d\n", dprintk(DBGLVL_DVB, "%s(port=%d) now feeding = %d\n",
@ -311,7 +249,7 @@ static int saa7164_dvb_start_feed(struct dvb_demux_feed *feed)
static int saa7164_dvb_stop_feed(struct dvb_demux_feed *feed) static int saa7164_dvb_stop_feed(struct dvb_demux_feed *feed)
{ {
struct dvb_demux *demux = feed->demux; struct dvb_demux *demux = feed->demux;
struct saa7164_tsport *port = (struct saa7164_tsport *) demux->priv; struct saa7164_port *port = (struct saa7164_port *) demux->priv;
struct saa7164_dvb *dvb = &port->dvb; struct saa7164_dvb *dvb = &port->dvb;
struct saa7164_dev *dev = port->dev; struct saa7164_dev *dev = port->dev;
int ret = 0; int ret = 0;
@ -332,7 +270,7 @@ static int saa7164_dvb_stop_feed(struct dvb_demux_feed *feed)
return ret; return ret;
} }
static int dvb_register(struct saa7164_tsport *port) static int dvb_register(struct saa7164_port *port)
{ {
struct saa7164_dvb *dvb = &port->dvb; struct saa7164_dvb *dvb = &port->dvb;
struct saa7164_dev *dev = port->dev; struct saa7164_dev *dev = port->dev;
@ -341,6 +279,9 @@ static int dvb_register(struct saa7164_tsport *port)
dprintk(DBGLVL_DVB, "%s(port=%d)\n", __func__, port->nr); dprintk(DBGLVL_DVB, "%s(port=%d)\n", __func__, port->nr);
if (port->type != SAA7164_MPEG_DVB)
BUG();
/* Sanity check that the PCI configuration space is active */ /* Sanity check that the PCI configuration space is active */
if (port->hwcfg.BARLocation == 0) { if (port->hwcfg.BARLocation == 0) {
result = -ENOMEM; result = -ENOMEM;
@ -378,7 +319,6 @@ static int dvb_register(struct saa7164_tsport *port)
DRIVER_NAME, result); DRIVER_NAME, result);
goto fail_adapter; goto fail_adapter;
} }
buf->nr = i;
mutex_lock(&port->dmaqueue_lock); mutex_lock(&port->dmaqueue_lock);
list_add_tail(&buf->list, &port->dmaqueue.list); list_add_tail(&buf->list, &port->dmaqueue.list);
@ -473,7 +413,7 @@ fail_adapter:
return result; return result;
} }
int saa7164_dvb_unregister(struct saa7164_tsport *port) int saa7164_dvb_unregister(struct saa7164_port *port)
{ {
struct saa7164_dvb *dvb = &port->dvb; struct saa7164_dvb *dvb = &port->dvb;
struct saa7164_dev *dev = port->dev; struct saa7164_dev *dev = port->dev;
@ -482,12 +422,15 @@ int saa7164_dvb_unregister(struct saa7164_tsport *port)
dprintk(DBGLVL_DVB, "%s()\n", __func__); dprintk(DBGLVL_DVB, "%s()\n", __func__);
if (port->type != SAA7164_MPEG_DVB)
BUG();
/* Remove any allocated buffers */ /* Remove any allocated buffers */
mutex_lock(&port->dmaqueue_lock); mutex_lock(&port->dmaqueue_lock);
list_for_each_safe(c, n, &port->dmaqueue.list) { list_for_each_safe(c, n, &port->dmaqueue.list) {
b = list_entry(c, struct saa7164_buffer, list); b = list_entry(c, struct saa7164_buffer, list);
list_del(c); list_del(c);
saa7164_buffer_dealloc(port, b); saa7164_buffer_dealloc(b);
} }
mutex_unlock(&port->dmaqueue_lock); mutex_unlock(&port->dmaqueue_lock);
@ -508,7 +451,7 @@ int saa7164_dvb_unregister(struct saa7164_tsport *port)
/* All the DVB attach calls go here, this function get's modified /* All the DVB attach calls go here, this function get's modified
* for each new card. * for each new card.
*/ */
int saa7164_dvb_register(struct saa7164_tsport *port) int saa7164_dvb_register(struct saa7164_port *port)
{ {
struct saa7164_dev *dev = port->dev; struct saa7164_dev *dev = port->dev;
struct saa7164_dvb *dvb = &port->dvb; struct saa7164_dvb *dvb = &port->dvb;

46
drivers/media/video/saa7164/saa7164.h
View file

@ -91,6 +91,7 @@
enum port_t { enum port_t {
SAA7164_MPEG_UNDEFINED = 0, SAA7164_MPEG_UNDEFINED = 0,
SAA7164_MPEG_DVB, SAA7164_MPEG_DVB,
SAA7164_MPEG_ENCODER,
}; };
enum saa7164_i2c_bus_nr { enum saa7164_i2c_bus_nr {
@ -192,14 +193,15 @@ struct saa7164_i2c {
u32 i2c_rc; u32 i2c_rc;
}; };
struct saa7164_tsport; struct saa7164_port;
struct saa7164_buffer { struct saa7164_buffer {
struct list_head list; struct list_head list;
u32 nr; /* Note of which h/w buffer list index position we occupy */
int idx;
struct saa7164_tsport *port; struct saa7164_port *port;
/* Hardware Specific */ /* Hardware Specific */
/* PCI Memory allocations */ /* PCI Memory allocations */
@ -214,17 +216,21 @@ struct saa7164_buffer {
u32 pt_size; /* PCI allocation size in bytes */ u32 pt_size; /* PCI allocation size in bytes */
u64 *pt_cpu; /* Virtual address */ u64 *pt_cpu; /* Virtual address */
dma_addr_t pt_dma; /* Physical address */ dma_addr_t pt_dma; /* Physical address */
/* Encoder fops */
u32 pos;
u32 actual_size;
}; };
struct saa7164_tsport { struct saa7164_port {
struct saa7164_dev *dev; struct saa7164_dev *dev;
int nr;
enum port_t type; enum port_t type;
int nr;
struct saa7164_dvb dvb; /* --- Generic port attributes --- */
/* HW related stream parameters */ /* HW stream parameters */
tmHWStreamParameters_t hw_streamingparams; tmHWStreamParameters_t hw_streamingparams;
/* DMA configuration values, is seeded during initialization */ /* DMA configuration values, is seeded during initialization */
@ -240,10 +246,14 @@ struct saa7164_tsport {
u64 bufptr64; u64 bufptr64;
u32 numpte; /* Number of entries in array, only valid in head */ u32 numpte; /* Number of entries in array, only valid in head */
struct mutex dmaqueue_lock; struct mutex dmaqueue_lock;
struct mutex dummy_dmaqueue_lock;
struct saa7164_buffer dmaqueue; struct saa7164_buffer dmaqueue;
struct saa7164_buffer dummy_dmaqueue;
/* --- DVB Transport Specific --- */
struct saa7164_dvb dvb;
/* --- Encoder/V4L related attributes --- */
}; };
@ -287,7 +297,7 @@ struct saa7164_dev {
struct saa7164_i2c i2c_bus[3]; struct saa7164_i2c i2c_bus[3];
/* Transport related */ /* Transport related */
struct saa7164_tsport ts1, ts2; struct saa7164_port ts1, ts2;
/* Deferred command/api interrupts handling */ /* Deferred command/api interrupts handling */
struct work_struct workcmd; struct work_struct workcmd;
@ -344,7 +354,7 @@ int saa7164_api_dif_write(struct saa7164_i2c *bus, u8 addr,
int saa7164_api_read_eeprom(struct saa7164_dev *dev, u8 *buf, int buflen); int saa7164_api_read_eeprom(struct saa7164_dev *dev, u8 *buf, int buflen);
int saa7164_api_set_gpiobit(struct saa7164_dev *dev, u8 unitid, u8 pin); int saa7164_api_set_gpiobit(struct saa7164_dev *dev, u8 unitid, u8 pin);
int saa7164_api_clear_gpiobit(struct saa7164_dev *dev, u8 unitid, u8 pin); int saa7164_api_clear_gpiobit(struct saa7164_dev *dev, u8 unitid, u8 pin);
int saa7164_api_transition_port(struct saa7164_tsport *port, u8 mode); int saa7164_api_transition_port(struct saa7164_port *port, u8 mode);
/* ----------------------------------------------------------- */ /* ----------------------------------------------------------- */
/* saa7164-cards.c */ /* saa7164-cards.c */
@ -364,15 +374,17 @@ extern char *saa7164_unitid_name(struct saa7164_dev *dev, u8 unitid);
/* ----------------------------------------------------------- */ /* ----------------------------------------------------------- */
/* saa7164-dvb.c */ /* saa7164-dvb.c */
extern int saa7164_dvb_register(struct saa7164_tsport *port); extern int saa7164_dvb_register(struct saa7164_port *port);
extern int saa7164_dvb_unregister(struct saa7164_tsport *port); extern int saa7164_dvb_unregister(struct saa7164_port *port);
/* ----------------------------------------------------------- */ /* ----------------------------------------------------------- */
/* saa7164-buffer.c */ /* saa7164-buffer.c */
extern struct saa7164_buffer *saa7164_buffer_alloc(struct saa7164_tsport *port, extern struct saa7164_buffer *saa7164_buffer_alloc(
u32 len); struct saa7164_port *port, u32 len);
extern int saa7164_buffer_dealloc(struct saa7164_tsport *port, extern int saa7164_buffer_dealloc(struct saa7164_buffer *buf);
struct saa7164_buffer *buf); extern void saa7164_buffer_display(struct saa7164_buffer *buf);
extern int saa7164_buffer_activate(struct saa7164_buffer *buf, int i);
extern int saa7164_buffer_cfg_port(struct saa7164_port *port);
/* ----------------------------------------------------------- */ /* ----------------------------------------------------------- */