diff options
| author | Patrick Boettcher <devnull@localhost> | 2004-12-29 10:40:59 +0000 |
|---|---|---|
| committer | Patrick Boettcher <devnull@localhost> | 2004-12-29 10:40:59 +0000 |
| commit | ac205566da600bf928ced7acc61205f0683699ef (patch) | |
| tree | 3575b21bb4ccd7292c3e4e9b1f0f084ea81931a3 /linux/drivers/media/dvb/dibusb | |
| parent | 12fc9fae796e1f06b9c377b09f1063ca0d4ff66e (diff) | |
| download | mediapointer-dvb-s2-ac205566da600bf928ced7acc61205f0683699ef.tar.gz mediapointer-dvb-s2-ac205566da600bf928ced7acc61205f0683699ef.tar.bz2 | |
minor cleanup, moved to dmx_sw_filter (instead of dmx_sw_filter_packets)
Diffstat (limited to 'linux/drivers/media/dvb/dibusb')
| -rw-r--r-- | linux/drivers/media/dvb/dibusb/dvb-dibusb-core.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dibusb/dvb-dibusb-dvb.c | 7 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dibusb/dvb-dibusb-usb.c | 1 |
3 files changed, 6 insertions, 6 deletions
diff --git a/linux/drivers/media/dvb/dibusb/dvb-dibusb-core.c b/linux/drivers/media/dvb/dibusb/dvb-dibusb-core.c index abe272103..3445161c8 100644 --- a/linux/drivers/media/dvb/dibusb/dvb-dibusb-core.c +++ b/linux/drivers/media/dvb/dibusb/dvb-dibusb-core.c @@ -318,8 +318,8 @@ static int dibusb_init(struct usb_dibusb *dib) sema_init(&dib->i2c_sem, 1); dibusb_hw_wakeup(dib); -/* dibusb_set_streaming_mode(dib,0);*/ - dibusb_streaming(dib,1); + dibusb_set_streaming_mode(dib,0); + dibusb_streaming(dib,0); if ((ret = dibusb_usb_init(dib)) || (ret = dibusb_dvb_init(dib)) || diff --git a/linux/drivers/media/dvb/dibusb/dvb-dibusb-dvb.c b/linux/drivers/media/dvb/dibusb/dvb-dibusb-dvb.c index 3d2628979..b6e1fab9c 100644 --- a/linux/drivers/media/dvb/dibusb/dvb-dibusb-dvb.c +++ b/linux/drivers/media/dvb/dibusb/dvb-dibusb-dvb.c @@ -126,7 +126,7 @@ static int dibusb_ctrl_feed(struct usb_dibusb *dib, int pid, int onoff) static int dibusb_start_feed(struct dvb_demux_feed *dvbdmxfeed) { struct usb_dibusb *dib = dvbdmxfeed->demux->priv; - deb_ts("pid: 0x%04x, feedtype: %d\n", dvbdmxfeed->pid,dvbdmxfeed->type); + deb_ts("start pid: 0x%04x, feedtype: %d\n", dvbdmxfeed->pid,dvbdmxfeed->type); dvbdmxfeed->priv = dib; return dibusb_ctrl_feed(dib,dvbdmxfeed->pid,1); } @@ -138,8 +138,7 @@ static int dibusb_stop_feed(struct dvb_demux_feed *dvbdmxfeed) err("dib in dmxfeed->priv was NULL"); return -EINVAL; } - deb_ts("dvbdmxfeed pid: 0x%04x, feedtype: %d\n", - dvbdmxfeed->pid, dvbdmxfeed->type); + deb_ts("stop pid: 0x%04x, feedtype: %d\n", dvbdmxfeed->pid, dvbdmxfeed->type); return dibusb_ctrl_feed(dib,dvbdmxfeed->pid,0); } @@ -164,7 +163,7 @@ int dibusb_dvb_init(struct usb_dibusb *dib) dib->demux.priv = (void *)dib; /* get pidcount from demod */ - dib->demux.feednum = dib->demux.filternum = 24; + dib->demux.feednum = dib->demux.filternum = 255; dib->demux.start_feed = dibusb_start_feed; dib->demux.stop_feed = dibusb_stop_feed; dib->demux.write_to_decoder = NULL; diff --git a/linux/drivers/media/dvb/dibusb/dvb-dibusb-usb.c b/linux/drivers/media/dvb/dibusb/dvb-dibusb-usb.c index 7176859fe..2c97a18dc 100644 --- a/linux/drivers/media/dvb/dibusb/dvb-dibusb-usb.c +++ b/linux/drivers/media/dvb/dibusb/dvb-dibusb-usb.c @@ -102,6 +102,7 @@ static int dibusb_ioctl_cmd(struct usb_dibusb *dib, u8 cmd, u8 *param, int plen) { u8 b[34]; int size = plen > 32 ? 32 : plen; + memset(b,0,34); b[0] = DIBUSB_REQ_SET_IOCTL; b[1] = cmd; |