diff options
Diffstat (limited to 'linux/drivers/media/dvb/av7110/av7110.c')
| -rw-r--r-- | linux/drivers/media/dvb/av7110/av7110.c | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/linux/drivers/media/dvb/av7110/av7110.c b/linux/drivers/media/dvb/av7110/av7110.c index 8acea0af7..7662a8b78 100644 --- a/linux/drivers/media/dvb/av7110/av7110.c +++ b/linux/drivers/media/dvb/av7110/av7110.c @@ -76,6 +76,7 @@ // #include "compat.h" #include "av7110.h" +#include "av7110_ipack.h" static int AV_StartPlay(av7110_t *av7110, int av); @@ -464,8 +465,8 @@ AV_StartPlay(av7110_t *av7110, int av) outcom(av7110, COMTYPE_REC_PLAY, __Stop, 0); if (av7110->playing == RP_NONE) { - dvb_filter_ipack_reset(&av7110->ipack[0]); - dvb_filter_ipack_reset(&av7110->ipack[1]); + av7110_ipack_reset(&av7110->ipack[0]); + av7110_ipack_reset(&av7110->ipack[1]); } av7110->playing|=av; @@ -2536,11 +2537,11 @@ dvb_play(av7110_t *av7110, const u8 *buf, if (umem) { if (copy_from_user(av7110->kbuf[type], buf, n)) return -EFAULT; - dvb_filter_instant_repack(av7110->kbuf[type], n, - &av7110->ipack[type]); + av7110_ipack_instant_repack(av7110->kbuf[type], n, + &av7110->ipack[type]); } else { - dvb_filter_instant_repack((u8 *)buf, n, - &av7110->ipack[type]); + av7110_ipack_instant_repack(buf, n, + &av7110->ipack[type]); } todo -= n; buf += n; @@ -2573,8 +2574,8 @@ dvb_aplay(av7110_t *av7110, const u8 *buf, n=IPACKS*2; if (copy_from_user(av7110->kbuf[type], buf, n)) return -EFAULT; - dvb_filter_instant_repack(av7110->kbuf[type], n, - &av7110->ipack[type]); + av7110_ipack_instant_repack(av7110->kbuf[type], n, + &av7110->ipack[type]); // memcpy(dvb->kbuf[type], buf, n); todo -= n; buf += n; @@ -3002,7 +3003,7 @@ av7110_write_to_decoder(struct dvb_demux_feed *feed, const u8 *buf, size_t len) return -1; } if (buf[1] & 0x40) - dvb_filter_ipack_flush(ipack); + av7110_ipack_flush(ipack); if (buf[3] & 0x20) { // adaptation field? len -= buf[4]+1; @@ -3011,7 +3012,7 @@ av7110_write_to_decoder(struct dvb_demux_feed *feed, const u8 *buf, size_t len) return 0; } - dvb_filter_instant_repack(buf+4, len-4, &av7110->ipack[feed->pes_type]); + av7110_ipack_instant_repack(buf+4, len-4, &av7110->ipack[feed->pes_type]); return 0; } @@ -3602,7 +3603,7 @@ play_iframe(av7110_t *av7110, u8 *buf, unsigned int len, int nonblock) for (i=0; i<n; i++) dvb_play(av7110, buf, len, 0, 1, 1); - dvb_filter_ipack_flush(&av7110->ipack[1]); + av7110_ipack_flush(&av7110->ipack[1]); } @@ -3767,7 +3768,7 @@ dvb_video_ioctl(struct inode *inode, struct file *file, case VIDEO_CLEAR_BUFFER: ring_buffer_flush(&av7110->avout); - dvb_filter_ipack_reset(&av7110->ipack[1]); + av7110_ipack_reset(&av7110->ipack[1]); if (av7110->playing==RP_AV) { outcom(av7110, COMTYPE_REC_PLAY, @@ -3890,7 +3891,7 @@ dvb_audio_ioctl(struct inode *inode, struct file *file, case AUDIO_CLEAR_BUFFER: ring_buffer_flush(&av7110->aout); - dvb_filter_ipack_reset(&av7110->ipack[0]); + av7110_ipack_reset(&av7110->ipack[0]); if (av7110->playing==RP_AV) outcom(av7110, COMTYPE_REC_PLAY, __Play, 2, AV_PES, 0); @@ -4435,9 +4436,9 @@ int av7110_attach (struct saa7146_dev* dev) av7110->vidmode=VIDEO_MODE_PAL; - dvb_filter_ipack_init(&av7110->ipack[0], IPACKS, play_audio_cb); + av7110_ipack_init(&av7110->ipack[0], IPACKS, play_audio_cb); av7110->ipack[0].data=(void *) av7110; - dvb_filter_ipack_init(&av7110->ipack[1], IPACKS, play_video_cb); + av7110_ipack_init(&av7110->ipack[1], IPACKS, play_video_cb); av7110->ipack[1].data=(void *) av7110; @@ -4563,8 +4564,8 @@ int av7110_detach (struct saa7146_dev* saa) saa7146_write(av7110->dev, ISR,(MASK_19 | MASK_03)); ci_ll_release(&av7110->ci_rbuffer, &av7110->ci_wbuffer); - dvb_filter_ipack_free(&av7110->ipack[0]); - dvb_filter_ipack_free(&av7110->ipack[1]); + av7110_ipack_free(&av7110->ipack[0]); + av7110_ipack_free(&av7110->ipack[1]); vfree(av7110->iobuf); pci_free_consistent(saa->pci, 8192, av7110->debi_virt, av7110->debi_bus); |