summaryrefslogtreecommitdiff
path: root/linux/drivers/media
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media')
-rw-r--r--linux/drivers/media/video/bttv-risc.c8
-rw-r--r--linux/drivers/media/video/cx88/cx88-dvb.c13
-rw-r--r--linux/drivers/media/video/cx88/cx88-i2c.c22
-rw-r--r--linux/drivers/media/video/cx88/cx88-mpeg.c13
4 files changed, 28 insertions, 28 deletions
diff --git a/linux/drivers/media/video/bttv-risc.c b/linux/drivers/media/video/bttv-risc.c
index 33bf3a490..f0508b995 100644
--- a/linux/drivers/media/video/bttv-risc.c
+++ b/linux/drivers/media/video/bttv-risc.c
@@ -154,15 +154,15 @@ bttv_risc_planar(struct bttv *btv, struct btcx_riscmem *risc,
break;
case 1:
if (!yoffset)
- chroma = (line & 1) == 0;
+ chroma = ((line & 1) == 0);
else
- chroma = (line & 1) == 1;
+ chroma = ((line & 1) == 1);
break;
case 2:
if (!yoffset)
- chroma = (line & 3) == 0;
+ chroma = ((line & 3) == 0);
else
- chroma = (line & 3) == 2;
+ chroma = ((line & 3) == 2);
break;
default:
chroma = 0;
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c
index a0402a7b4..9270b68a0 100644
--- a/linux/drivers/media/video/cx88/cx88-dvb.c
+++ b/linux/drivers/media/video/cx88/cx88-dvb.c
@@ -119,12 +119,16 @@ static int dvb_thread(void *data)
spin_unlock_irqrestore(dev->dvbq.irqlock,flags);
/* log errors if any */
- if (dev->error_count || dev->stopper_count || dev->timeout_count) {
- printk("%s: error=%d stopper=%d timeout=%d\n",
+ if (dev->error_count || dev->stopper_count) {
+ printk("%s: error=%d stopper=%d\n",
dev->core->name, dev->error_count,
- dev->stopper_count, dev->timeout_count);
+ dev->stopper_count);
dev->error_count = 0;
dev->stopper_count = 0;
+ }
+ if (debug && dev->timeout_count) {
+ printk("%s: timeout=%d (FE not locked?)\n",
+ dev->core->name, dev->timeout_count);
dev->timeout_count = 0;
}
}
@@ -205,6 +209,7 @@ static void dvb_unregister(struct cx8802_dev *dev)
dev->demux.dmx.remove_frontend(&dev->demux.dmx, &dev->fe_hw);
dvb_dmxdev_release(&dev->dmxdev);
dvb_dmx_release(&dev->demux);
+ cx88_call_i2c_clients(dev->core, FE_UNREGISTER, dev->core->dvb_adapter);
dvb_unregister_adapter(dev->core->dvb_adapter);
dev->core->dvb_adapter = NULL;
return;
@@ -221,6 +226,7 @@ static int dvb_register(struct cx8802_dev *dev)
dev->core->name, result);
goto fail1;
}
+ cx88_call_i2c_clients(dev->core, FE_REGISTER, dev->core->dvb_adapter);
dev->demux.dmx.capabilities =
DMX_TS_FILTERING | DMX_SECTION_FILTERING |
@@ -282,6 +288,7 @@ fail4:
fail3:
dvb_dmx_release(&dev->demux);
fail2:
+ cx88_call_i2c_clients(dev->core, FE_UNREGISTER, dev->core->dvb_adapter);
dvb_unregister_adapter(dev->core->dvb_adapter);
fail1:
return result;
diff --git a/linux/drivers/media/video/cx88/cx88-i2c.c b/linux/drivers/media/video/cx88/cx88-i2c.c
index 1292a1644..b5fc050d5 100644
--- a/linux/drivers/media/video/cx88/cx88-i2c.c
+++ b/linux/drivers/media/video/cx88/cx88-i2c.c
@@ -92,21 +92,17 @@ static int attach_inform(struct i2c_client *client)
{
struct cx88_core *core = i2c_get_adapdata(client->adapter);
+ dprintk(1, "i2c attach [client=%s]\n", i2c_clientname(client));
+ if (!client->driver->command)
+ return;
+
if (core->tuner_type != UNSET)
- cx88_call_i2c_clients(core,TUNER_SET_TYPE,&core->tuner_type);
+ client->driver->command(client, TUNER_SET_TYPE, &core->tuner_type);
if (core->tda9887_conf)
- cx88_call_i2c_clients(core,TDA9887_SET_CONFIG,&core->tda9887_conf);
-
-#if 1
- /* FIXME: should switch to cx88_call_i2c_clients */
- if (core->dvb_adapter && client->driver->command) {
- dprintk(1, "i2c attach [client=%s] dvb_adapter %p\n",
- i2c_clientname(client), core->dvb_adapter);
- return client->driver->command(client, FE_REGISTER, core->dvb_adapter);
- }
-#endif
+ client->driver->command(client, TDA9887_SET_CONFIG, &core->tda9887_conf);
+ if (core->dvb_adapter)
+ client->driver->command(client, FE_REGISTER, core->dvb_adapter);
- dprintk(1, "i2c attach [client=%s]\n", i2c_clientname(client));
return 0;
}
@@ -114,7 +110,7 @@ static int detach_inform(struct i2c_client *client)
{
struct cx88_core *core = i2c_get_adapdata(client->adapter);
-#if 1
+#if 0
/* FIXME: should switch to cx88_call_i2c_clients */
/* FIXME: drop FE_UNREGISTER altogether in favor of using
* i2c_driver->detach_client() ??? */
diff --git a/linux/drivers/media/video/cx88/cx88-mpeg.c b/linux/drivers/media/video/cx88/cx88-mpeg.c
index a878a5fa4..9dc555501 100644
--- a/linux/drivers/media/video/cx88/cx88-mpeg.c
+++ b/linux/drivers/media/video/cx88/cx88-mpeg.c
@@ -1,5 +1,5 @@
/*
- * $Id: cx88-mpeg.c,v 1.8 2004/09/06 10:40:21 kraxel Exp $
+ * $Id: cx88-mpeg.c,v 1.9 2004/09/15 15:35:40 kraxel Exp $
*
* Support for the mpeg transport stream transfers
* PCI function #2 of the cx2388x.
@@ -54,7 +54,7 @@ int cx8802_start_dma(struct cx8802_dev *dev,
{
struct cx88_core *core = dev->core;
- dprintk(0, "cx8802_start_mpegport_dma %d\n", buf->vb.width);
+ dprintk(1, "cx8802_start_mpegport_dma %d\n", buf->vb.width);
/* setup fifo + format */
cx88_sram_channel_setup(core, &cx88_sram_channels[SRAM_CH28],
@@ -234,13 +234,10 @@ static void cx8802_timeout(unsigned long data)
{
struct cx8802_dev *dev = (struct cx8802_dev*)data;
- dprintk(0, "%s\n",__FUNCTION__);
+ dprintk(1, "%s\n",__FUNCTION__);
-#if 0 /* FIXME */
- mpegport_api_cmd(dev, IVTV_API_END_CAPTURE, 3, 0, 1, 0, 0x13);
-#endif
-
- cx88_sram_channel_dump(dev->core, &cx88_sram_channels[SRAM_CH28]);
+ if (debug)
+ cx88_sram_channel_dump(dev->core, &cx88_sram_channels[SRAM_CH28]);
cx8802_shutdown(dev);
dev->timeout_count++;
do_cancel_buffers(dev,"timeout",1);
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-09 19:49:44 +0000