Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 76396
b: refs/heads/master
c: 39e75cf
h: refs/heads/master
v: v3
  • Loading branch information
Adrian Bunk authored and Mauro Carvalho Chehab committed Jan 25, 2008
1 parent d7e55d4 commit ec0f71d
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 81 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9695a49839353bdaff79fe27399be2eb72585223
refs/heads/master: 39e75cfedf5b40116136894241ca1182089f3637
2 changes: 0 additions & 2 deletions trunk/drivers/media/video/cx23885/cx23885-cards.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,6 @@ void cx23885_card_setup(struct cx23885_dev *dev)

/* ------------------------------------------------------------------ */

EXPORT_SYMBOL(cx23885_boards);

/*
* Local variables:
* c-basic-offset: 8
Expand Down
95 changes: 23 additions & 72 deletions trunk/drivers/media/video/cx23885/cx23885-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ static LIST_HEAD(cx23885_devlist);
* 0x00010ea0 0x00010xxx Free
*/

struct sram_channel cx23885_sram_channels[] = {
static struct sram_channel cx23885_sram_channels[] = {
[SRAM_CH01] = {
.name = "test ch1",
.cmds_start = 0x10000,
Expand Down Expand Up @@ -205,7 +205,7 @@ struct sram_channel cx23885_sram_channels[] = {
* 0x00010ea0 0x00010xxx Free
*/

struct sram_channel cx23887_sram_channels[] = {
static struct sram_channel cx23887_sram_channels[] = {
[SRAM_CH01] = {
.name = "test ch1",
.cmds_start = 0x0,
Expand Down Expand Up @@ -356,8 +356,8 @@ static int cx23885_risc_decode(u32 risc)
return incr[risc >> 28] ? incr[risc >> 28] : 1;
}

void cx23885_wakeup(struct cx23885_tsport *port,
struct cx23885_dmaqueue *q, u32 count)
static void cx23885_wakeup(struct cx23885_tsport *port,
struct cx23885_dmaqueue *q, u32 count)
{
struct cx23885_dev *dev = port->dev;
struct cx23885_buffer *buf;
Expand Down Expand Up @@ -391,12 +391,10 @@ void cx23885_wakeup(struct cx23885_tsport *port,
printk("%s: %d buffers handled (should be 1)\n",
__FUNCTION__, bc);
}
void cx23885_sram_channel_dump(struct cx23885_dev *dev,
struct sram_channel *ch);

int cx23885_sram_channel_setup(struct cx23885_dev *dev,
struct sram_channel *ch,
unsigned int bpl, u32 risc)
static int cx23885_sram_channel_setup(struct cx23885_dev *dev,
struct sram_channel *ch,
unsigned int bpl, u32 risc)
{
unsigned int i, lines;
u32 cdt;
Expand Down Expand Up @@ -467,8 +465,8 @@ int cx23885_sram_channel_setup(struct cx23885_dev *dev,
return 0;
}

void cx23885_sram_channel_dump(struct cx23885_dev *dev,
struct sram_channel *ch)
static void cx23885_sram_channel_dump(struct cx23885_dev *dev,
struct sram_channel *ch)
{
static char *name[] = {
"init risc lo",
Expand Down Expand Up @@ -529,8 +527,8 @@ void cx23885_sram_channel_dump(struct cx23885_dev *dev,
dev->name, cx_read(ch->cnt2_reg));
}

void cx23885_risc_disasm(struct cx23885_tsport *port,
struct btcx_riscmem *risc)
static void cx23885_risc_disasm(struct cx23885_tsport *port,
struct btcx_riscmem *risc)
{
struct cx23885_dev *dev = port->dev;
unsigned int i, j, n;
Expand All @@ -548,7 +546,7 @@ void cx23885_risc_disasm(struct cx23885_tsport *port,
}
}

void cx23885_shutdown(struct cx23885_dev *dev)
static void cx23885_shutdown(struct cx23885_dev *dev)
{
/* disable RISC controller */
cx_write(DEV_CNTRL2, 0);
Expand Down Expand Up @@ -578,7 +576,7 @@ void cx23885_shutdown(struct cx23885_dev *dev)

}

void cx23885_reset(struct cx23885_dev *dev)
static void cx23885_reset(struct cx23885_dev *dev)
{
dprintk(1, "%s()\n", __FUNCTION__);

Expand Down Expand Up @@ -636,8 +634,8 @@ static int get_resources(struct cx23885_dev *dev)
}

static void cx23885_timeout(unsigned long data);
int cx23885_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc,
u32 reg, u32 mask, u32 value);
static int cx23885_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc,
u32 reg, u32 mask, u32 value);

static int cx23885_init_tsport(struct cx23885_dev *dev, struct cx23885_tsport *port, int portno)
{
Expand Down Expand Up @@ -837,7 +835,7 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
return 0;
}

void cx23885_dev_unregister(struct cx23885_dev *dev)
static void cx23885_dev_unregister(struct cx23885_dev *dev)
{
release_mem_region(pci_resource_start(dev->pci,0),
pci_resource_len(dev->pci,0));
Expand Down Expand Up @@ -912,49 +910,12 @@ static u32* cx23885_risc_field(u32 *rp, struct scatterlist *sglist,
return rp;
}

int cx23885_risc_buffer(struct pci_dev *pci, struct btcx_riscmem *risc,
struct scatterlist *sglist, unsigned int top_offset,
unsigned int bottom_offset, unsigned int bpl,
unsigned int padding, unsigned int lines)
{
u32 instructions, fields;
u32 *rp;
int rc;

fields = 0;
if (UNSET != top_offset)
fields++;
if (UNSET != bottom_offset)
fields++;

/* estimate risc mem: worst case is one write per page border +
one write per scan line + syncs + jump (all 2 dwords). Padding
can cause next bpl to start close to a page border. First DMA
region may be smaller than PAGE_SIZE */
/* write and jump need and extra dword */
instructions = fields * (1 + ((bpl + padding) * lines) / PAGE_SIZE + lines);
instructions += 2;
if ((rc = btcx_riscmem_alloc(pci,risc,instructions*12)) < 0)
return rc;

/* write risc instructions */
rp = risc->cpu;
if (UNSET != top_offset)
rp = cx23885_risc_field(rp, sglist, top_offset, 0,
bpl, padding, lines);
if (UNSET != bottom_offset)
rp = cx23885_risc_field(rp, sglist, bottom_offset, 0x200,
bpl, padding, lines);

/* save pointer to jmp instruction address */
risc->jmp = rp;
BUG_ON((risc->jmp - risc->cpu + 2) * sizeof (*risc->cpu) > risc->size);
return 0;
}

int cx23885_risc_databuffer(struct pci_dev *pci, struct btcx_riscmem *risc,
struct scatterlist *sglist, unsigned int bpl,
unsigned int lines)
static int cx23885_risc_databuffer(struct pci_dev *pci,
struct btcx_riscmem *risc,
struct scatterlist *sglist,
unsigned int bpl,
unsigned int lines)
{
u32 instructions;
u32 *rp;
Expand All @@ -981,8 +942,8 @@ int cx23885_risc_databuffer(struct pci_dev *pci, struct btcx_riscmem *risc,
return 0;
}

int cx23885_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc,
u32 reg, u32 mask, u32 value)
static int cx23885_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc,
u32 reg, u32 mask, u32 value)
{
u32 *rp;
int rc;
Expand Down Expand Up @@ -1243,16 +1204,6 @@ static void do_cancel_buffers(struct cx23885_tsport *port, char *reason,
spin_unlock_irqrestore(&port->slock, flags);
}

void cx23885_cancel_buffers(struct cx23885_tsport *port)
{
struct cx23885_dev *dev = port->dev;
struct cx23885_dmaqueue *q = &port->mpegq;

dprintk(1, "%s()\n", __FUNCTION__);
del_timer_sync(&q->timeout);
cx23885_stop_dma(port);
do_cancel_buffers(port, "cancel", 0);
}

static void cx23885_timeout(unsigned long data)
{
Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/media/video/cx23885/cx23885-i2c.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,6 @@ int cx23885_i2c_unregister(struct cx23885_i2c *bus)

/* ----------------------------------------------------------------------- */

EXPORT_SYMBOL(cx23885_call_i2c_clients);

/*
* Local variables:
* c-basic-offset: 8
Expand Down
4 changes: 0 additions & 4 deletions trunk/drivers/media/video/cx23885/cx23885.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,10 +254,6 @@ struct sram_channel {
#define cx_set(reg,bit) cx_andor((reg),(bit),(bit))
#define cx_clear(reg,bit) cx_andor((reg),(bit),0)

extern int cx23885_sram_channel_setup(struct cx23885_dev *dev,
struct sram_channel *ch,
unsigned int bpl, u32 risc);

/* ----------------------------------------------------------- */
/* cx23885-cards.c */

Expand Down

0 comments on commit ec0f71d

Please sign in to comment.