- more coding style paranoia

2 files changed, 37 insertions, 37 deletions

diff --git a/linux/drivers/media/dvb/av7110/av7110.c b/linux/drivers/media/dvb/av7110/av7110.c
index fa9c3671f..1261070a8 100644
--- a/linux/drivers/media/dvb/av7110/av7110.c
+++ b/linux/drivers/media/dvb/av7110/av7110.c
@@ -392,7 +392,7 @@ static int arm_thread(void *data)
 
 
 static int
-record_cb(pes2ts_t *p2t, u8 *buf, size_t len)
+record_cb(dvb_filter_dvb_filter_pes2ts_t *p2t, u8 *buf, size_t len)
 {
         dvb_demux_feed_t *dvbdmxfeed=(dvb_demux_feed_t *) p2t->priv;
 
@@ -404,11 +404,11 @@ record_cb(pes2ts_t *p2t, u8 *buf, size_t len)
                 return dvbdmxfeed->cb.ts(buf, len, 0, 0, 
                                          &dvbdmxfeed->feed.ts, DMX_OK); 
         else
-                return pes2ts(p2t, buf, len);
+                return dvb_filter_dvb_filter_pes2ts(p2t, buf, len);
 }
 
 static int 
-pes2ts_cb(void *priv, unsigned char *data)
+dvb_filter_dvb_filter_pes2ts_cb(void *priv, unsigned char *data)
 {
         dvb_demux_feed_t *dvbdmxfeed=(dvb_demux_feed_t *) priv;
         
@@ -432,20 +432,20 @@ AV_StartRecord(av7110_t *av7110, int av,
 
         switch (av7110->rec_mode) {
         case RP_AUDIO:
-                pes2ts_init(&av7110->p2t[0], dvbdmx->pesfilter[0]->pid,
-                            pes2ts_cb, (void *)dvbdmx->pesfilter[0]);
+                dvb_filter_dvb_filter_pes2ts_init(&av7110->p2t[0], dvbdmx->pesfilter[0]->pid,
+                            dvb_filter_dvb_filter_pes2ts_cb, (void *)dvbdmx->pesfilter[0]);
                 outcom(av7110, COMTYPE_REC_PLAY, __Record, 2, AudioPES, 0);
                 break;
         case RP_VIDEO:
-                pes2ts_init(&av7110->p2t[1], dvbdmx->pesfilter[1]->pid,
-                            pes2ts_cb, (void *)dvbdmx->pesfilter[1]);
+                dvb_filter_dvb_filter_pes2ts_init(&av7110->p2t[1], dvbdmx->pesfilter[1]->pid,
+                            dvb_filter_dvb_filter_pes2ts_cb, (void *)dvbdmx->pesfilter[1]);
                 outcom(av7110, COMTYPE_REC_PLAY, __Record, 2, VideoPES, 0);
                 break;
         case RP_AV:
-                pes2ts_init(&av7110->p2t[0], dvbdmx->pesfilter[0]->pid,
-                            pes2ts_cb, (void *)dvbdmx->pesfilter[0]);
-                pes2ts_init(&av7110->p2t[1], dvbdmx->pesfilter[1]->pid,
-                            pes2ts_cb, (void *)dvbdmx->pesfilter[1]);
+                dvb_filter_dvb_filter_pes2ts_init(&av7110->p2t[0], dvbdmx->pesfilter[0]->pid,
+                            dvb_filter_dvb_filter_pes2ts_cb, (void *)dvbdmx->pesfilter[0]);
+                dvb_filter_dvb_filter_pes2ts_init(&av7110->p2t[1], dvbdmx->pesfilter[1]->pid,
+                            dvb_filter_dvb_filter_pes2ts_cb, (void *)dvbdmx->pesfilter[1]);
                 outcom(av7110, COMTYPE_REC_PLAY, __Record, 2, AV_PES, 0);
                 break;
         }
@@ -463,8 +463,8 @@ AV_StartPlay(av7110_t *av7110, int av)
         outcom(av7110, COMTYPE_REC_PLAY, __Stop, 0);
 
         if (av7110->playing == RP_NONE) {
-                reset_ipack(&av7110->ipack[0]);
-                reset_ipack(&av7110->ipack[1]);
+                dvb_filter_ipack_reset(&av7110->ipack[0]);
+                dvb_filter_ipack_reset(&av7110->ipack[1]);
         }
 
         av7110->playing|=av;
@@ -896,7 +896,7 @@ static void fidbirq(struct saa7146* saa, void *data)
 
         // FIXME: use bottom half or tasklet
         if (av7110->feeding && mem[0]==0x47)
-                DvbDmxSWFilterPackets(&av7110->demux, mem, 512);
+                dvb_dmx_swfilter_packets(&av7110->demux, mem, 512);
 }
 #else
 static
@@ -922,7 +922,7 @@ void fidbirq (unsigned long data)
         } else {
                 if (av7110->ttbp>1000*188 && av7110->ttbp<1024*188) {
                         if (av7110->feeding)
-                                DvbDmxSWFilterPackets(&av7110->demux, 
+                                dvb_dmx_swfilter_packets(&av7110->demux, 
                                                       mem+av7110->ttbp,
                                                       1024- av7110->ttbp / 188);
                 }
@@ -937,7 +937,7 @@ void fidbirq (unsigned long data)
 
         // FIXME: use bottom half or tasklet
         if (av7110->feeding && mem[0]==0x47)
-                DvbDmxSWFilterPackets(&av7110->demux, mem, num);
+                dvb_dmx_swfilter_packets(&av7110->demux, mem, num);
 }
 #endif
 
@@ -1001,7 +1001,7 @@ void debiirq (unsigned long data)
         switch (type&0xff) {
 
         case DATA_TS_RECORD:
-                DvbDmxSWFilterPackets(&av7110->demux, 
+                dvb_dmx_swfilter_packets(&av7110->demux, 
                                       (const u8 *)av7110->debi_virt, 
                                       av7110->debilen/188);
                 spin_lock(&av7110->debilock);
@@ -2483,9 +2483,9 @@ dvb_play(av7110_t *av7110, const u8 *buf,
                 if (umem) {
                         if (copy_from_user(av7110->kbuf[type], buf, n)) 
                                 return -EFAULT;
-                        instant_repack(av7110->kbuf[type], n, &av7110->ipack[type]);
+                        dvb_filter_dvb_filter_instant_repack(av7110->kbuf[type], n, &av7110->ipack[type]);
                 } else
-                        instant_repack((u8 *)buf, n, &av7110->ipack[type]);
+                        dvb_filter_dvb_filter_instant_repack((u8 *)buf, n, &av7110->ipack[type]);
                 todo -= n;
                 buf += n;
         }
@@ -2517,7 +2517,7 @@ dvb_aplay(av7110_t *av7110, const u8 *buf,
                         n=IPACKS*2;
                 if (copy_from_user(av7110->kbuf[type], buf, n)) 
                         return -EFAULT;
-                instant_repack(av7110->kbuf[type], n, &av7110->ipack[type]);
+                dvb_filter_dvb_filter_instant_repack(av7110->kbuf[type], n, &av7110->ipack[type]);
 //                        memcpy(dvb->kbuf[type], buf, n); 
                 todo -= n;
                 buf += n;
@@ -3277,7 +3277,7 @@ dvb_write_to_decoder(dvb_demux_feed_t *dvbdmxfeed, u8 *buf, size_t count)
                 return -1;
         }
         if (buf[1]&0x40)
-                send_ipack_rest(ipack);
+                dvb_filter_ipack_flush(ipack);
 
         if (buf[3]&0x20) {  // adaptation field?
                 count-=buf[4]+1;
@@ -3287,7 +3287,7 @@ dvb_write_to_decoder(dvb_demux_feed_t *dvbdmxfeed, u8 *buf, size_t count)
                 }
         }
         
-        instant_repack(buf+4, count-4, &av7110->ipack[dvbdmxfeed->pes_type]);
+        dvb_filter_dvb_filter_instant_repack(buf+4, count-4, &av7110->ipack[dvbdmxfeed->pes_type]);
         return 0;
 }
 
@@ -3716,7 +3716,7 @@ dvb_ca_ioctl(struct inode *inode, struct file *file,
                 
         case CA_GET_CAP:
         {
-                ca_cap_t cap;
+                ca_caps_t cap;
                 
                 cap.slot_num=2;
 #ifdef NEW_CI
@@ -3876,7 +3876,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);
 
-	send_ipack_rest(&av7110->ipack[1]);
+	dvb_filter_ipack_flush(&av7110->ipack[1]);
 }
 
 
@@ -4041,7 +4041,7 @@ dvb_video_ioctl(struct inode *inode, struct file *file,
         
         case VIDEO_CLEAR_BUFFER:
                 ring_buffer_flush(&av7110->avout);
-                reset_ipack(&av7110->ipack[1]);
+                dvb_filter_ipack_reset(&av7110->ipack[1]);
                 
                 if (av7110->playing==RP_AV) {
                         outcom(av7110, COMTYPE_REC_PLAY, 
@@ -4164,7 +4164,7 @@ dvb_audio_ioctl(struct inode *inode, struct file *file,
 
         case AUDIO_CLEAR_BUFFER:
                 ring_buffer_flush(&av7110->aout);
-                reset_ipack(&av7110->ipack[0]);
+                dvb_filter_ipack_reset(&av7110->ipack[0]);
                 if (av7110->playing==RP_AV)
                         outcom(av7110, COMTYPE_REC_PLAY, 
                                __Play, 2, AV_PES, 0);
@@ -4409,7 +4409,7 @@ dvb_register(av7110_t *av7110)
                                              DMX_SECTION_FILTERING|
                                              DMX_MEMORY_BASED_FILTERING);
 
-                DvbDmxInit(&av7110->demux);
+                dvb_dmx_init(&av7110->demux);
 
 
                 dvbfront->id="hw_frontend";
@@ -4421,7 +4421,7 @@ dvb_register(av7110_t *av7110)
                 av7110->dmxdev.demux=&dvbdemux->dmx;
                 av7110->dmxdev.capabilities=0;
 
-                DmxDevInit(&av7110->dmxdev, av7110->dvb_adapter);
+                dvb_dmxdev_init(&av7110->dmxdev, av7110->dvb_adapter);
         }
 
         if (av7110->saa->card_type>=DVB_CARD_TT_BUDGET) {
@@ -4438,7 +4438,7 @@ dvb_register(av7110_t *av7110)
                                              DMX_SECTION_FILTERING|
                                              DMX_MEMORY_BASED_FILTERING);
 
-                DvbDmxInit(&av7110->demux);
+                dvb_dmx_init(&av7110->demux);
 
                 dvbfront->id="hw_frontend";
                 dvbfront->vendor="VLSI";
@@ -4449,7 +4449,7 @@ dvb_register(av7110_t *av7110)
                 av7110->dmxdev.demux=&dvbdemux->dmx;
                 av7110->dmxdev.capabilities=0;
 
-                DmxDevInit(&av7110->dmxdev, av7110->dvb_adapter);
+                dvb_dmxdev_init(&av7110->dmxdev, av7110->dvb_adapter);
         }
 
         ret=dvbdemux->dmx.add_frontend(&dvbdemux->dmx, 
@@ -4511,8 +4511,8 @@ dvb_unregister(av7110_t *av7110)
         dvbdemux->dmx.remove_frontend(&dvbdemux->dmx, &av7110->hw_frontend);
         dvbdemux->dmx.remove_frontend(&dvbdemux->dmx, &av7110->mem_frontend);
 
-        DmxDevRelease(&av7110->dmxdev);
-        DvbDmxRelease(&av7110->demux);
+        dvb_dmxdev_release(&av7110->dmxdev);
+        dvb_dmx_release(&av7110->demux);
 
 	if (av7110->saa->card_type==DVB_CARD_TT_SIEMENS) 
                 dvb_remove_frontend_notifier (av7110->dvb_adapter,
@@ -4579,9 +4579,9 @@ int av7110_attach (struct saa7146 *saa, void **av7110_ptr)
      
         av7110->vidmode=VIDEO_MODE_PAL;
 
-        init_ipack(&av7110->ipack[0], IPACKS, play_audio_cb);
+        dvb_filter_ipack_init(&av7110->ipack[0], IPACKS, play_audio_cb);
         av7110->ipack[0].data=(void *) av7110;
-        init_ipack(&av7110->ipack[1], IPACKS, play_video_cb);
+        dvb_filter_ipack_init(&av7110->ipack[1], IPACKS, play_video_cb);
         av7110->ipack[1].data=(void *) av7110;
         
 
@@ -4700,8 +4700,8 @@ int av7110_detach (struct saa7146 *saa, void** av7110_ptr)
 	saa7146_write(av7110->saa_mem, ISR,(MASK_19 | MASK_03));
 
 	ci_ll_release(&av7110->ci_rbuffer, &av7110->ci_wbuffer);
-	free_ipack(&av7110->ipack[0]);
-	free_ipack(&av7110->ipack[1]);
+	dvb_filter_ipack_free(&av7110->ipack[0]);
+	dvb_filter_ipack_free(&av7110->ipack[1]);
 	vfree(av7110->iobuf);
 	pci_free_consistent(av7110->saa->device, 8192, av7110->debi_virt,
 			    av7110->debi_bus);
diff --git a/linux/drivers/media/dvb/av7110/av7110.h b/linux/drivers/media/dvb/av7110/av7110.h
index 4ba483dea..4b996e40c 100644
--- a/linux/drivers/media/dvb/av7110/av7110.h
+++ b/linux/drivers/media/dvb/av7110/av7110.h
@@ -582,7 +582,7 @@ typedef struct av7110_s {
 
         dvb_demux_filter_t     *handle2filter[32];
         p2t_t                   p2t_filter[MAXFILT];
-        pes2ts_t                p2t[2];
+        dvb_filter_dvb_filter_pes2ts_t                p2t[2];
         struct ipack_s          ipack[2];
         u8                     *kbuf[2];