V4L/DVB (6162): cx23885: whitespace cleanups
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Michael Krufky
Mauro Carvalho Chehab
parent
70ebd70573
commit
44a6481dcd
5 changed files with 210 additions and 182 deletions
|
|
@ -171,7 +171,8 @@ void cx23885_card_setup(struct cx23885_dev *dev)
|
|||
|
||||
if (dev->i2c_bus[0].i2c_rc == 0) {
|
||||
dev->i2c_bus[0].i2c_client.addr = 0xa0 >> 1;
|
||||
tveeprom_read(&dev->i2c_bus[0].i2c_client, eeprom, sizeof(eeprom));
|
||||
tveeprom_read(&dev->i2c_bus[0].i2c_client,
|
||||
eeprom, sizeof(eeprom));
|
||||
}
|
||||
|
||||
switch (dev->board) {
|
||||
|
|
|
|||
|
|
@ -386,7 +386,8 @@ void cx23885_wakeup(struct cx23885_tsport *port,
|
|||
mod_timer(&q->timeout, jiffies + BUFFER_TIMEOUT);
|
||||
}
|
||||
if (bc != 1)
|
||||
printk("%s: %d buffers handled (should be 1)\n",__FUNCTION__,bc);
|
||||
printk("%s: %d buffers handled (should be 1)\n",
|
||||
__FUNCTION__, bc);
|
||||
}
|
||||
void cx23885_sram_channel_dump(struct cx23885_dev *dev,
|
||||
struct sram_channel *ch);
|
||||
|
|
@ -400,14 +401,16 @@ int cx23885_sram_channel_setup(struct cx23885_dev *dev,
|
|||
|
||||
if (ch->cmds_start == 0)
|
||||
{
|
||||
dprintk(1, "%s() Erasing channel [%s]\n",__FUNCTION__, ch->name);
|
||||
dprintk(1, "%s() Erasing channel [%s]\n", __FUNCTION__,
|
||||
ch->name);
|
||||
cx_write(ch->ptr1_reg, 0);
|
||||
cx_write(ch->ptr2_reg, 0);
|
||||
cx_write(ch->cnt2_reg, 0);
|
||||
cx_write(ch->cnt1_reg, 0);
|
||||
return 0;
|
||||
} else {
|
||||
dprintk(1, "%s() Configuring channel [%s]\n",__FUNCTION__, ch->name);
|
||||
dprintk(1, "%s() Configuring channel [%s]\n", __FUNCTION__,
|
||||
ch->name);
|
||||
}
|
||||
|
||||
bpl = (bpl + 7) & ~7; /* alignment */
|
||||
|
|
@ -423,7 +426,8 @@ int cx23885_sram_channel_setup(struct cx23885_dev *dev,
|
|||
|
||||
/* write CDT */
|
||||
for (i = 0; i < lines; i++) {
|
||||
dprintk(2, "%s() 0x%08x <- 0x%08x\n", __FUNCTION__, cdt + 16*i, ch->fifo_start + bpl*i);
|
||||
dprintk(2, "%s() 0x%08x <- 0x%08x\n", __FUNCTION__, cdt + 16*i,
|
||||
ch->fifo_start + bpl*i);
|
||||
cx_write(cdt + 16*i, ch->fifo_start + bpl*i);
|
||||
cx_write(cdt + 16*i + 4, 0);
|
||||
cx_write(cdt + 16*i + 8, 0);
|
||||
|
|
@ -496,8 +500,11 @@ void cx23885_sram_channel_dump(struct cx23885_dev *dev,
|
|||
cx23885_risc_decode(risc);
|
||||
}
|
||||
for (i = 0; i < (64 >> 2); i += n) {
|
||||
risc = cx_read(ch->ctrl_start + 4 * i); /* No consideration for bits 63-32 */
|
||||
printk("%s: (0x%08x) iq %x: ", dev->name, ch->ctrl_start + 4 * i, i);
|
||||
risc = cx_read(ch->ctrl_start + 4 * i);
|
||||
/* No consideration for bits 63-32 */
|
||||
|
||||
printk("%s: (0x%08x) iq %x: ", dev->name,
|
||||
ch->ctrl_start + 4 * i, i);
|
||||
n = cx23885_risc_decode(risc);
|
||||
for (j = 1; j < n; j++) {
|
||||
risc = cx_read(ch->ctrl_start + 4 * (i + j));
|
||||
|
|
@ -520,7 +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)
|
||||
void cx23885_risc_disasm(struct cx23885_tsport *port,
|
||||
struct btcx_riscmem *risc)
|
||||
{
|
||||
struct cx23885_dev *dev = port->dev;
|
||||
unsigned int i, j, n;
|
||||
|
|
@ -726,7 +734,8 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
|
|||
dev->ts2.gen_ctrl_val = 0xc; /* Serial bus + punctured clock */
|
||||
dev->ts2.ts_clk_en_val = 0x1; /* Enable TS_CLK */
|
||||
|
||||
cx23885_risc_stopper(dev->pci, &dev->ts2.mpegq.stopper, dev->ts2.reg_dma_ctl, dev->ts2.dma_ctl_val, 0x00);
|
||||
cx23885_risc_stopper(dev->pci, &dev->ts2.mpegq.stopper,
|
||||
dev->ts2.reg_dma_ctl, dev->ts2.dma_ctl_val, 0x00);
|
||||
|
||||
sprintf(dev->name, "cx23885[%d]", dev->nr);
|
||||
|
||||
|
|
@ -779,7 +788,8 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
|
|||
dev->bridge = CX23885_BRIDGE_885;
|
||||
dev->sram_channels = cx23885_sram_channels;
|
||||
}
|
||||
dprintk(1, "%s() Memory configured for PCIe bridge type %d\n", __FUNCTION__, dev->bridge);
|
||||
dprintk(1, "%s() Memory configured for PCIe bridge type %d\n",
|
||||
__FUNCTION__, dev->bridge);
|
||||
|
||||
/* init hardware */
|
||||
cx23885_reset(dev);
|
||||
|
|
@ -793,7 +803,8 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
|
|||
cx23885_ir_init(dev);
|
||||
|
||||
if (cx23885_dvb_register(&dev->ts2) < 0) {
|
||||
printk(KERN_ERR "%s() Failed to register dvb adapters\n", __FUNCTION__);
|
||||
printk(KERN_ERR "%s() Failed to register dvb adapters\n",
|
||||
__FUNCTION__);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
@ -874,9 +885,9 @@ static u32* cx23885_risc_field(u32 *rp, struct scatterlist *sglist,
|
|||
}
|
||||
|
||||
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)
|
||||
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;
|
||||
|
|
@ -998,8 +1009,8 @@ static int cx23885_start_dma(struct cx23885_tsport *port,
|
|||
cx_write(port->reg_lngth, buf->vb.width);
|
||||
|
||||
if (!(cx23885_boards[dev->board].portc & CX23885_MPEG_DVB)) {
|
||||
printk( "%s() Failed. Unsupported value in .portc (0x%08x)\n", __FUNCTION__,
|
||||
cx23885_boards[dev->board].portc );
|
||||
printk( "%s() Failed. Unsupported value in .portc (0x%08x)\n",
|
||||
__FUNCTION__, cx23885_boards[dev->board].portc );
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
|
@ -1017,7 +1028,8 @@ static int cx23885_start_dma(struct cx23885_tsport *port,
|
|||
case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
|
||||
case CX23885_BOARD_HAUPPAUGE_HVR1800:
|
||||
cx_write(port->reg_vld_misc, 0x00);
|
||||
dprintk(1, "%s() Configuring HVR1800/lp/1500 board\n", __FUNCTION__);
|
||||
dprintk(1, "%s() Configuring HVR1800/lp/1500 board\n",
|
||||
__FUNCTION__);
|
||||
break;
|
||||
default:
|
||||
// FIXME
|
||||
|
|
@ -1111,7 +1123,8 @@ static int cx23885_restart_queue(struct cx23885_tsport *port,
|
|||
for (;;) {
|
||||
if (list_empty(&q->queued))
|
||||
return 0;
|
||||
buf = list_entry(q->queued.next, struct cx23885_buffer, vb.queue);
|
||||
buf = list_entry(q->queued.next, struct cx23885_buffer,
|
||||
vb.queue);
|
||||
if (NULL == prev) {
|
||||
list_del(&buf->vb.queue);
|
||||
list_add_tail(&buf->vb.queue, &q->active);
|
||||
|
|
@ -1209,7 +1222,8 @@ void cx23885_buf_queue(struct cx23885_tsport *port, struct cx23885_buffer *buf)
|
|||
|
||||
} else {
|
||||
dprintk( 1, "queue is not empty - append to active\n" );
|
||||
prev = list_entry(cx88q->active.prev, struct cx23885_buffer, vb.queue);
|
||||
prev = list_entry(cx88q->active.prev, struct cx23885_buffer,
|
||||
vb.queue);
|
||||
list_add_tail(&buf->vb.queue, &cx88q->active);
|
||||
buf->vb.state = STATE_ACTIVE;
|
||||
buf->count = cx88q->count++;
|
||||
|
|
@ -1222,7 +1236,8 @@ void cx23885_buf_queue(struct cx23885_tsport *port, struct cx23885_buffer *buf)
|
|||
|
||||
/* ----------------------------------------------------------- */
|
||||
|
||||
static void do_cancel_buffers(struct cx23885_tsport *port, char *reason, int restart)
|
||||
static void do_cancel_buffers(struct cx23885_tsport *port, char *reason,
|
||||
int restart)
|
||||
{
|
||||
struct cx23885_dev *dev = port->dev;
|
||||
struct cx23885_dmaqueue *q = &port->mpegq;
|
||||
|
|
@ -1231,15 +1246,15 @@ static void do_cancel_buffers(struct cx23885_tsport *port, char *reason, int res
|
|||
|
||||
spin_lock_irqsave(&port->slock, flags);
|
||||
while (!list_empty(&q->active)) {
|
||||
buf = list_entry(q->active.next, struct cx23885_buffer, vb.queue);
|
||||
buf = list_entry(q->active.next, struct cx23885_buffer,
|
||||
vb.queue);
|
||||
list_del(&buf->vb.queue);
|
||||
buf->vb.state = STATE_ERROR;
|
||||
wake_up(&buf->vb.done);
|
||||
dprintk(1, "[%p/%d] %s - dma=0x%08lx\n",
|
||||
buf, buf->vb.i, reason, (unsigned long)buf->risc.dma);
|
||||
}
|
||||
if (restart)
|
||||
{
|
||||
if (restart) {
|
||||
dprintk(1, "restarting queue\n" );
|
||||
cx23885_restart_queue(port, q);
|
||||
}
|
||||
|
|
@ -1428,8 +1443,8 @@ static int __devinit cx23885_initdev(struct pci_dev *pci_dev,
|
|||
goto fail_irq;
|
||||
}
|
||||
|
||||
err = request_irq(pci_dev->irq, cx23885_irq
|
||||
, IRQF_SHARED | IRQF_DISABLED, dev->name, dev);
|
||||
err = request_irq(pci_dev->irq, cx23885_irq,
|
||||
IRQF_SHARED | IRQF_DISABLED, dev->name, dev);
|
||||
if (err < 0) {
|
||||
printk(KERN_ERR "%s: can't get IRQ %d\n",
|
||||
dev->name, pci_dev->irq);
|
||||
|
|
|
|||
|
|
@ -53,8 +53,8 @@ static int dvb_buf_setup(struct videobuf_queue *q,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int dvb_buf_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
|
||||
enum v4l2_field field)
|
||||
static int dvb_buf_prepare(struct videobuf_queue *q,
|
||||
struct videobuf_buffer *vb, enum v4l2_field field)
|
||||
{
|
||||
struct cx23885_tsport *port = q->priv_data;
|
||||
return cx23885_buf_prepare(q, port, (struct cx23885_buffer*)vb, field);
|
||||
|
|
@ -66,7 +66,8 @@ static void dvb_buf_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)
|
|||
cx23885_buf_queue(port, (struct cx23885_buffer*)vb);
|
||||
}
|
||||
|
||||
static void dvb_buf_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
|
||||
static void dvb_buf_release(struct videobuf_queue *q,
|
||||
struct videobuf_buffer *vb)
|
||||
{
|
||||
cx23885_free_buffer(q, (struct cx23885_buffer*)vb);
|
||||
}
|
||||
|
|
@ -119,11 +120,9 @@ static int dvb_register(struct cx23885_tsport *port)
|
|||
&hauppauge_hvr1800lp_config,
|
||||
&dev->i2c_bus[0].i2c_adap);
|
||||
if (port->dvb.frontend != NULL) {
|
||||
dvb_attach(mt2131_attach,
|
||||
port->dvb.frontend,
|
||||
dvb_attach(mt2131_attach, port->dvb.frontend,
|
||||
&dev->i2c_bus[0].i2c_adap,
|
||||
&hauppauge_hvr1800lp_rev2_tunerconfig,
|
||||
0);
|
||||
&hauppauge_hvr1800lp_rev2_tunerconfig, 0);
|
||||
}
|
||||
break;
|
||||
case CX23885_BOARD_HAUPPAUGE_HVR1800:
|
||||
|
|
@ -131,11 +130,9 @@ static int dvb_register(struct cx23885_tsport *port)
|
|||
&hauppauge_hvr1800_config,
|
||||
&dev->i2c_bus[0].i2c_adap);
|
||||
if (port->dvb.frontend != NULL) {
|
||||
dvb_attach(mt2131_attach,
|
||||
port->dvb.frontend,
|
||||
dvb_attach(mt2131_attach, port->dvb.frontend,
|
||||
&dev->i2c_bus[0].i2c_adap,
|
||||
&hauppauge_hvr1800_tunerconfig,
|
||||
0);
|
||||
&hauppauge_hvr1800_tunerconfig, 0);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
|
|
@ -152,7 +149,8 @@ static int dvb_register(struct cx23885_tsport *port)
|
|||
cx23885_call_i2c_clients (&dev->i2c_bus[0], TUNER_SET_STANDBY, NULL);
|
||||
|
||||
/* register everything */
|
||||
return videobuf_dvb_register(&port->dvb, THIS_MODULE, port, &dev->pci->dev);
|
||||
return videobuf_dvb_register(&port->dvb, THIS_MODULE, port,
|
||||
&dev->pci->dev);
|
||||
}
|
||||
|
||||
int cx23885_dvb_register(struct cx23885_tsport *port)
|
||||
|
|
@ -173,15 +171,9 @@ int cx23885_dvb_register(struct cx23885_tsport *port)
|
|||
|
||||
/* dvb stuff */
|
||||
printk("%s: cx23885 based dvb card\n", dev->name);
|
||||
videobuf_queue_init(
|
||||
&port->dvb.dvbq,
|
||||
&dvb_qops,
|
||||
dev->pci,
|
||||
&port->slock,
|
||||
V4L2_BUF_TYPE_VIDEO_CAPTURE,
|
||||
V4L2_FIELD_TOP,
|
||||
sizeof(struct cx23885_buffer),
|
||||
port);
|
||||
videobuf_queue_init(&port->dvb.dvbq, &dvb_qops, dev->pci, &port->slock,
|
||||
V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_TOP,
|
||||
sizeof(struct cx23885_buffer), port);
|
||||
err = dvb_register(port);
|
||||
if (err != 0)
|
||||
printk("%s() dvb_register failed err = %d\n", __FUNCTION__, err);
|
||||
|
|
@ -198,3 +190,10 @@ int cx23885_dvb_unregister(struct cx23885_tsport *port)
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Local variables:
|
||||
* c-basic-offset: 8
|
||||
* End:
|
||||
* kate: eol "unix"; indent-width 3; remove-trailing-space on; replace-trailing-space-save on; tab-width 8; replace-tabs off; space-indent off; mixed-indent off
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -76,7 +76,8 @@ static int i2c_wait_done(struct i2c_adapter *i2c_adap)
|
|||
return 1;
|
||||
}
|
||||
|
||||
static int i2c_sendbytes(struct i2c_adapter *i2c_adap, const struct i2c_msg *msg, int last)
|
||||
static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
|
||||
const struct i2c_msg *msg, int last)
|
||||
{
|
||||
struct cx23885_i2c *bus = i2c_adap->algo_data;
|
||||
struct cx23885_dev *dev = bus->dev;
|
||||
|
|
@ -154,7 +155,8 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap, const struct i2c_msg *msg
|
|||
return retval;
|
||||
}
|
||||
|
||||
static int i2c_readbytes(struct i2c_adapter *i2c_adap, const struct i2c_msg *msg, int last)
|
||||
static int i2c_readbytes(struct i2c_adapter *i2c_adap,
|
||||
const struct i2c_msg *msg, int last)
|
||||
{
|
||||
struct cx23885_i2c *bus = i2c_adap->algo_data;
|
||||
struct cx23885_dev *dev = bus->dev;
|
||||
|
|
@ -210,7 +212,8 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap, const struct i2c_msg *msg
|
|||
return retval;
|
||||
}
|
||||
|
||||
static int i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num)
|
||||
static int i2c_xfer(struct i2c_adapter *i2c_adap,
|
||||
struct i2c_msg *msgs, int num)
|
||||
{
|
||||
struct cx23885_i2c *bus = i2c_adap->algo_data;
|
||||
struct cx23885_dev *dev = bus->dev;
|
||||
|
|
@ -219,8 +222,8 @@ static int i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num)
|
|||
dprintk(1, "%s(num = %d)\n", __FUNCTION__, num);
|
||||
|
||||
for (i = 0 ; i < num; i++) {
|
||||
dprintk(1, "%s(num = %d) addr = 0x%02x len = 0x%x\n"
|
||||
, __FUNCTION__, num, msgs[i].addr, msgs[i].len);
|
||||
dprintk(1, "%s(num = %d) addr = 0x%02x len = 0x%x\n",
|
||||
__FUNCTION__, num, msgs[i].addr, msgs[i].len);
|
||||
if (msgs[i].flags & I2C_M_RD) {
|
||||
/* read */
|
||||
retval = i2c_readbytes(i2c_adap, &msgs[i], i+1 == num);
|
||||
|
|
@ -261,7 +264,8 @@ static int detach_inform(struct i2c_client *client)
|
|||
return 0;
|
||||
}
|
||||
|
||||
void cx23885_call_i2c_clients(struct cx23885_i2c *bus, unsigned int cmd, void *arg)
|
||||
void cx23885_call_i2c_clients(struct cx23885_i2c *bus,
|
||||
unsigned int cmd, void *arg)
|
||||
{
|
||||
// struct cx23885_dev *dev = bus->dev;
|
||||
|
||||
|
|
@ -335,13 +339,17 @@ int cx23885_i2c_register(struct cx23885_i2c *bus)
|
|||
|
||||
dprintk(1, "%s(bus = %d)\n", __FUNCTION__, bus->nr);
|
||||
|
||||
memcpy(&bus->i2c_adap, &cx23885_i2c_adap_template, sizeof(bus->i2c_adap));
|
||||
memcpy(&bus->i2c_algo, &cx23885_i2c_algo_template, sizeof(bus->i2c_algo));
|
||||
memcpy(&bus->i2c_client, &cx23885_i2c_client_template, sizeof(bus->i2c_client));
|
||||
memcpy(&bus->i2c_adap, &cx23885_i2c_adap_template,
|
||||
sizeof(bus->i2c_adap));
|
||||
memcpy(&bus->i2c_algo, &cx23885_i2c_algo_template,
|
||||
sizeof(bus->i2c_algo));
|
||||
memcpy(&bus->i2c_client, &cx23885_i2c_client_template,
|
||||
sizeof(bus->i2c_client));
|
||||
|
||||
bus->i2c_adap.dev.parent = &dev->pci->dev;
|
||||
|
||||
strlcpy(bus->i2c_adap.name, bus->dev->name, sizeof(bus->i2c_adap.name));
|
||||
strlcpy(bus->i2c_adap.name, bus->dev->name,
|
||||
sizeof(bus->i2c_adap.name));
|
||||
bus->i2c_algo.data = bus;
|
||||
bus->i2c_adap.algo_data = bus;
|
||||
i2c_add_adapter(&bus->i2c_adap);
|
||||
|
|
|
|||
|
|
@ -183,7 +183,7 @@ struct cx23885_dev {
|
|||
//u32 shadow[SHADOW_MAX];
|
||||
int pci_irqmask;
|
||||
|
||||
/* I2C adapters: Master 1 and 2 (External) and Master 3 (Internal only) */
|
||||
/* I2C adapters: Master 1 & 2 (External) & Master 3 (Internal only) */
|
||||
struct cx23885_i2c i2c_bus[3];
|
||||
|
||||
int nr;
|
||||
|
|
@ -268,17 +268,22 @@ extern void cx23885_card_setup_pre_i2c(struct cx23885_dev *dev);
|
|||
extern int cx23885_dvb_register(struct cx23885_tsport *port);
|
||||
extern int cx23885_dvb_unregister(struct cx23885_tsport *port);
|
||||
|
||||
extern int cx23885_buf_prepare(struct videobuf_queue *q, struct cx23885_tsport *port,
|
||||
struct cx23885_buffer *buf, enum v4l2_field field);
|
||||
extern int cx23885_buf_prepare(struct videobuf_queue *q,
|
||||
struct cx23885_tsport *port,
|
||||
struct cx23885_buffer *buf,
|
||||
enum v4l2_field field);
|
||||
|
||||
extern void cx23885_buf_queue(struct cx23885_tsport *port, struct cx23885_buffer *buf);
|
||||
extern void cx23885_free_buffer(struct videobuf_queue *q, struct cx23885_buffer *buf);
|
||||
extern void cx23885_buf_queue(struct cx23885_tsport *port,
|
||||
struct cx23885_buffer *buf);
|
||||
extern void cx23885_free_buffer(struct videobuf_queue *q,
|
||||
struct cx23885_buffer *buf);
|
||||
|
||||
/* ----------------------------------------------------------- */
|
||||
/* cx23885-i2c.c */
|
||||
extern int cx23885_i2c_register(struct cx23885_i2c *bus);
|
||||
extern int cx23885_i2c_unregister(struct cx23885_i2c *bus);
|
||||
extern void cx23885_call_i2c_clients(struct cx23885_i2c *bus, unsigned int cmd, void *arg);
|
||||
extern void cx23885_call_i2c_clients(struct cx23885_i2c *bus, unsigned int cmd,
|
||||
void *arg);
|
||||
|
||||
/*
|
||||
* Local variables:
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue