diff options
| author | Michael Hunold <devnull@localhost> | 2003-10-06 10:54:24 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2003-10-06 10:54:24 +0000 |
| commit | 03ddbdd9a49da4a2b8cf45cd1fb8ddca61da98ea (patch) | |
| tree | 2599dfa8860e7fd4e35c5e033a55ef657d27e7f7 /linux/drivers/media | |
| parent | f71164d23976a41779d58f6721f761992d21831b (diff) | |
| download | mediapointer-dvb-s2-03ddbdd9a49da4a2b8cf45cd1fb8ddca61da98ea.tar.gz mediapointer-dvb-s2-03ddbdd9a49da4a2b8cf45cd1fb8ddca61da98ea.tar.bz2 | |
Rule 1: always compile check even the smallest change.
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110.c b/linux/drivers/media/dvb/ttpci/av7110.c index b4f985e8d..2431dec94 100644 --- a/linux/drivers/media/dvb/ttpci/av7110.c +++ b/linux/drivers/media/dvb/ttpci/av7110.c @@ -377,7 +377,7 @@ static int record_cb(struct dvb_filter_pes2ts *p2t, u8 *buf, size_t len) { struct dvb_demux_feed *dvbdmxfeed=(struct dvb_demux_feed *) p2t->priv; - DEB_EE(("struct dvb_filter_pes2ts:%p\n",p2t)); +// DEB_EE(("struct dvb_filter_pes2ts:%p\n",p2t)); if (!(dvbdmxfeed->ts_type & TS_PACKET)) return 0; @@ -394,7 +394,7 @@ static int dvb_filter_pes2ts_cb(void *priv, unsigned char *data) { struct dvb_demux_feed *dvbdmxfeed=(struct dvb_demux_feed *) priv; - DEB_EE(("dvb_demux_feed:%p\n",dvbdmxfeed)); +// DEB_EE(("dvb_demux_feed:%p\n",dvbdmxfeed)); dvbdmxfeed->cb.ts(data, 188, 0, 0, &dvbdmxfeed->feed.ts, @@ -888,10 +888,10 @@ static void gpioirq (unsigned long data) txbuf=irdebi(av7110, DEBINOSWAP, TX_BUFF, 0, 2); len=(av7110->debilen+3)&(~3); - DEB_D(("GPIO0 irq %d %d\n", av7110->debitype, av7110->debilen)); +// DEB_D(("GPIO0 irq %d %d\n", av7110->debitype, av7110->debilen)); print_time("gpio"); - DEB_D(("GPIO0 irq %02x\n", av7110->debitype&0xff)); +// DEB_D(("GPIO0 irq %02x\n", av7110->debitype&0xff)); switch (av7110->debitype&0xff) { case DATA_TS_PLAY: @@ -3118,6 +3118,8 @@ static int av7110_write_to_decoder(struct dvb_demux_feed *feed, const u8 *buf, s DEB_EE(("av7110: %p\n",av7110)); + BUG(); + switch (feed->pes_type) { case 0: if (av7110->audiostate.stream_source==AUDIO_SOURCE_MEMORY) @@ -4527,7 +4529,7 @@ static int av7110_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_ /* special case DVB-C: these cards have an analog tuner plus need some special handling, so we have separate saa7146_ext_vv data for these... */ - if (0 != dev->has_analog_tuner) { + if (0 != av7110->has_analog_tuner) { ret = saa7146_vv_init(dev, &av7110_vv_data_c); } else { ret = saa7146_vv_init(dev, &av7110_vv_data_st); @@ -4822,7 +4824,7 @@ static void av7110_irq(struct saa7146_dev* dev, u32 *isr) { struct av7110 *av7110 = (struct av7110*)dev->ext_priv; - DEB_INT(("dev: %p, av7110: %p\n",dev,av7110)); +// DEB_INT(("dev: %p, av7110: %p\n",dev,av7110)); if (*isr & MASK_19) tasklet_schedule (&av7110->debi_tasklet); |