s/weißnichwas/durch_weißnichwas/g

4 files changed, 109 insertions, 110 deletions

diff --git a/linux/drivers/media/dvb/av7110/av7110.c b/linux/drivers/media/dvb/av7110/av7110.c
index 17cc22251..e7e536092 100644
--- a/linux/drivers/media/dvb/av7110/av7110.c
+++ b/linux/drivers/media/dvb/av7110/av7110.c
@@ -89,7 +89,7 @@ static int  outcom(av7110_t *av7110, int type, int com, int num, ...);
 static void SetMode(av7110_t *av7110, int mode);
 
 void pes_to_ts(u8 const *buf, long int length, u16 pid, p2t_t *p);
-void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter, dvb_demux_feed_t *feed);
+void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter, struct dvb_demux_feed *feed);
 
 static u32 vidmem	= 0;
 static u32 vidlow	= 0;
@@ -394,7 +394,7 @@ static int arm_thread(void *data)
 static int
 record_cb(dvb_filter_pes2ts_t *p2t, u8 *buf, size_t len)
 {
-        dvb_demux_feed_t *dvbdmxfeed=(dvb_demux_feed_t *) p2t->priv;
+        struct dvb_demux_feed *dvbdmxfeed=(struct dvb_demux_feed *) p2t->priv;
 
         if (!(dvbdmxfeed->ts_type & TS_PACKET)) 
                 return 0;
@@ -410,7 +410,7 @@ record_cb(dvb_filter_pes2ts_t *p2t, u8 *buf, size_t len)
 static int 
 dvb_filter_pes2ts_cb(void *priv, unsigned char *data)
 {
-        dvb_demux_feed_t *dvbdmxfeed=(dvb_demux_feed_t *) priv;
+        struct dvb_demux_feed *dvbdmxfeed=(struct dvb_demux_feed *) priv;
         
         dvbdmxfeed->cb.ts(data, 188, 0, 0,
                           &dvbdmxfeed->feed.ts,
@@ -420,9 +420,9 @@ dvb_filter_pes2ts_cb(void *priv, unsigned char *data)
 
 static int 
 AV_StartRecord(av7110_t *av7110, int av,
-               dvb_demux_feed_t *dvbdmxfeed)
+               struct dvb_demux_feed *dvbdmxfeed)
 {
-        dvb_demux_t *dvbdmx=dvbdmxfeed->demux;
+        struct dvb_demux *dvbdmx=dvbdmxfeed->demux;
   
         if (av7110->playing||(av7110->rec_mode&av))
                 return -EBUSY;
@@ -824,7 +824,7 @@ void CI_handle(av7110_t *av7110, u8 *data, u16 len)
 static inline int
 DvbDmxFilterCallback(u8 * buffer1, size_t buffer1_len,
                      u8 * buffer2, size_t buffer2_len,
-                     dvb_demux_filter_t *dvbdmxfilter,
+                     struct dvb_demux_filter *dvbdmxfilter,
                      dmx_success_t success,
                      av7110_t *av7110)
 {
@@ -2539,7 +2539,7 @@ dvb_aplay(av7110_t *av7110, const u8 *buf,
 	return count-todo;
 }
 
-void init_p2t(p2t_t *p, dvb_demux_feed_t *feed)
+void init_p2t(p2t_t *p, struct dvb_demux_feed *feed)
 {
 	memset(p->pes,0,TS_SIZE);
 	p->counter = 0;
@@ -2735,7 +2735,7 @@ int write_ts_header2(u16 pid, u8 *counter, int pes_start, u8 *buf, u8 length)
 
 
 void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter, 
-            dvb_demux_feed_t *feed)
+            struct dvb_demux_feed *feed)
 {
   
 	int l, pes_start;
@@ -3196,9 +3196,9 @@ static inline int vid_unregister(av7110_t *av7110)
  ******************************************************************************/
 
 static int 
-StartHWFilter(dvb_demux_filter_t *dvbdmxfilter)
+StartHWFilter(struct dvb_demux_filter *dvbdmxfilter)
 {
-        dvb_demux_feed_t *dvbdmxfeed=dvbdmxfilter->feed;
+        struct dvb_demux_feed *dvbdmxfeed=dvbdmxfilter->feed;
         av7110_t *av7110=(av7110_t *) dvbdmxfeed->demux->priv;
         u16 buf[20];
         int ret, i;
@@ -3234,7 +3234,7 @@ StartHWFilter(dvb_demux_filter_t *dvbdmxfilter)
 }
 
 static int 
-StopHWFilter(dvb_demux_filter_t *dvbdmxfilter)
+StopHWFilter(struct dvb_demux_filter *dvbdmxfilter)
 {
         av7110_t *av7110=(av7110_t *) dvbdmxfilter->feed->demux->priv;
         u16 buf[3];
@@ -3266,9 +3266,9 @@ StopHWFilter(dvb_demux_filter_t *dvbdmxfilter)
 
 
 static int 
-dvb_write_to_decoder(dvb_demux_feed_t *dvbdmxfeed, u8 *buf, size_t count)
+dvb_write_to_decoder(struct dvb_demux_feed *dvbdmxfeed, u8 *buf, size_t count)
 {
-        dvb_demux_t *dvbdmx=dvbdmxfeed->demux;
+        struct dvb_demux *dvbdmx=dvbdmxfeed->demux;
         av7110_t *av7110=(av7110_t *) dvbdmx->priv;
         ipack *ipack=&av7110->ipack[dvbdmxfeed->pes_type];
 
@@ -3307,9 +3307,9 @@ dvb_write_to_decoder(dvb_demux_feed_t *dvbdmxfeed, u8 *buf, size_t count)
 }
 
 static void
-dvb_feed_start_pid(dvb_demux_feed_t *dvbdmxfeed)
+dvb_feed_start_pid(struct dvb_demux_feed *dvbdmxfeed)
 {
-        dvb_demux_t *dvbdmx=dvbdmxfeed->demux;
+        struct dvb_demux *dvbdmx=dvbdmxfeed->demux;
         av7110_t *av7110=(av7110_t *) dvbdmx->priv;
         u16 *pid=dvbdmx->pids, npids[5];
         int i;
@@ -3344,9 +3344,9 @@ dvb_feed_start_pid(dvb_demux_feed_t *dvbdmxfeed)
 }
 
 static void
-dvb_feed_stop_pid(dvb_demux_feed_t *dvbdmxfeed)
+dvb_feed_stop_pid(struct dvb_demux_feed *dvbdmxfeed)
 {
-        dvb_demux_t *dvbdmx=dvbdmxfeed->demux;
+        struct dvb_demux *dvbdmx=dvbdmxfeed->demux;
         av7110_t *av7110=(av7110_t *) dvbdmx->priv;
         u16 *pid=dvbdmx->pids, npids[5];
         int i;
@@ -3380,9 +3380,9 @@ dvb_feed_stop_pid(dvb_demux_feed_t *dvbdmxfeed)
 }
 
 static int 
-dvb_start_feed(dvb_demux_feed_t *dvbdmxfeed)
+dvb_start_feed(struct dvb_demux_feed *dvbdmxfeed)
 {
-        dvb_demux_t *dvbdmx=dvbdmxfeed->demux;
+        struct dvb_demux *dvbdmx=dvbdmxfeed->demux;
         av7110_t *av7110=(av7110_t *) dvbdmx->priv;
 
         if (!dvbdmx->dmx.frontend)
@@ -3440,9 +3440,9 @@ dvb_start_feed(dvb_demux_feed_t *dvbdmxfeed)
 
 
 static int 
-dvb_stop_feed(dvb_demux_feed_t *dvbdmxfeed)
+dvb_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
 {
-        dvb_demux_t *dvbdmx=dvbdmxfeed->demux;
+        struct dvb_demux *dvbdmx=dvbdmxfeed->demux;
         av7110_t *av7110=(av7110_t *) dvbdmx->priv;
 
         if (av7110->saa->card_type>=DVB_CARD_TT_BUDGET) 
@@ -3483,8 +3483,8 @@ dvb_stop_feed(dvb_demux_feed_t *dvbdmxfeed)
 static void 
 restart_feeds(av7110_t *av7110)
 {
-        dvb_demux_t *dvbdmx=&av7110->demux;
-        dvb_demux_feed_t *feed;
+        struct dvb_demux *dvbdmx=&av7110->demux;
+        struct dvb_demux_feed *feed;
         int mode;
         int i;
 
@@ -4369,7 +4369,7 @@ dvb_register(av7110_t *av7110)
 {
         int ret, i;
         dmx_frontend_t *dvbfront=&av7110->hw_frontend;
-        dvb_demux_t *dvbdemux=&av7110->demux;
+        struct dvb_demux *dvbdemux=&av7110->demux;
 
         if (av7110->registered)
                 return -1;
@@ -4515,7 +4515,7 @@ dvb_register(av7110_t *av7110)
 static void 
 dvb_unregister(av7110_t *av7110)
 {
-        dvb_demux_t *dvbdemux=&av7110->demux;
+        struct dvb_demux *dvbdemux=&av7110->demux;
 
         if (!av7110->registered)
                 return;
diff --git a/linux/drivers/media/dvb/av7110/av7110.h b/linux/drivers/media/dvb/av7110/av7110.h
index d96c21ae5..a4e8acaf7 100644
--- a/linux/drivers/media/dvb/av7110/av7110.h
+++ b/linux/drivers/media/dvb/av7110/av7110.h
@@ -479,7 +479,7 @@ typedef struct p2t_s {
         u8                counter;
         long int          pos;
         int               frags;
-        dvb_demux_feed_t *feed;
+        struct dvb_demux_feed *feed;
 } p2t_t;
 
 
@@ -561,7 +561,7 @@ typedef struct av7110_s {
 
         int                     vidmode;
         dmxdev_t                dmxdev;
-        dvb_demux_t             demux;
+        struct dvb_demux             demux;
         char                    demux_id[16];
 
         dmx_frontend_t          hw_frontend;
@@ -580,7 +580,7 @@ typedef struct av7110_s {
 #define TRICK_FREEZE 3
         struct audio_status      audiostate;
 
-        dvb_demux_filter_t     *handle2filter[32];
+        struct dvb_demux_filter     *handle2filter[32];
         p2t_t                   p2t_filter[MAXFILT];
         dvb_filter_pes2ts_t     p2t[2];
         struct ipack_s          ipack[2];
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_demux.c b/linux/drivers/media/dvb/dvb-core/dvb_demux.c
index 4920d3f6f..c49cb0f6a 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_demux.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_demux.c
@@ -182,7 +182,7 @@ void dvb_set_crc32(u8 *data, int length)
  ******************************************************************************/
 
 static inline int
-dvb_dmx_swfilter_payload(dvb_demux_feed_t *dvbdmxfeed, const u8 *buf) 
+dvb_dmx_swfilter_payload(struct dvb_demux_feed *dvbdmxfeed, const u8 *buf) 
 {
         int p, count;
 	//int ccok;
@@ -208,8 +208,8 @@ dvb_dmx_swfilter_payload(dvb_demux_feed_t *dvbdmxfeed, const u8 *buf)
 
 
 static int
-dvb_dmx_swfilter_sectionfilter(dvb_demux_feed_t *dvbdmxfeed, 
-                            dvb_demux_filter_t *f)
+dvb_dmx_swfilter_sectionfilter(struct dvb_demux_feed *dvbdmxfeed, 
+                            struct dvb_demux_filter *f)
 {
         dmx_section_filter_t *filter=&f->filter;
         int i;
@@ -229,10 +229,10 @@ dvb_dmx_swfilter_sectionfilter(dvb_demux_feed_t *dvbdmxfeed,
 }
 
 static inline int
-dvb_dmx_swfilter_section_feed(dvb_demux_feed_t *dvbdmxfeed)
+dvb_dmx_swfilter_section_feed(struct dvb_demux_feed *dvbdmxfeed)
 {
         u8 *buf=dvbdmxfeed->secbuf;
-        dvb_demux_filter_t *f;
+        struct dvb_demux_filter *f;
 
         if (dvbdmxfeed->secbufp!=dvbdmxfeed->seclen)
                 return -1;
@@ -251,7 +251,7 @@ dvb_dmx_swfilter_section_feed(dvb_demux_feed_t *dvbdmxfeed)
 }
 
 static inline int
-dvb_dmx_swfilter_section_packet(dvb_demux_feed_t *dvbdmxfeed, const u8 *buf) 
+dvb_dmx_swfilter_section_packet(struct dvb_demux_feed *dvbdmxfeed, const u8 *buf) 
 {
         int p, count;
         int ccok, rest;
@@ -346,7 +346,7 @@ dvb_dmx_swfilter_section_packet(dvb_demux_feed_t *dvbdmxfeed, const u8 *buf)
 }
 
 static inline void 
-dvb_dmx_swfilter_packet_type(dvb_demux_feed_t *dvbdmxfeed, const u8 *buf)
+dvb_dmx_swfilter_packet_type(struct dvb_demux_feed *dvbdmxfeed, const u8 *buf)
 {
         switch(dvbdmxfeed->type) {
         case DMX_TYPE_TS:
@@ -378,9 +378,9 @@ dvb_dmx_swfilter_packet_type(dvb_demux_feed_t *dvbdmxfeed, const u8 *buf)
 }
 
 void inline
-dvb_dmx_swfilter_packet(dvb_demux_t *dvbdmx, const u8 *buf)
+dvb_dmx_swfilter_packet(struct dvb_demux *dvbdmx, const u8 *buf)
 {
-        dvb_demux_feed_t *dvbdmxfeed;
+        struct dvb_demux_feed *dvbdmxfeed;
 
         if (!(dvbdmxfeed=dvbdmx->pid2feed[ts_pid(buf)]))
                 return;
@@ -388,9 +388,9 @@ dvb_dmx_swfilter_packet(dvb_demux_t *dvbdmx, const u8 *buf)
 }
 
 void
-dvb_dmx_swfilter_packets(dvb_demux_t *dvbdmx, const u8 *buf, int count)
+dvb_dmx_swfilter_packets(struct dvb_demux *dvbdmx, const u8 *buf, int count)
 {
-        dvb_demux_feed_t *dvbdmxfeed;
+        struct dvb_demux_feed *dvbdmxfeed;
 
 	spin_lock(&dvbdmx->lock);
 	if ((dvbdmxfeed=dvbdmx->pid2feed[0x2000]))
@@ -405,7 +405,7 @@ dvb_dmx_swfilter_packets(dvb_demux_t *dvbdmx, const u8 *buf, int count)
 }
 
 static inline void
-dvb_dmx_swfilter(dvb_demux_t *dvbdmx, const u8 *buf, size_t count)
+dvb_dmx_swfilter(struct dvb_demux *dvbdmx, const u8 *buf, size_t count)
 {
         int p=0,i, j;
         
@@ -444,8 +444,8 @@ dvb_dmx_swfilter(dvb_demux_t *dvbdmx, const u8 *buf, size_t count)
  ******************************************************************************
  ******************************************************************************/
 
-static dvb_demux_filter_t *
-dvb_dmx_filter_alloc(dvb_demux_t *dvbdmx)
+static struct dvb_demux_filter *
+dvb_dmx_filter_alloc(struct dvb_demux *dvbdmx)
 {
         int i;
 
@@ -458,8 +458,8 @@ dvb_dmx_filter_alloc(dvb_demux_t *dvbdmx)
         return &dvbdmx->filter[i];
 }
 
-static dvb_demux_feed_t *
-dvb_dmx_feed_alloc(dvb_demux_t *dvbdmx)
+static struct dvb_demux_feed *
+dvb_dmx_feed_alloc(struct dvb_demux *dvbdmx)
 {
         int i;
 
@@ -478,10 +478,10 @@ dvb_dmx_feed_alloc(dvb_demux_t *dvbdmx)
  ******************************************************************************/
 
 static int 
-dmx_pid_set(u16 pid, dvb_demux_feed_t *dvbdmxfeed)
+dmx_pid_set(u16 pid, struct dvb_demux_feed *dvbdmxfeed)
 {
-        dvb_demux_t *dvbdmx=dvbdmxfeed->demux;
-	dvb_demux_feed_t **pid2feed=dvbdmx->pid2feed;
+        struct dvb_demux *dvbdmx=dvbdmxfeed->demux;
+	struct dvb_demux_feed **pid2feed=dvbdmx->pid2feed;
 
 	if (pid>DMX_MAX_PID)
                 return -EINVAL;
@@ -510,8 +510,8 @@ dmx_ts_feed_set(struct dmx_ts_feed_s* feed,
                 struct timespec timeout
                 )
 {
-        dvb_demux_feed_t *dvbdmxfeed=(dvb_demux_feed_t *) feed;
-        dvb_demux_t *dvbdmx=dvbdmxfeed->demux;
+        struct dvb_demux_feed *dvbdmxfeed=(struct dvb_demux_feed *) feed;
+        struct dvb_demux *dvbdmx=dvbdmxfeed->demux;
 	int ret;
 	
         if (down_interruptible (&dvbdmx->mutex))
@@ -576,8 +576,8 @@ dmx_ts_feed_set(struct dmx_ts_feed_s* feed,
 static int 
 dmx_ts_feed_start_filtering(struct dmx_ts_feed_s* feed)
 {
-        dvb_demux_feed_t *dvbdmxfeed=(dvb_demux_feed_t *) feed;
-        dvb_demux_t *dvbdmx=dvbdmxfeed->demux;
+        struct dvb_demux_feed *dvbdmxfeed=(struct dvb_demux_feed *) feed;
+        struct dvb_demux *dvbdmx=dvbdmxfeed->demux;
 	int ret;
 
         if (down_interruptible (&dvbdmx->mutex))
@@ -608,8 +608,8 @@ dmx_ts_feed_start_filtering(struct dmx_ts_feed_s* feed)
 static int 
 dmx_ts_feed_stop_filtering(struct dmx_ts_feed_s* feed)
 {
-        dvb_demux_feed_t *dvbdmxfeed=(dvb_demux_feed_t *) feed;
-        dvb_demux_t *dvbdmx=dvbdmxfeed->demux;
+        struct dvb_demux_feed *dvbdmxfeed=(struct dvb_demux_feed *) feed;
+        struct dvb_demux *dvbdmx=dvbdmxfeed->demux;
 	int ret;
 
         if (down_interruptible (&dvbdmx->mutex))
@@ -637,8 +637,8 @@ static int dvbdmx_allocate_ts_feed(dmx_demux_t *demux,
                                    dmx_ts_feed_t **feed, 
                                    dmx_ts_cb callback)
 {
-        dvb_demux_t *dvbdmx=(dvb_demux_t *) demux;
-        dvb_demux_feed_t *dvbdmxfeed;
+        struct dvb_demux *dvbdmx=(struct dvb_demux *) demux;
+        struct dvb_demux_feed *dvbdmxfeed;
 
         if (down_interruptible (&dvbdmx->mutex))
 		return -ERESTARTSYS;
@@ -679,8 +679,8 @@ static int dvbdmx_allocate_ts_feed(dmx_demux_t *demux,
 
 static int dvbdmx_release_ts_feed(dmx_demux_t *demux, dmx_ts_feed_t *feed)
 {
-        dvb_demux_t *dvbdmx=(dvb_demux_t *) demux;
-        dvb_demux_feed_t *dvbdmxfeed=(dvb_demux_feed_t *) feed;
+        struct dvb_demux *dvbdmx=(struct dvb_demux *) demux;
+        struct dvb_demux_feed *dvbdmxfeed=(struct dvb_demux_feed *) feed;
 
         if (down_interruptible (&dvbdmx->mutex))
 		return -ERESTARTSYS;
@@ -715,9 +715,9 @@ static int
 dmx_section_feed_allocate_filter(struct dmx_section_feed_s* feed, 
                                  dmx_section_filter_t** filter) 
 {
-        dvb_demux_feed_t *dvbdmxfeed=(dvb_demux_feed_t *) feed;
-        dvb_demux_t *dvbdemux=dvbdmxfeed->demux;
-        dvb_demux_filter_t *dvbdmxfilter;
+        struct dvb_demux_feed *dvbdmxfeed=(struct dvb_demux_feed *) feed;
+        struct dvb_demux *dvbdemux=dvbdmxfeed->demux;
+        struct dvb_demux_filter *dvbdmxfilter;
 
 	if (down_interruptible (&dvbdemux->mutex))
 		return -ERESTARTSYS;
@@ -747,8 +747,8 @@ dmx_section_feed_set(struct dmx_section_feed_s* feed,
                      u16 pid, size_t circular_buffer_size, 
                      int descramble, int check_crc) 
 {
-        dvb_demux_feed_t *dvbdmxfeed=(dvb_demux_feed_t *) feed;
-        dvb_demux_t *dvbdmx=dvbdmxfeed->demux;
+        struct dvb_demux_feed *dvbdmxfeed=(struct dvb_demux_feed *) feed;
+        struct dvb_demux *dvbdmx=dvbdmxfeed->demux;
 
         if (pid>0x1fff)
                 return -EINVAL;
@@ -789,11 +789,11 @@ dmx_section_feed_set(struct dmx_section_feed_s* feed,
         return 0;
 }
 
-static void prepare_secfilters(dvb_demux_feed_t *dvbdmxfeed)
+static void prepare_secfilters(struct dvb_demux_feed *dvbdmxfeed)
 {
 	int i;
         dmx_section_filter_t *sf;
-	dvb_demux_filter_t *f;
+	struct dvb_demux_filter *f;
 	u8 mask, mode, doneq;
 		
 	if (!(f=dvbdmxfeed->filter))
@@ -815,8 +815,8 @@ static void prepare_secfilters(dvb_demux_feed_t *dvbdmxfeed)
 static int 
 dmx_section_feed_start_filtering(dmx_section_feed_t *feed)
 {
-        dvb_demux_feed_t *dvbdmxfeed=(dvb_demux_feed_t *) feed;
-        dvb_demux_t *dvbdmx=dvbdmxfeed->demux;
+        struct dvb_demux_feed *dvbdmxfeed=(struct dvb_demux_feed *) feed;
+        struct dvb_demux *dvbdmx=dvbdmxfeed->demux;
 	int ret;
 
         if (down_interruptible (&dvbdmx->mutex))
@@ -854,8 +854,8 @@ dmx_section_feed_start_filtering(dmx_section_feed_t *feed)
 static int 
 dmx_section_feed_stop_filtering(struct dmx_section_feed_s* feed)
 {
-        dvb_demux_feed_t *dvbdmxfeed=(dvb_demux_feed_t *) feed;
-        dvb_demux_t *dvbdmx=dvbdmxfeed->demux;
+        struct dvb_demux_feed *dvbdmxfeed=(struct dvb_demux_feed *) feed;
+        struct dvb_demux *dvbdmx=dvbdmxfeed->demux;
         int ret;
 
         if (down_interruptible (&dvbdmx->mutex))
@@ -878,9 +878,9 @@ static int
 dmx_section_feed_release_filter(dmx_section_feed_t *feed, 
                                 dmx_section_filter_t* filter)
 {
-        dvb_demux_filter_t *dvbdmxfilter=(dvb_demux_filter_t *) filter, *f;
-        dvb_demux_feed_t *dvbdmxfeed=(dvb_demux_feed_t *) feed;
-        dvb_demux_t *dvbdmx=dvbdmxfeed->demux;
+        struct dvb_demux_filter *dvbdmxfilter=(struct dvb_demux_filter *) filter, *f;
+        struct dvb_demux_feed *dvbdmxfeed=(struct dvb_demux_feed *) feed;
+        struct dvb_demux *dvbdmx=dvbdmxfeed->demux;
 
         if (down_interruptible (&dvbdmx->mutex))
 		return -ERESTARTSYS;
@@ -911,8 +911,8 @@ static int dvbdmx_allocate_section_feed(dmx_demux_t *demux,
                                         dmx_section_feed_t **feed,
                                         dmx_section_cb callback)
 {
-        dvb_demux_t *dvbdmx=(dvb_demux_t *) demux;
-        dvb_demux_feed_t *dvbdmxfeed;
+        struct dvb_demux *dvbdmx=(struct dvb_demux *) demux;
+        struct dvb_demux_feed *dvbdmxfeed;
 
         if (down_interruptible (&dvbdmx->mutex))
 		return -ERESTARTSYS;
@@ -946,8 +946,8 @@ static int dvbdmx_allocate_section_feed(dmx_demux_t *demux,
 static int dvbdmx_release_section_feed(dmx_demux_t *demux, 
                                        dmx_section_feed_t *feed)
 {
-        dvb_demux_feed_t *dvbdmxfeed=(dvb_demux_feed_t *) feed;
-        dvb_demux_t *dvbdmx=(dvb_demux_t *) demux;
+        struct dvb_demux_feed *dvbdmxfeed=(struct dvb_demux_feed *) feed;
+        struct dvb_demux *dvbdmx=(struct dvb_demux *) demux;
 
         if (down_interruptible (&dvbdmx->mutex))
 		return -ERESTARTSYS;
@@ -977,7 +977,7 @@ static int dvbdmx_release_section_feed(dmx_demux_t *demux,
 
 static int dvbdmx_open(dmx_demux_t *demux)
 {
-        dvb_demux_t *dvbdemux=(dvb_demux_t *) demux;
+        struct dvb_demux *dvbdemux=(struct dvb_demux *) demux;
 
         if (dvbdemux->users>=MAX_DVB_DEMUX_USERS)
                 return -EUSERS;
@@ -987,7 +987,7 @@ static int dvbdmx_open(dmx_demux_t *demux)
 
 static int dvbdmx_close(struct dmx_demux_s *demux)
 {
-        dvb_demux_t *dvbdemux=(dvb_demux_t *) demux;
+        struct dvb_demux *dvbdemux=(struct dvb_demux *) demux;
 
         if (dvbdemux->users==0)
                 return -ENODEV;
@@ -998,7 +998,7 @@ static int dvbdmx_close(struct dmx_demux_s *demux)
 
 static int dvbdmx_write(dmx_demux_t *demux, const char *buf, size_t count)
 {
-        dvb_demux_t *dvbdemux=(dvb_demux_t *) demux;
+        struct dvb_demux *dvbdemux=(struct dvb_demux *) demux;
 
         if ((!demux->frontend) ||
             (demux->frontend->source!=DMX_MEMORY_FE))
@@ -1016,7 +1016,7 @@ static int dvbdmx_write(dmx_demux_t *demux, const char *buf, size_t count)
 static int dvbdmx_add_frontend(dmx_demux_t *demux, 
                                dmx_frontend_t *frontend)
 {
-        dvb_demux_t *dvbdemux=(dvb_demux_t *) demux;
+        struct dvb_demux *dvbdemux=(struct dvb_demux *) demux;
         struct list_head *pos, *head=&dvbdemux->frontend_list;
 	
 	if (!(frontend->id && frontend->vendor && frontend->model)) 
@@ -1035,7 +1035,7 @@ static int
 dvbdmx_remove_frontend(dmx_demux_t *demux, 
                        dmx_frontend_t *frontend)
 {
-        dvb_demux_t *dvbdemux=(dvb_demux_t *) demux;
+        struct dvb_demux *dvbdemux=(struct dvb_demux *) demux;
         struct list_head *pos, *n, *head=&dvbdemux->frontend_list;
 
 	list_for_each_safe (pos, n, head) 
@@ -1052,7 +1052,7 @@ dvbdmx_remove_frontend(dmx_demux_t *demux,
 static struct list_head *
 dvbdmx_get_frontends(dmx_demux_t *demux)
 {
-        dvb_demux_t *dvbdemux=(dvb_demux_t *) demux;
+        struct dvb_demux *dvbdemux=(struct dvb_demux *) demux;
 
         if (list_empty(&dvbdemux->frontend_list))
 	        return NULL;
@@ -1062,7 +1062,7 @@ dvbdmx_get_frontends(dmx_demux_t *demux)
 static int dvbdmx_connect_frontend(dmx_demux_t *demux, 
                                    dmx_frontend_t *frontend)
 {
-        dvb_demux_t *dvbdemux=(dvb_demux_t *) demux;
+        struct dvb_demux *dvbdemux=(struct dvb_demux *) demux;
 
         if (demux->frontend)
                 return -EINVAL;
@@ -1077,7 +1077,7 @@ static int dvbdmx_connect_frontend(dmx_demux_t *demux,
 
 static int dvbdmx_disconnect_frontend(dmx_demux_t *demux)
 {
-        dvb_demux_t *dvbdemux=(dvb_demux_t *) demux;
+        struct dvb_demux *dvbdemux=(struct dvb_demux *) demux;
 
         if (down_interruptible (&dvbdemux->mutex))
 		return -ERESTARTSYS;
@@ -1089,24 +1089,24 @@ static int dvbdmx_disconnect_frontend(dmx_demux_t *demux)
 
 static int dvbdmx_get_pes_pids(dmx_demux_t *demux, u16 *pids)
 {
-        dvb_demux_t *dvbdemux=(dvb_demux_t *) demux;
+        struct dvb_demux *dvbdemux=(struct dvb_demux *) demux;
 
         memcpy(pids, dvbdemux->pids, 5*sizeof(u16));
         return 0;
 }
 
 int 
-dvb_dmx_init(dvb_demux_t *dvbdemux)
+dvb_dmx_init(struct dvb_demux *dvbdemux)
 {
         int i;
         dmx_demux_t *dmx=&dvbdemux->dmx;
 
         dvbdemux->users=0;
-	dvbdemux->filter=vmalloc(dvbdemux->filternum*sizeof(dvb_demux_filter_t));
+	dvbdemux->filter=vmalloc(dvbdemux->filternum*sizeof(struct dvb_demux_filter));
 	if (!dvbdemux->filter)
                 return -ENOMEM;
 
-	dvbdemux->feed=vmalloc(dvbdemux->feednum*sizeof(dvb_demux_feed_t));
+	dvbdemux->feed=vmalloc(dvbdemux->feednum*sizeof(struct dvb_demux_feed));
 	if (!dvbdemux->feed) {
 	        vfree(dvbdemux->filter);
                 return -ENOMEM;
@@ -1125,7 +1125,7 @@ dvb_dmx_init(dvb_demux_t *dvbdemux)
                 dvbdemux->pids[i]=0xffff;
 	}
         dvbdemux->playing=dvbdemux->recording=0;
-        memset(dvbdemux->pid2feed, 0, (DMX_MAX_PID+1)*sizeof(dvb_demux_feed_t *));
+        memset(dvbdemux->pid2feed, 0, (DMX_MAX_PID+1)*sizeof(struct dvb_demux_feed *));
         dvbdemux->tsbufp=0;
 
         dmx->frontend=0;
@@ -1159,7 +1159,7 @@ dvb_dmx_init(dvb_demux_t *dvbdemux)
 }
 
 int 
-dvb_dmx_release(dvb_demux_t *dvbdemux)
+dvb_dmx_release(struct dvb_demux *dvbdemux)
 {
         dmx_demux_t *dmx=&dvbdemux->dmx;
 
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_demux.h b/linux/drivers/media/dvb/dvb-core/dvb_demux.h
index 2c4b0f175..cd8d437be 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_demux.h
+++ b/linux/drivers/media/dvb/dvb-core/dvb_demux.h
@@ -39,14 +39,14 @@
 
 #define DVB_DEMUX_MASK_MAX 18
 
-typedef struct dvb_demux_filter_s {
+struct dvb_demux_filter {
         dmx_section_filter_t filter;
         u8 maskandmode    [DMX_MAX_FILTER_SIZE]; 
         u8 maskandnotmode [DMX_MAX_FILTER_SIZE]; 
 	int doneq;
 		
-        struct dvb_demux_filter_s *next;
-        struct dvb_demux_feed_s *feed;
+        struct dvb_demux_filter *next;
+        struct dvb_demux_feed *feed;
         int index;
         int state;
         int type;
@@ -56,11 +56,10 @@ typedef struct dvb_demux_filter_s {
         u16 hw_handle;
         struct timer_list timer;
 	int ts_state;
+};
 
-        //u16 pid;  //to be removed
-} dvb_demux_filter_t;
 
-typedef struct dvb_demux_feed_s {
+struct dvb_demux_feed {
         union {
 	        dmx_ts_feed_t ts;
 	        dmx_section_feed_t sec;
@@ -71,7 +70,7 @@ typedef struct dvb_demux_feed_s {
 	        dmx_section_cb sec;
 	} cb;
 
-        struct dvb_demux_s *demux;
+        struct dvb_demux *demux;
         int type;
         int state;
         u16 pid;
@@ -81,7 +80,7 @@ typedef struct dvb_demux_feed_s {
         int check_crc;
 
         struct timespec timeout; 
-        dvb_demux_filter_t *filter;
+        struct dvb_demux_filter *filter;
         int cb_length;
   
         int ts_type;
@@ -93,42 +92,42 @@ typedef struct dvb_demux_feed_s {
         int cc;
 
         u16 peslen;
-} dvb_demux_feed_t;
+};
 
-typedef struct dvb_demux_s {
+struct dvb_demux {
         dmx_demux_t dmx;
         void *priv;
         int filternum;
         int feednum;
-        int (*start_feed)(dvb_demux_feed_t *);
-        int (*stop_feed)(dvb_demux_feed_t *);
-        int (*write_to_decoder)(dvb_demux_feed_t *, u8 *, size_t);
+        int (*start_feed)(struct dvb_demux_feed *);
+        int (*stop_feed)(struct dvb_demux_feed *);
+        int (*write_to_decoder)(struct dvb_demux_feed *, u8 *, size_t);
 
   
         int users;
 #define MAX_DVB_DEMUX_USERS 10
-        dvb_demux_filter_t *filter;
-        dvb_demux_feed_t *feed;
+        struct dvb_demux_filter *filter;
+        struct dvb_demux_feed *feed;
 
         struct list_head frontend_list;
 
-        dvb_demux_feed_t *pesfilter[DMX_TS_PES_OTHER];
+        struct dvb_demux_feed *pesfilter[DMX_TS_PES_OTHER];
         u16 pids[DMX_TS_PES_OTHER];
         int playing; 
         int recording; 
 
 #define DMX_MAX_PID 0x2000
-        dvb_demux_feed_t *pid2feed[DMX_MAX_PID+1];
+        struct dvb_demux_feed *pid2feed[DMX_MAX_PID+1];
         u8 tsbuf[188];
         int tsbufp;
 
 	struct semaphore mutex;
 	spinlock_t lock;
-} dvb_demux_t;
+};
 
 
-int dvb_dmx_init(dvb_demux_t *dvbdemux);
-int dvb_dmx_release(dvb_demux_t *dvbdemux);
-void dvb_dmx_swfilter_packets(dvb_demux_t *dvbdmx, const u8 *buf, int count);
+int dvb_dmx_init(struct dvb_demux *dvbdemux);
+int dvb_dmx_release(struct dvb_demux *dvbdemux);
+void dvb_dmx_swfilter_packets(struct dvb_demux *dvbdmx, const u8 *buf, int count);
 
 #endif /* _DVB_DEMUX_H_ */