11 files changed, 229 insertions, 239 deletions

diff --git a/linux/drivers/media/dvb/dvb-core/demux.h b/linux/drivers/media/dvb/dvb-core/demux.h
index 00724ca18..e1b3f88b6 100644
--- a/linux/drivers/media/dvb/dvb-core/demux.h
+++ b/linux/drivers/media/dvb/dvb-core/demux.h
@@ -106,11 +106,11 @@ typedef enum
 #define DMX_TS_PES_PCR      DMX_TS_PES_PCR0
 
 
-struct dmx_ts_feed_s { 
+struct dmx_ts_feed { 
         int is_filtering; /* Set to non-zero when filtering in progress */
-        struct dmx_demux_s *parent; /* Back-pointer */
+        struct dmx_demux *parent; /* Back-pointer */
         void *priv; /* Pointer to private data of the API client */ 
-        int (*set) (struct dmx_ts_feed_s *feed, 
+        int (*set) (struct dmx_ts_feed *feed, 
 		    u16 pid,
 		    int type, 
 		    dmx_ts_pes_t pes_type,
@@ -118,27 +118,25 @@ struct dmx_ts_feed_s {
 		    size_t circular_buffer_size, 
 		    int descramble, 
 		    struct timespec timeout); 
-        int (*start_filtering) (struct dmx_ts_feed_s* feed); 
-        int (*stop_filtering) (struct dmx_ts_feed_s* feed); 
+        int (*start_filtering) (struct dmx_ts_feed* feed); 
+        int (*stop_filtering) (struct dmx_ts_feed* feed); 
 };
 
-typedef struct dmx_ts_feed_s dmx_ts_feed_t; 
-
 /*--------------------------------------------------------------------------*/ 
 /* Section reception */ 
 /*--------------------------------------------------------------------------*/ 
 
-typedef struct { 
+struct dmx_section_filter { 
         u8 filter_value [DMX_MAX_FILTER_SIZE]; 
         u8 filter_mask [DMX_MAX_FILTER_SIZE]; 
         u8 filter_mode [DMX_MAX_FILTER_SIZE]; 
-        struct dmx_section_feed_s* parent; /* Back-pointer */ 
+        struct dmx_section_feed* parent; /* Back-pointer */ 
         void* priv; /* Pointer to private data of the API client */ 
-} dmx_section_filter_t;
+};
 
-struct dmx_section_feed_s { 
+struct dmx_section_feed { 
         int is_filtering; /* Set to non-zero when filtering in progress */ 
-        struct dmx_demux_s* parent; /* Back-pointer */
+        struct dmx_demux* parent; /* Back-pointer */
         void* priv; /* Pointer to private data of the API client */ 
 
         int check_crc;
@@ -148,19 +146,18 @@ struct dmx_section_feed_s {
         int secbufp;
         int seclen;
 
-        int (*set) (struct dmx_section_feed_s* feed, 
+        int (*set) (struct dmx_section_feed* feed, 
 		    u16 pid, 
 		    size_t circular_buffer_size, 
 		    int descramble, 
 		    int check_crc); 
-        int (*allocate_filter) (struct dmx_section_feed_s* feed, 
-				dmx_section_filter_t** filter); 
-        int (*release_filter) (struct dmx_section_feed_s* feed, 
-			       dmx_section_filter_t* filter); 
-        int (*start_filtering) (struct dmx_section_feed_s* feed); 
-        int (*stop_filtering) (struct dmx_section_feed_s* feed); 
+        int (*allocate_filter) (struct dmx_section_feed* feed, 
+				struct dmx_section_filter** filter); 
+        int (*release_filter) (struct dmx_section_feed* feed, 
+			       struct dmx_section_filter* filter); 
+        int (*start_filtering) (struct dmx_section_feed* feed); 
+        int (*stop_filtering) (struct dmx_section_feed* feed); 
 };
-typedef struct dmx_section_feed_s dmx_section_feed_t; 
 
 /*--------------------------------------------------------------------------*/ 
 /* Callback functions */ 
@@ -170,14 +167,14 @@ typedef int (*dmx_ts_cb) ( const u8 * buffer1,
 			   size_t buffer1_length,
 			   const u8 * buffer2, 
 			   size_t buffer2_length,
-			   dmx_ts_feed_t* source, 
+			   struct dmx_ts_feed* source, 
 			   dmx_success_t success); 
 
 typedef int (*dmx_section_cb) (	const u8 * buffer1,
 				size_t buffer1_len,
 				const u8 * buffer2, 
 				size_t buffer2_len,
-			       	dmx_section_filter_t * source,
+			       	struct dmx_section_filter * source,
 			       	dmx_success_t success);
 
 /*--------------------------------------------------------------------------*/ 
@@ -196,20 +193,20 @@ typedef enum {
 	DMX_STREAM_3
 } dmx_frontend_source_t; 
 
-typedef struct { 
+struct dmx_frontend { 
         struct list_head connectivity_list; /* List of front-ends that can 
 					       be connected to a particular 
 					       demux */ 
         void* priv;     /* Pointer to private data of the API client */ 
         dmx_frontend_source_t source;
-} dmx_frontend_t;
+};
 
 /*--------------------------------------------------------------------------*/ 
 /* MPEG-2 TS Demux */ 
 /*--------------------------------------------------------------------------*/ 
 
 /* 
- * Flags OR'ed in the capabilites field of struct dmx_demux_s. 
+ * Flags OR'ed in the capabilites field of struct dmx_demux. 
  */ 
 
 #define DMX_TS_FILTERING                        1 
@@ -228,57 +225,56 @@ typedef struct {
 /* 
  * DMX_FE_ENTRY(): Casts elements in the list of registered 
  * front-ends from the generic type struct list_head
- * to the type * dmx_frontend_t
+ * to the type * struct dmx_frontend
  *. 
 */
 
-#define DMX_FE_ENTRY(list) list_entry(list, dmx_frontend_t, connectivity_list) 
+#define DMX_FE_ENTRY(list) list_entry(list, struct dmx_frontend, connectivity_list) 
 
-struct dmx_demux_s { 
+struct dmx_demux { 
         u32 capabilities;            /* Bitfield of capability flags */ 
-        dmx_frontend_t* frontend;    /* Front-end connected to the demux */ 
+        struct dmx_frontend* frontend;    /* Front-end connected to the demux */ 
         struct list_head reg_list;   /* List of registered demuxes */
         void* priv;                  /* Pointer to private data of the API client */ 
         int users;                   /* Number of users */
-        int (*open) (struct dmx_demux_s* demux); 
-        int (*close) (struct dmx_demux_s* demux); 
-        int (*write) (struct dmx_demux_s* demux, const char* buf, size_t count); 
-        int (*allocate_ts_feed) (struct dmx_demux_s* demux, 
-				 dmx_ts_feed_t** feed, 
+        int (*open) (struct dmx_demux* demux); 
+        int (*close) (struct dmx_demux* demux); 
+        int (*write) (struct dmx_demux* demux, const char* buf, size_t count); 
+        int (*allocate_ts_feed) (struct dmx_demux* demux, 
+				 struct dmx_ts_feed** feed, 
 				 dmx_ts_cb callback); 
-        int (*release_ts_feed) (struct dmx_demux_s* demux, 
-				dmx_ts_feed_t* feed); 
-        int (*allocate_section_feed) (struct dmx_demux_s* demux, 
-				      dmx_section_feed_t** feed, 
+        int (*release_ts_feed) (struct dmx_demux* demux, 
+				struct dmx_ts_feed* feed); 
+        int (*allocate_section_feed) (struct dmx_demux* demux, 
+				      struct dmx_section_feed** feed, 
 				      dmx_section_cb callback); 
-        int (*release_section_feed) (struct dmx_demux_s* demux,
-				     dmx_section_feed_t* feed); 
-        int (*descramble_mac_address) (struct dmx_demux_s* demux, 
+        int (*release_section_feed) (struct dmx_demux* demux,
+				     struct dmx_section_feed* feed); 
+        int (*descramble_mac_address) (struct dmx_demux* demux, 
 				       u8* buffer1, 
 				       size_t buffer1_length, 
 				       u8* buffer2, 
 				       size_t buffer2_length,
 				       u16 pid); 
-        int (*descramble_section_payload) (struct dmx_demux_s* demux,
+        int (*descramble_section_payload) (struct dmx_demux* demux,
 					   u8* buffer1, 
 					   size_t buffer1_length,
 					   u8* buffer2, size_t buffer2_length,
 					   u16 pid); 
-        int (*add_frontend) (struct dmx_demux_s* demux, 
-			     dmx_frontend_t* frontend); 
-        int (*remove_frontend) (struct dmx_demux_s* demux,
-				dmx_frontend_t* frontend); 
-        struct list_head* (*get_frontends) (struct dmx_demux_s* demux); 
-        int (*connect_frontend) (struct dmx_demux_s* demux, 
-				 dmx_frontend_t* frontend); 
-        int (*disconnect_frontend) (struct dmx_demux_s* demux); 
-
-        int (*get_pes_pids) (struct dmx_demux_s* demux, u16 *pids);
-
-        int (*get_stc) (struct dmx_demux_s* demux, unsigned int num,
+        int (*add_frontend) (struct dmx_demux* demux, 
+			     struct dmx_frontend* frontend); 
+        int (*remove_frontend) (struct dmx_demux* demux,
+				struct dmx_frontend* frontend); 
+        struct list_head* (*get_frontends) (struct dmx_demux* demux); 
+        int (*connect_frontend) (struct dmx_demux* demux, 
+				 struct dmx_frontend* frontend); 
+        int (*disconnect_frontend) (struct dmx_demux* demux); 
+
+        int (*get_pes_pids) (struct dmx_demux* demux, u16 *pids);
+
+        int (*get_stc) (struct dmx_demux* demux, unsigned int num,
 			u64 *stc, unsigned int *base);
-}; 
-typedef struct dmx_demux_s dmx_demux_t; 
+};
 
 /*--------------------------------------------------------------------------*/ 
 /* Demux directory */ 
@@ -286,14 +282,14 @@ typedef struct dmx_demux_s dmx_demux_t;
 
 /* 
  * DMX_DIR_ENTRY(): Casts elements in the list of registered 
- * demuxes from the generic type struct list_head* to the type dmx_demux_t
+ * demuxes from the generic type struct list_head* to the type struct dmx_demux
  *. 
  */ 
 
-#define DMX_DIR_ENTRY(list) list_entry(list, dmx_demux_t, reg_list)
+#define DMX_DIR_ENTRY(list) list_entry(list, struct dmx_demux, reg_list)
 
-int dmx_register_demux (dmx_demux_t* demux); 
-int dmx_unregister_demux (dmx_demux_t* demux); 
+int dmx_register_demux (struct dmx_demux* demux); 
+int dmx_unregister_demux (struct dmx_demux* demux); 
 struct list_head* dmx_get_demuxes (void); 
 
 #endif /* #ifndef __DEMUX_H */
diff --git a/linux/drivers/media/dvb/dvb-core/dmxdev.c b/linux/drivers/media/dvb/dvb-core/dmxdev.c
index b5e8cea92..61f801f0c 100644
--- a/linux/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/linux/drivers/media/dvb/dvb-core/dmxdev.c
@@ -40,20 +40,20 @@ static int debug = 0;
 
 #define dprintk	if (debug) printk
 
-inline dmxdev_filter_t *
+inline struct dmxdev_filter *
 dvb_dmxdev_file_to_filter(struct file *file)
 {
-	return (dmxdev_filter_t *) file->private_data;
+	return (struct dmxdev_filter *) file->private_data;
 }
 
-inline dmxdev_dvr_t *
-dvb_dmxdev_file_to_dvr(dmxdev_t *dmxdev, struct file *file)
+inline struct dmxdev_dvr *
+dvb_dmxdev_file_to_dvr(struct dmxdev *dmxdev, struct file *file)
 {
-	return (dmxdev_dvr_t *) file->private_data;
+	return (struct dmxdev_dvr *) file->private_data;
 }
 
 static inline void 
-dvb_dmxdev_buffer_init(dmxdev_buffer_t *buffer) 
+dvb_dmxdev_buffer_init(struct dmxdev_buffer *buffer) 
 {
 	buffer->data=0;
 	buffer->size=8192;
@@ -64,7 +64,7 @@ dvb_dmxdev_buffer_init(dmxdev_buffer_t *buffer)
 }
 
 static inline
-int dvb_dmxdev_buffer_write(dmxdev_buffer_t *buf, const u8 *src, int len) 
+int dvb_dmxdev_buffer_write(struct dmxdev_buffer *buf, const u8 *src, int len) 
 {
 	int split;
 	int free;
@@ -99,7 +99,7 @@ int dvb_dmxdev_buffer_write(dmxdev_buffer_t *buf, const u8 *src, int len)
 }
 
 static ssize_t 
-dvb_dmxdev_buffer_read(dmxdev_buffer_t *src, int non_blocking, 
+dvb_dmxdev_buffer_read(struct dmxdev_buffer *src, int non_blocking, 
 		       char *buf, size_t count, loff_t *ppos)
 {
 	unsigned long todo=count;
@@ -159,8 +159,8 @@ dvb_dmxdev_buffer_read(dmxdev_buffer_t *src, int non_blocking,
 	return count;
 }
 
-static dmx_frontend_t *
-get_fe(dmx_demux_t *demux, int type)
+static struct dmx_frontend *
+get_fe(struct dmx_demux *demux, int type)
 {
 	struct list_head *head, *pos;
 
@@ -175,7 +175,7 @@ get_fe(dmx_demux_t *demux, int type)
 }
 
 static inline void 
-dvb_dmxdev_dvr_state_set(dmxdev_dvr_t *dmxdevdvr, int state)
+dvb_dmxdev_dvr_state_set(struct dmxdev_dvr *dmxdevdvr, int state)
 {
 	spin_lock_irq(&dmxdevdvr->dev->lock);
 	dmxdevdvr->state=state;
@@ -185,8 +185,8 @@ dvb_dmxdev_dvr_state_set(dmxdev_dvr_t *dmxdevdvr, int state)
 static int dvb_dvr_open(struct inode *inode, struct file *file)
 {
 	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
-	dmxdev_t *dmxdev=(dmxdev_t *) dvbdev->priv;
-	dmx_frontend_t *front;
+	struct dmxdev *dmxdev=(struct dmxdev *) dvbdev->priv;
+	struct dmx_frontend *front;
 
 	dprintk ("function : %s\n", __FUNCTION__);
 
@@ -234,7 +234,7 @@ static int dvb_dvr_open(struct inode *inode, struct file *file)
 static int dvb_dvr_release(struct inode *inode, struct file *file)
 {
 	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
-	dmxdev_t *dmxdev=(dmxdev_t *) dvbdev->priv;
+	struct dmxdev *dmxdev=(struct dmxdev *) dvbdev->priv;
 
 	if (down_interruptible (&dmxdev->mutex))
 		return -ERESTARTSYS;
@@ -262,7 +262,7 @@ static ssize_t
 dvb_dvr_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
 {
 	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
-	dmxdev_t *dmxdev=(dmxdev_t *) dvbdev->priv;
+	struct dmxdev *dmxdev=(struct dmxdev *) dvbdev->priv;
 	int ret;
 
 	if (!dmxdev->demux->write)
@@ -280,7 +280,7 @@ static ssize_t
 dvb_dvr_read(struct file *file, char *buf, size_t count, loff_t *ppos)
 {
 	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
-	dmxdev_t *dmxdev=(dmxdev_t *) dvbdev->priv;
+	struct dmxdev *dmxdev=(struct dmxdev *) dvbdev->priv;
 	int ret;
 
 	//down(&dmxdev->mutex);
@@ -292,7 +292,7 @@ dvb_dvr_read(struct file *file, char *buf, size_t count, loff_t *ppos)
 }
 
 static inline void 
-dvb_dmxdev_filter_state_set(dmxdev_filter_t *dmxdevfilter, int state)
+dvb_dmxdev_filter_state_set(struct dmxdev_filter *dmxdevfilter, int state)
 {
 	spin_lock_irq(&dmxdevfilter->dev->lock);
 	dmxdevfilter->state=state;
@@ -300,9 +300,9 @@ dvb_dmxdev_filter_state_set(dmxdev_filter_t *dmxdevfilter, int state)
 }
 
 static int 
-dvb_dmxdev_set_buffer_size(dmxdev_filter_t *dmxdevfilter, unsigned long size)
+dvb_dmxdev_set_buffer_size(struct dmxdev_filter *dmxdevfilter, unsigned long size)
 {
-	dmxdev_buffer_t *buf=&dmxdevfilter->buffer;
+	struct dmxdev_buffer *buf=&dmxdevfilter->buffer;
 	void *mem;
 
 	if (buf->size==size)
@@ -332,7 +332,7 @@ dvb_dmxdev_set_buffer_size(dmxdev_filter_t *dmxdevfilter, unsigned long size)
 static void
 dvb_dmxdev_filter_timeout(unsigned long data)
 {
-	dmxdev_filter_t *dmxdevfilter=(dmxdev_filter_t *)data;
+	struct dmxdev_filter *dmxdevfilter=(struct dmxdev_filter *)data;
 	
 	dmxdevfilter->buffer.error=-ETIMEDOUT;
 	spin_lock_irq(&dmxdevfilter->dev->lock);
@@ -342,7 +342,7 @@ dvb_dmxdev_filter_timeout(unsigned long data)
 }
 
 static void
-dvb_dmxdev_filter_timer(dmxdev_filter_t *dmxdevfilter)
+dvb_dmxdev_filter_timer(struct dmxdev_filter *dmxdevfilter)
 {
 	struct dmx_sct_filter_params *para=&dmxdevfilter->params.sec;
   
@@ -358,9 +358,9 @@ dvb_dmxdev_filter_timer(dmxdev_filter_t *dmxdevfilter)
 static int 
 dvb_dmxdev_section_callback(const u8 *buffer1, size_t buffer1_len,
 			    const u8 *buffer2, size_t buffer2_len,
-			    dmx_section_filter_t *filter, dmx_success_t success)
+			    struct dmx_section_filter *filter, dmx_success_t success)
 {
-	dmxdev_filter_t *dmxdevfilter=(dmxdev_filter_t *) filter->priv;
+	struct dmxdev_filter *dmxdevfilter=(struct dmxdev_filter *) filter->priv;
 	int ret;
 	
 	if (dmxdevfilter->buffer.error) {
@@ -395,10 +395,10 @@ dvb_dmxdev_section_callback(const u8 *buffer1, size_t buffer1_len,
 static int 
 dvb_dmxdev_ts_callback(const u8 *buffer1, size_t buffer1_len,
 		       const u8 *buffer2, size_t buffer2_len,
-		       dmx_ts_feed_t *feed, dmx_success_t success)
+		       struct dmx_ts_feed *feed, dmx_success_t success)
 {
-	dmxdev_filter_t *dmxdevfilter=(dmxdev_filter_t *) feed->priv;
-	dmxdev_buffer_t *buffer;
+	struct dmxdev_filter *dmxdevfilter=(struct dmxdev_filter *) feed->priv;
+	struct dmxdev_buffer *buffer;
 	int ret;
 	
 	spin_lock(&dmxdevfilter->dev->lock);
@@ -432,7 +432,7 @@ dvb_dmxdev_ts_callback(const u8 *buffer1, size_t buffer1_len,
 /* stop feed but only mark the specified filter as stopped (state set) */
 
 static int 
-dvb_dmxdev_feed_stop(dmxdev_filter_t *dmxdevfilter)
+dvb_dmxdev_feed_stop(struct dmxdev_filter *dmxdevfilter)
 {
 	dvb_dmxdev_filter_state_set(dmxdevfilter, DMXDEV_STATE_SET);
 
@@ -454,7 +454,7 @@ dvb_dmxdev_feed_stop(dmxdev_filter_t *dmxdevfilter)
 /* start feed associated with the specified filter */
 
 static
-int dvb_dmxdev_feed_start(dmxdev_filter_t *filter)
+int dvb_dmxdev_feed_start(struct dmxdev_filter *filter)
 {
 	dvb_dmxdev_filter_state_set (filter, DMXDEV_STATE_GO);
 
@@ -477,10 +477,10 @@ int dvb_dmxdev_feed_start(dmxdev_filter_t *filter)
    otherwise release the feed */
 
 static
-int dvb_dmxdev_feed_restart(dmxdev_filter_t *filter)
+int dvb_dmxdev_feed_restart(struct dmxdev_filter *filter)
 {
 	int i;
-	dmxdev_t *dmxdev = filter->dev;
+	struct dmxdev *dmxdev = filter->dev;
 	u16 pid = filter->params.sec.pid;
 	
 	for (i=0; i<dmxdev->filternum; i++) 
@@ -497,7 +497,7 @@ int dvb_dmxdev_feed_restart(dmxdev_filter_t *filter)
 }
 
 static int 
-dvb_dmxdev_filter_stop(dmxdev_filter_t *dmxdevfilter)
+dvb_dmxdev_filter_stop(struct dmxdev_filter *dmxdevfilter)
 {
 	if (dmxdevfilter->state<DMXDEV_STATE_GO) 
 		return 0;
@@ -533,7 +533,7 @@ dvb_dmxdev_filter_stop(dmxdev_filter_t *dmxdevfilter)
 }
 
 static inline int 
-dvb_dmxdev_filter_reset(dmxdev_filter_t *dmxdevfilter)
+dvb_dmxdev_filter_reset(struct dmxdev_filter *dmxdevfilter)
 {
 	if (dmxdevfilter->state<DMXDEV_STATE_SET) 
 		return 0;
@@ -545,9 +545,9 @@ dvb_dmxdev_filter_reset(dmxdev_filter_t *dmxdevfilter)
 }
 
 static int 
-dvb_dmxdev_filter_start(dmxdev_filter_t *filter)
+dvb_dmxdev_filter_start(struct dmxdev_filter *filter)
 {
-	dmxdev_t *dmxdev = filter->dev;
+	struct dmxdev *dmxdev = filter->dev;
 	void *mem;
 	int ret, i;
 
@@ -572,8 +572,8 @@ dvb_dmxdev_filter_start(dmxdev_filter_t *filter)
 	case DMXDEV_TYPE_SEC:
 	{
 		struct dmx_sct_filter_params *para=&filter->params.sec;
-		dmx_section_filter_t **secfilter=&filter->filter.sec;
-		dmx_section_feed_t **secfeed=&filter->feed.sec;
+		struct dmx_section_filter **secfilter=&filter->filter.sec;
+		struct dmx_section_feed **secfeed=&filter->feed.sec;
 
 		*secfilter=0;
 		*secfeed=0;
@@ -655,7 +655,7 @@ dvb_dmxdev_filter_start(dmxdev_filter_t *filter)
 		int ret;
 		int ts_type;
 		dmx_ts_pes_t ts_pes;
-		dmx_ts_feed_t **tsfeed = &filter->feed.ts;
+		struct dmx_ts_feed **tsfeed = &filter->feed.ts;
 		
 		filter->feed.ts = 0;
 		otype=para->output;
@@ -707,9 +707,9 @@ dvb_dmxdev_filter_start(dmxdev_filter_t *filter)
 static int dvb_demux_open(struct inode *inode, struct file *file)
 {
 	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
-	dmxdev_t *dmxdev=(dmxdev_t *) dvbdev->priv;
+	struct dmxdev *dmxdev=(struct dmxdev *) dvbdev->priv;
 	int i;
-	dmxdev_filter_t *dmxdevfilter;
+	struct dmxdev_filter *dmxdevfilter;
 
 	if (!dmxdev->filter)
 		return -EINVAL;
@@ -743,7 +743,7 @@ static int dvb_demux_open(struct inode *inode, struct file *file)
 
 
 static
-int dvb_dmxdev_filter_free(dmxdev_t *dmxdev, dmxdev_filter_t *dmxdevfilter)
+int dvb_dmxdev_filter_free(struct dmxdev *dmxdev, struct dmxdev_filter *dmxdevfilter)
 {
 	if (down_interruptible(&dmxdev->mutex))
 		return -ERESTARTSYS;
@@ -783,8 +783,8 @@ invert_mode(dmx_filter_t *filter)
 
 
 static int 
-dvb_dmxdev_filter_set(dmxdev_t *dmxdev, 
-		dmxdev_filter_t *dmxdevfilter, 
+dvb_dmxdev_filter_set(struct dmxdev *dmxdev, 
+		struct dmxdev_filter *dmxdevfilter, 
 		struct dmx_sct_filter_params *params)
 {
 	dprintk ("function : %s\n", __FUNCTION__);
@@ -805,8 +805,8 @@ dvb_dmxdev_filter_set(dmxdev_t *dmxdev,
 }
 
 static int 
-dvb_dmxdev_pes_filter_set(dmxdev_t *dmxdev,
-		   dmxdev_filter_t *dmxdevfilter,
+dvb_dmxdev_pes_filter_set(struct dmxdev *dmxdev,
+		   struct dmxdev_filter *dmxdevfilter,
 		   struct dmx_pes_filter_params *params)
 {
 	dvb_dmxdev_filter_stop(dmxdevfilter);
@@ -827,7 +827,7 @@ dvb_dmxdev_pes_filter_set(dmxdev_t *dmxdev,
 }
 
 static ssize_t 
-dvb_dmxdev_read_sec(dmxdev_filter_t *dfil, struct file *file, 
+dvb_dmxdev_read_sec(struct dmxdev_filter *dfil, struct file *file, 
 	      char *buf, size_t count, loff_t *ppos)
 {
 	int result, hcount;
@@ -869,7 +869,7 @@ dvb_dmxdev_read_sec(dmxdev_filter_t *dfil, struct file *file,
 ssize_t 
 dvb_demux_read(struct file *file, char *buf, size_t count, loff_t *ppos)
 {
-	dmxdev_filter_t *dmxdevfilter=dvb_dmxdev_file_to_filter(file);
+	struct dmxdev_filter *dmxdevfilter=dvb_dmxdev_file_to_filter(file);
 	int ret=0;
 
 	if (down_interruptible(&dmxdevfilter->mutex))
@@ -890,8 +890,8 @@ dvb_demux_read(struct file *file, char *buf, size_t count, loff_t *ppos)
 static int dvb_demux_do_ioctl(struct inode *inode, struct file *file,
 			      unsigned int cmd, void *parg)
 {
-	dmxdev_filter_t *dmxdevfilter=dvb_dmxdev_file_to_filter(file);
-	dmxdev_t *dmxdev=dmxdevfilter->dev;
+	struct dmxdev_filter *dmxdevfilter=dvb_dmxdev_file_to_filter(file);
+	struct dmxdev *dmxdev=dmxdevfilter->dev;
 	unsigned long arg=(unsigned long) parg;
 	int ret=0;
   
@@ -988,7 +988,7 @@ static int dvb_demux_ioctl(struct inode *inode, struct file *file,
 static
 unsigned int dvb_demux_poll (struct file *file, poll_table *wait)
 {
-	dmxdev_filter_t *dmxdevfilter = dvb_dmxdev_file_to_filter(file);
+	struct dmxdev_filter *dmxdevfilter = dvb_dmxdev_file_to_filter(file);
 	unsigned int mask = 0;
 
 	if (!dmxdevfilter)
@@ -1014,8 +1014,8 @@ unsigned int dvb_demux_poll (struct file *file, poll_table *wait)
 static
 int dvb_demux_release(struct inode *inode, struct file *file)
 {
-	dmxdev_filter_t *dmxdevfilter = dvb_dmxdev_file_to_filter(file);
-	dmxdev_t *dmxdev = dmxdevfilter->dev;
+	struct dmxdev_filter *dmxdevfilter = dvb_dmxdev_file_to_filter(file);
+	struct dmxdev *dmxdev = dmxdevfilter->dev;
 
 	return dvb_dmxdev_filter_free(dmxdev, dmxdevfilter);
 }
@@ -1043,7 +1043,7 @@ static int dvb_dvr_do_ioctl(struct inode *inode, struct file *file,
 		     unsigned int cmd, void *parg)
 {
 	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
-	dmxdev_t *dmxdev=(dmxdev_t *) dvbdev->priv;
+	struct dmxdev *dmxdev=(struct dmxdev *) dvbdev->priv;
 
 	int ret=0;
 
@@ -1075,7 +1075,7 @@ static
 unsigned int dvb_dvr_poll (struct file *file, poll_table *wait)
 {
 	struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
-	dmxdev_t *dmxdev = (dmxdev_t *) dvbdev->priv;
+	struct dmxdev *dmxdev = (struct dmxdev *) dvbdev->priv;
 	unsigned int mask = 0;
 
 	dprintk ("function : %s\n", __FUNCTION__);
@@ -1115,18 +1115,18 @@ struct dvb_device dvbdev_dvr = {
 };
 
 int 
-dvb_dmxdev_init(dmxdev_t *dmxdev, struct dvb_adapter *dvb_adapter)
+dvb_dmxdev_init(struct dmxdev *dmxdev, struct dvb_adapter *dvb_adapter)
 {
 	int i;
 
 	if (dmxdev->demux->open(dmxdev->demux) < 0)
 		return -EUSERS;
 	
-	dmxdev->filter = vmalloc(dmxdev->filternum*sizeof(dmxdev_filter_t));
+	dmxdev->filter = vmalloc(dmxdev->filternum*sizeof(struct dmxdev_filter));
 	if (!dmxdev->filter)
 		return -ENOMEM;
 
-	dmxdev->dvr = vmalloc(dmxdev->filternum*sizeof(dmxdev_dvr_t));
+	dmxdev->dvr = vmalloc(dmxdev->filternum*sizeof(struct dmxdev_dvr));
 	if (!dmxdev->dvr) {
 		vfree(dmxdev->filter);
 		dmxdev->filter = NULL;
@@ -1154,7 +1154,7 @@ dvb_dmxdev_init(dmxdev_t *dmxdev, struct dvb_adapter *dvb_adapter)
 }
 
 void 
-dvb_dmxdev_release(dmxdev_t *dmxdev)
+dvb_dmxdev_release(struct dmxdev *dmxdev)
 {
 	dvb_unregister_device(dmxdev->dvbdev);
 	dvb_unregister_device(dmxdev->dvr_dvbdev);
diff --git a/linux/drivers/media/dvb/dvb-core/dmxdev.h b/linux/drivers/media/dvb/dvb-core/dmxdev.h
index e5bb864fb..c491f1e37 100644
--- a/linux/drivers/media/dvb/dvb-core/dmxdev.h
+++ b/linux/drivers/media/dvb/dvb-core/dmxdev.h
@@ -42,7 +42,7 @@ typedef enum {
 	DMXDEV_TYPE_NONE,
 	DMXDEV_TYPE_SEC,
 	DMXDEV_TYPE_PES,
-} dmxdev_type_t;
+} dmxdevype_t;
 
 typedef enum {
 	DMXDEV_STATE_FREE,
@@ -53,26 +53,25 @@ typedef enum {
 	DMXDEV_STATE_TIMEDOUT
 } dmxdev_state_t;
 
-typedef struct dmxdev_buffer {
+struct dmxdev_buffer {
         u8 *data;
         int size;
         int pread;
         int pwrite;
 	wait_queue_head_t queue;
         int error;
-} dmxdev_buffer_t;
+};
 
-
-typedef struct dmxdev_filter {
+struct dmxdev_filter {
 	struct dvb_device *dvbdev;
 
         union {
-	        dmx_section_filter_t *sec;
+	        struct dmx_section_filter *sec;
 	} filter;
 
         union {
-                dmx_ts_feed_t *ts;
-                dmx_section_feed_t *sec;
+                struct dmx_ts_feed *ts;
+                struct dmx_section_feed *sec;
 	} feed;
 
         union {
@@ -83,48 +82,48 @@ typedef struct dmxdev_filter {
         int type;
         dmxdev_state_t state;
         struct dmxdev *dev;
-        dmxdev_buffer_t buffer;
+        struct dmxdev_buffer buffer;
 
 	struct semaphore mutex;
 
-        // only for sections
+        /* only for sections */
         struct timer_list timer;
         int todo;
         u8 secheader[3];
 
         u16 pid;
-} dmxdev_filter_t;
+};
 
 
-typedef struct dmxdev_dvr {
+struct dmxdev_dvr {
         int state;
         struct dmxdev *dev;
-        dmxdev_buffer_t buffer;
-} dmxdev_dvr_t;
+        struct dmxdev_buffer buffer;
+};
 
 
-typedef struct dmxdev {
+struct dmxdev {
 	struct dvb_device *dvbdev;
 	struct dvb_device *dvr_dvbdev;
 
-        dmxdev_filter_t *filter;
-        dmxdev_dvr_t *dvr;
-        dmx_demux_t *demux;
+        struct dmxdev_filter *filter;
+        struct dmxdev_dvr *dvr;
+        struct dmx_demux *demux;
 
         int filternum;
         int capabilities;
 #define DMXDEV_CAP_DUPLEX 1
-        dmx_frontend_t *dvr_orig_fe;
+        struct dmx_frontend *dvr_orig_fe;
 
-        dmxdev_buffer_t dvr_buffer;
+        struct dmxdev_buffer dvr_buffer;
 #define DVR_BUFFER_SIZE (10*188*1024)
 
 	struct semaphore mutex;
 	spinlock_t lock;
-} dmxdev_t;
+};
 
 
-int dvb_dmxdev_init(dmxdev_t *dmxdev, struct dvb_adapter *);
-void dvb_dmxdev_release(dmxdev_t *dmxdev);
+int dvb_dmxdev_init(struct dmxdev *dmxdev, struct dvb_adapter *);
+void dvb_dmxdev_release(struct dmxdev *dmxdev);
 
 #endif /* _DMXDEV_H_ */
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_demux.c b/linux/drivers/media/dvb/dvb-core/dvb_demux.c
index 29699a433..973f3ba7a 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_demux.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_demux.c
@@ -38,14 +38,14 @@
 LIST_HEAD(dmx_muxs);
 
 
-int dmx_register_demux(dmx_demux_t *demux) 
+int dmx_register_demux(struct dmx_demux *demux) 
 {
 	demux->users = 0;
 	list_add(&demux->reg_list, &dmx_muxs);
 	return 0;
 }
 
-int dmx_unregister_demux(dmx_demux_t* demux)
+int dmx_unregister_demux(struct dmx_demux* demux)
 {
 	struct list_head *pos, *n, *head=&dmx_muxs;
 
@@ -196,7 +196,7 @@ int dvb_dmx_swfilter_section_feed (struct dvb_demux_feed *feed)
 {
 	struct dvb_demux *demux = feed->demux;
 	struct dvb_demux_filter *f = feed->filter;
-	dmx_section_feed_t *sec = &feed->feed.sec;
+	struct dmx_section_feed *sec = &feed->feed.sec;
 	u8 *buf = sec->secbuf;
 
 	if (sec->secbufp != sec->seclen)
@@ -228,7 +228,7 @@ static
 int dvb_dmx_swfilter_section_packet(struct dvb_demux_feed *feed, const u8 *buf) 
 {
 	struct dvb_demux *demux = feed->demux;
-	dmx_section_feed_t *sec = &feed->feed.sec;
+	struct dmx_section_feed *sec = &feed->feed.sec;
 	int p, count;
 	int ccok, rest;
 	u8 cc;
@@ -508,7 +508,7 @@ int dmx_pid_set (u16 pid, struct dvb_demux_feed *feed)
 
 
 static
-int dmx_ts_feed_set (struct dmx_ts_feed_s* ts_feed, u16 pid, int ts_type, 
+int dmx_ts_feed_set (struct dmx_ts_feed* ts_feed, u16 pid, int ts_type, 
 		     dmx_ts_pes_t pes_type, size_t callback_length, 
 		     size_t circular_buffer_size, int descramble, 
 		     struct timespec timeout)
@@ -584,7 +584,7 @@ int dmx_ts_feed_set (struct dmx_ts_feed_s* ts_feed, u16 pid, int ts_type,
 
 
 static
-int dmx_ts_feed_start_filtering(struct dmx_ts_feed_s* ts_feed)
+int dmx_ts_feed_start_filtering(struct dmx_ts_feed* ts_feed)
 {
 	struct dvb_demux_feed *feed = (struct dvb_demux_feed *) ts_feed;
 	struct dvb_demux *demux = feed->demux;
@@ -618,7 +618,7 @@ int dmx_ts_feed_start_filtering(struct dmx_ts_feed_s* ts_feed)
 }
  
 static
-int dmx_ts_feed_stop_filtering(struct dmx_ts_feed_s* ts_feed)
+int dmx_ts_feed_stop_filtering(struct dmx_ts_feed* ts_feed)
 {
 	struct dvb_demux_feed *feed = (struct dvb_demux_feed *) ts_feed;
 	struct dvb_demux *demux = feed->demux;
@@ -649,7 +649,7 @@ int dmx_ts_feed_stop_filtering(struct dmx_ts_feed_s* ts_feed)
 }
 
 static
-int dvbdmx_allocate_ts_feed (dmx_demux_t *dmx, dmx_ts_feed_t **ts_feed, 
+int dvbdmx_allocate_ts_feed (struct dmx_demux *dmx, struct dmx_ts_feed **ts_feed, 
 			     dmx_ts_cb callback)
 {
 	struct dvb_demux *demux = (struct dvb_demux *) dmx;
@@ -695,7 +695,7 @@ int dvbdmx_allocate_ts_feed (dmx_demux_t *dmx, dmx_ts_feed_t **ts_feed,
 }
 
 static
-int dvbdmx_release_ts_feed(dmx_demux_t *dmx, dmx_ts_feed_t *ts_feed)
+int dvbdmx_release_ts_feed(struct dmx_demux *dmx, struct dmx_ts_feed *ts_feed)
 {
 	struct dvb_demux *demux = (struct dvb_demux *) dmx;
 	struct dvb_demux_feed *feed = (struct dvb_demux_feed *) ts_feed;
@@ -741,8 +741,8 @@ int dvbdmx_release_ts_feed(dmx_demux_t *dmx, dmx_ts_feed_t *ts_feed)
  ******************************************************************************/
 
 static int
-dmx_section_feed_allocate_filter(struct dmx_section_feed_s* feed, 
-				     dmx_section_filter_t** filter) 
+dmx_section_feed_allocate_filter(struct dmx_section_feed* feed, 
+				     struct dmx_section_filter** filter) 
 {
 	struct dvb_demux_feed *dvbdmxfeed = (struct dvb_demux_feed *) feed;
 	struct dvb_demux *dvbdemux = dvbdmxfeed->demux;
@@ -774,7 +774,7 @@ dmx_section_feed_allocate_filter(struct dmx_section_feed_s* feed,
 
 
 static int
-dmx_section_feed_set(struct dmx_section_feed_s* feed, 
+dmx_section_feed_set(struct dmx_section_feed* feed, 
 			 u16 pid, size_t circular_buffer_size, 
 			 int descramble, int check_crc) 
 {
@@ -829,7 +829,7 @@ static void prepare_secfilters(struct dvb_demux_feed *dvbdmxfeed)
 {
 	int i;
 	struct dvb_demux_filter *f;
-	dmx_section_filter_t *sf;
+	struct dmx_section_filter *sf;
 	u8 mask, mode, doneq;
 
 	if (!(f=dvbdmxfeed->filter))
@@ -849,7 +849,7 @@ static void prepare_secfilters(struct dvb_demux_feed *dvbdmxfeed)
 
 
 static int 
-dmx_section_feed_start_filtering(dmx_section_feed_t *feed)
+dmx_section_feed_start_filtering(struct dmx_section_feed *feed)
 {
 	struct dvb_demux_feed *dvbdmxfeed = (struct dvb_demux_feed *) feed;
 	struct dvb_demux *dvbdmx = dvbdmxfeed->demux;
@@ -894,7 +894,7 @@ dmx_section_feed_start_filtering(dmx_section_feed_t *feed)
 
 
 static int
-dmx_section_feed_stop_filtering(struct dmx_section_feed_s* feed)
+dmx_section_feed_stop_filtering(struct dmx_section_feed* feed)
 {
 	struct dvb_demux_feed *dvbdmxfeed = (struct dvb_demux_feed *) feed;
 	struct dvb_demux *dvbdmx = dvbdmxfeed->demux;
@@ -921,8 +921,8 @@ dmx_section_feed_stop_filtering(struct dmx_section_feed_s* feed)
 
 
 static int 
-dmx_section_feed_release_filter(dmx_section_feed_t *feed, 
-				dmx_section_filter_t* filter)
+dmx_section_feed_release_filter(struct dmx_section_feed *feed, 
+				struct dmx_section_filter* filter)
 {
 	struct dvb_demux_filter *dvbdmxfilter = (struct dvb_demux_filter *) filter, *f;
 	struct dvb_demux_feed *dvbdmxfeed = (struct dvb_demux_feed *) feed;
@@ -956,8 +956,8 @@ dmx_section_feed_release_filter(dmx_section_feed_t *feed,
 	return 0;
 }
 
-static int dvbdmx_allocate_section_feed(dmx_demux_t *demux, 
-					dmx_section_feed_t **feed,
+static int dvbdmx_allocate_section_feed(struct dmx_demux *demux, 
+					struct dmx_section_feed **feed,
 					dmx_section_cb callback)
 {
 	struct dvb_demux *dvbdmx = (struct dvb_demux *) demux;
@@ -994,8 +994,8 @@ static int dvbdmx_allocate_section_feed(dmx_demux_t *demux,
 	return 0;
 }
 
-static int dvbdmx_release_section_feed(dmx_demux_t *demux, 
-				       dmx_section_feed_t *feed)
+static int dvbdmx_release_section_feed(struct dmx_demux *demux, 
+				       struct dmx_section_feed *feed)
 {
 	struct dvb_demux_feed *dvbdmxfeed = (struct dvb_demux_feed *) feed;
 	struct dvb_demux *dvbdmx = (struct dvb_demux *) demux;
@@ -1035,7 +1035,7 @@ static int dvbdmx_release_section_feed(dmx_demux_t *demux,
  * dvb_demux kernel data API calls
  ******************************************************************************/
 
-static int dvbdmx_open(dmx_demux_t *demux)
+static int dvbdmx_open(struct dmx_demux *demux)
 {
 	struct dvb_demux *dvbdemux = (struct dvb_demux *) demux;
 
@@ -1047,7 +1047,7 @@ static int dvbdmx_open(dmx_demux_t *demux)
 }
 
 
-static int dvbdmx_close(struct dmx_demux_s *demux)
+static int dvbdmx_close(struct dmx_demux *demux)
 {
 	struct dvb_demux *dvbdemux = (struct dvb_demux *) demux;
 
@@ -1060,7 +1060,7 @@ static int dvbdmx_close(struct dmx_demux_s *demux)
 }
 
 
-static int dvbdmx_write(dmx_demux_t *demux, const char *buf, size_t count)
+static int dvbdmx_write(struct dmx_demux *demux, const char *buf, size_t count)
 {
 	struct dvb_demux *dvbdemux=(struct dvb_demux *) demux;
 
@@ -1077,7 +1077,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)
+static int dvbdmx_add_frontend(struct dmx_demux *demux, struct dmx_frontend *frontend)
 {
 	struct dvb_demux *dvbdemux = (struct dvb_demux *) demux;
 	struct list_head *head = &dvbdemux->frontend_list;
@@ -1089,7 +1089,7 @@ static int dvbdmx_add_frontend(dmx_demux_t *demux, dmx_frontend_t *frontend)
 
 
 static int
-dvbdmx_remove_frontend(dmx_demux_t *demux, dmx_frontend_t *frontend)
+dvbdmx_remove_frontend(struct dmx_demux *demux, struct dmx_frontend *frontend)
 {
 	struct dvb_demux *dvbdemux = (struct dvb_demux *) demux;
 	struct list_head *pos, *n, *head = &dvbdemux->frontend_list;
@@ -1106,7 +1106,7 @@ dvbdmx_remove_frontend(dmx_demux_t *demux, dmx_frontend_t *frontend)
 
 
 static struct list_head*
-dvbdmx_get_frontends(dmx_demux_t *demux)
+dvbdmx_get_frontends(struct dmx_demux *demux)
 {
 	struct dvb_demux *dvbdemux = (struct dvb_demux *) demux;
 
@@ -1117,7 +1117,7 @@ dvbdmx_get_frontends(dmx_demux_t *demux)
 }
 
 
-int dvbdmx_connect_frontend(dmx_demux_t *demux, dmx_frontend_t *frontend)
+int dvbdmx_connect_frontend(struct dmx_demux *demux, struct dmx_frontend *frontend)
 {
 	struct dvb_demux *dvbdemux = (struct dvb_demux *) demux;
 
@@ -1133,7 +1133,7 @@ int dvbdmx_connect_frontend(dmx_demux_t *demux, dmx_frontend_t *frontend)
 }
 
 
-int dvbdmx_disconnect_frontend(dmx_demux_t *demux)
+int dvbdmx_disconnect_frontend(struct dmx_demux *demux)
 {
 	struct dvb_demux *dvbdemux = (struct dvb_demux *) demux;
 
@@ -1147,7 +1147,7 @@ int dvbdmx_disconnect_frontend(dmx_demux_t *demux)
 }
 
 
-static int dvbdmx_get_pes_pids(dmx_demux_t *demux, u16 *pids)
+static int dvbdmx_get_pes_pids(struct dmx_demux *demux, u16 *pids)
 {
 	struct dvb_demux *dvbdemux = (struct dvb_demux *) demux;
 
@@ -1160,7 +1160,7 @@ int
 dvb_dmx_init(struct dvb_demux *dvbdemux)
 {
 	int i, err;
-	dmx_demux_t *dmx = &dvbdemux->dmx;
+	struct dmx_demux *dmx = &dvbdemux->dmx;
 
 	dvbdemux->users = 0;
 	dvbdemux->filter = vmalloc(dvbdemux->filternum*sizeof(struct dvb_demux_filter));
@@ -1237,7 +1237,7 @@ dvb_dmx_init(struct dvb_demux *dvbdemux)
 int 
 dvb_dmx_release(struct dvb_demux *dvbdemux)
 {
-	dmx_demux_t *dmx = &dvbdemux->dmx;
+	struct dmx_demux *dmx = &dvbdemux->dmx;
 
 	dmx_unregister_demux(dmx);
 	if (dvbdemux->filter)
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_demux.h b/linux/drivers/media/dvb/dvb-core/dvb_demux.h
index 96eb418bd..35dc8d4b3 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_demux.h
+++ b/linux/drivers/media/dvb/dvb-core/dvb_demux.h
@@ -45,7 +45,7 @@
 #define DVB_DEMUX_MASK_MAX 18
 
 struct dvb_demux_filter {
-        dmx_section_filter_t filter;
+        struct dmx_section_filter filter;
         u8 maskandmode    [DMX_MAX_FILTER_SIZE]; 
         u8 maskandnotmode [DMX_MAX_FILTER_SIZE]; 
 	int doneq;
@@ -68,8 +68,8 @@ struct dvb_demux_filter {
 
 struct dvb_demux_feed {
         union {
-	        dmx_ts_feed_t ts;
-	        dmx_section_feed_t sec;
+	        struct dmx_ts_feed ts;
+	        struct dmx_section_feed sec;
 	} feed;
 
         union {
@@ -101,7 +101,7 @@ struct dvb_demux_feed {
 };
 
 struct dvb_demux {
-        dmx_demux_t dmx;
+        struct dmx_demux dmx;
         void *priv;
         int filternum;
         int feednum;
@@ -142,8 +142,8 @@ void dvb_dmx_swfilter_packet(struct dvb_demux *dvbdmx, const u8 *buf);
 void dvb_dmx_swfilter_packets(struct dvb_demux *dvbdmx, const u8 *buf, size_t count);
 void dvb_dmx_swfilter(struct dvb_demux *demux, const u8 *buf, size_t count);
 
-int dvbdmx_connect_frontend(dmx_demux_t *demux, dmx_frontend_t *frontend);
-int dvbdmx_disconnect_frontend(dmx_demux_t *demux);
+int dvbdmx_connect_frontend(struct dmx_demux *demux, struct dmx_frontend *frontend);
+int dvbdmx_disconnect_frontend(struct dmx_demux *demux);
 
 #endif /* _DVB_DEMUX_H_ */
 
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_filter.c b/linux/drivers/media/dvb/dvb-core/dvb_filter.c
index 44ad8e563..718ea900b 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_filter.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_filter.c
@@ -69,7 +69,7 @@ void ts_to_pes(ipack *p, u8 *buf) // don't need count (=188)
 #if 0
 /* needs 5 byte input, returns picture coding type*/
 static
-int read_picture_header(u8 *headr, mpg_picture *pic, int field, int pr)
+int read_picture_header(u8 *headr, struct mpg_picture *pic, int field, int pr)
 {
 	u8 pct;
 
@@ -116,7 +116,7 @@ int read_picture_header(u8 *headr, mpg_picture *pic, int field, int pr)
 #if 0
 /* needs 4 byte input */
 static
-int read_gop_header(u8 *headr, mpg_picture *pic, int pr)
+int read_gop_header(u8 *headr, struct mpg_picture *pic, int pr)
 {
 	if (pr) printk("GOP header: "); 
 
@@ -148,7 +148,7 @@ int read_gop_header(u8 *headr, mpg_picture *pic, int pr)
 #if 0
 /* needs 8 byte input */
 static
-int read_sequence_header(u8 *headr, VideoInfo *vi, int pr)
+int read_sequence_header(u8 *headr, struct dvb_video_info *vi, int pr)
 {
         int sw;
 	int form = -1;
@@ -263,7 +263,7 @@ int read_sequence_header(u8 *headr, VideoInfo *vi, int pr)
 
 #if 0
 static
-int get_vinfo(u8 *mbuf, int count, VideoInfo *vi, int pr)
+int get_vinfo(u8 *mbuf, int count, struct dvb_video_info *vi, int pr)
 {
 	u8 *headr;
 	int found = 0;
@@ -293,7 +293,7 @@ int get_vinfo(u8 *mbuf, int count, VideoInfo *vi, int pr)
 
 #if 0
 static
-int get_ainfo(u8 *mbuf, int count, AudioInfo *ai, int pr)
+int get_ainfo(u8 *mbuf, int count, struct dvb_audio_info *ai, int pr)
 {
 	u8 *headr;
 	int found = 0;
@@ -348,7 +348,7 @@ int get_ainfo(u8 *mbuf, int count, AudioInfo *ai, int pr)
 #endif
 
 
-int dvb_filter_get_ac3info(u8 *mbuf, int count, AudioInfo *ai, int pr)
+int dvb_filter_get_ac3info(u8 *mbuf, int count, struct dvb_audio_info *ai, int pr)
 {
 	u8 *headr;
 	int found = 0;
@@ -467,7 +467,7 @@ void initialize_quant_matrix( u32 *matrix )
 
 #if 0
 static
-void initialize_mpg_picture(mpg_picture *pic)
+void initialize_mpg_picture(struct mpg_picture *pic)
 {
         int i;
 
@@ -495,7 +495,7 @@ void initialize_mpg_picture(mpg_picture *pic)
 
 #if 0
 static
-void mpg_set_picture_parameter( int32_t field_type, mpg_picture *pic )
+void mpg_set_picture_parameter( int32_t field_type, struct mpg_picture *pic )
 {
         int16_t last_h_offset;
         int16_t last_v_offset;
@@ -534,7 +534,7 @@ void mpg_set_picture_parameter( int32_t field_type, mpg_picture *pic )
 
 #if 0
 static
-void init_mpg_picture( mpg_picture *pic, int chan, int32_t field_type)
+void init_mpg_picture( struct mpg_picture *pic, int chan, int32_t field_type)
 {
         pic->picture_header = 0;
         pic->sequence_header_data
@@ -563,7 +563,7 @@ void init_mpg_picture( mpg_picture *pic, int chan, int32_t field_type)
 }
 #endif
 
-void dvb_filter_pes2ts_init(dvb_filter_pes2ts_t *p2ts, unsigned short pid, 
+void dvb_filter_pes2ts_init(struct dvb_filter_pes2ts *p2ts, unsigned short pid, 
 			    dvb_filter_pes2ts_cb_t *cb, void *priv)
 {
 	unsigned char *buf=p2ts->buf;
@@ -576,7 +576,7 @@ void dvb_filter_pes2ts_init(dvb_filter_pes2ts_t *p2ts, unsigned short pid,
 	p2ts->priv=priv;
 }
 
-int dvb_filter_pes2ts(dvb_filter_pes2ts_t *p2ts, unsigned char *pes, int len)
+int dvb_filter_pes2ts(struct dvb_filter_pes2ts *p2ts, unsigned char *pes, int len)
 {
 	unsigned char *buf=p2ts->buf;
 	int ret=0, rest;
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_filter.h b/linux/drivers/media/dvb/dvb-core/dvb_filter.h
index ace51c7fb..f79f67638 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_filter.h
+++ b/linux/drivers/media/dvb/dvb-core/dvb_filter.h
@@ -7,17 +7,17 @@
 
 typedef int (dvb_filter_pes2ts_cb_t) (void *, unsigned char *);
 
-typedef struct dvb_filter_pes2ts_s {
+struct dvb_filter_pes2ts {
 	unsigned char buf[188];
         unsigned char cc;
         dvb_filter_pes2ts_cb_t *cb;
 	void *priv;
-} dvb_filter_pes2ts_t;
+};
 
-void dvb_filter_pes2ts_init(dvb_filter_pes2ts_t *p2ts, unsigned short pid, 
+void dvb_filter_pes2ts_init(struct dvb_filter_pes2ts *p2ts, unsigned short pid, 
 		 	    dvb_filter_pes2ts_cb_t *cb, void *priv);
 
-int dvb_filter_pes2ts(dvb_filter_pes2ts_t *p2ts, unsigned char *pes, int len);
+int dvb_filter_pes2ts(struct dvb_filter_pes2ts *p2ts, unsigned char *pes, int len);
 
 
 #define PROG_STREAM_MAP  0xBC
@@ -110,7 +110,7 @@ int dvb_filter_pes2ts(dvb_filter_pes2ts_t *p2ts, unsigned char *pes, int len);
 #define IPACKS 2048
 #endif
 
-typedef struct ipack_s {
+struct ipack {
 	int size;
 	int found;
 	u8 *buf;
@@ -130,9 +130,9 @@ typedef struct ipack_s {
 	void (*func)(u8 *buf,  int size, void *priv);
 	int count;
 	int repack_subids;
-} ipack;
+};
 
-typedef struct video_i{
+struct dvb_video_info {
 	u32 horizontal_size;
 	u32 vertical_size;
 	u32 aspect_ratio;
@@ -144,17 +144,16 @@ typedef struct video_i{
         s16 vbv_delay;
 	u32 CSPF;
 	u32 off;
-} VideoInfo;            
-
+};            
 
 #define OFF_SIZE 4
 #define FIRST_FIELD 0
 #define SECOND_FIELD 1
 #define VIDEO_FRAME_PICTURE 0x03
 
-typedef struct mpg_picture_s{
+struct mpg_picture {
         int       channel;
-	VideoInfo vinfo;
+	struct dvb_video_info vinfo;
         u32      *sequence_gop_header;
         u32      *picture_header;
         s32       time_code;
@@ -207,12 +206,9 @@ typedef struct mpg_picture_s{
                   /* picture_display_extenion() 0:no 1:exit*/
         s8        pts_flag[2];
                   /* [0] 1st field, [1] 2nd field */
-} mpg_picture;
-
-
-
+};
 
-typedef struct audio_i{
+struct dvb_audio_info {
 	int layer;
 	u32 bit_rate;
 	u32 frequency;
@@ -221,9 +217,9 @@ typedef struct audio_i{
 	u32 emphasis;
 	u32 framesize;
 	u32 off;
-} AudioInfo;
+};
 
-int dvb_filter_get_ac3info(u8 *mbuf, int count, AudioInfo *ai, int pr);
+int dvb_filter_get_ac3info(u8 *mbuf, int count, struct dvb_audio_info *ai, int pr);
 
 
 #endif
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_net.c b/linux/drivers/media/dvb/dvb-core/dvb_net.c
index 97c613004..82bf226e7 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_net.c
@@ -43,11 +43,11 @@ struct dvb_net_priv {
         struct net_device_stats stats;
         char name[6];
 	u16 pid;
-        struct dmx_demux_s *demux;
-	dmx_section_feed_t *secfeed;
-	dmx_section_filter_t *secfilter;
+        struct dmx_demux *demux;
+	struct dmx_section_feed *secfeed;
+	struct dmx_section_filter *secfilter;
 	int multi_num;
-	dmx_section_filter_t *multi_secfilter[DVB_NET_MULTICAST_MAX];
+	struct dmx_section_filter *multi_secfilter[DVB_NET_MULTICAST_MAX];
 	unsigned char multi_macs[DVB_NET_MULTICAST_MAX][6];
 	int mode;
 };
@@ -138,7 +138,7 @@ dvb_net_sec(struct net_device *dev, const u8 *pkt, int pkt_len)
 static int 
 dvb_net_callback(const u8 *buffer1, size_t buffer1_len,
 		 const u8 *buffer2, size_t buffer2_len,
-		 dmx_section_filter_t *filter,
+		 struct dmx_section_filter *filter,
 		 dmx_success_t success)
 {
         struct net_device *dev=(struct net_device *) filter->priv;
@@ -162,7 +162,7 @@ static u8 mask_promisc[6]={0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
 static int 
 dvb_net_filter_set(struct net_device *dev, 
-		   dmx_section_filter_t **secfilter,
+		   struct dmx_section_filter **secfilter,
 		   u8 *mac, u8 *mac_mask)
 {
 	struct dvb_net_priv *priv = (struct dvb_net_priv*) dev->priv;
@@ -208,7 +208,7 @@ dvb_net_feed_start(struct net_device *dev)
 {
 	int ret, i;
 	struct dvb_net_priv *priv = (struct dvb_net_priv*) dev->priv;
-        dmx_demux_t *demux = priv->demux;
+        struct dmx_demux *demux = priv->demux;
         unsigned char *mac = (unsigned char *) dev->dev_addr;
 		
 	priv->secfeed=0;
@@ -433,7 +433,7 @@ int
 dvb_net_add_if(struct dvb_net *dvbnet, u16 pid)
 {
         struct net_device *net;
-	dmx_demux_t *demux;
+	struct dmx_demux *demux;
 	struct dvb_net_priv *priv;
 	int result;
 	int if_num;
@@ -572,7 +572,7 @@ dvb_net_release(struct dvb_net *dvbnet)
 }
 
 int
-dvb_net_init(struct dvb_adapter *adap, struct dvb_net *dvbnet, dmx_demux_t *dmx)
+dvb_net_init(struct dvb_adapter *adap, struct dvb_net *dvbnet, struct dmx_demux *dmx)
 {
 	int i;
 		
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_net.h b/linux/drivers/media/dvb/dvb-core/dvb_net.h
index 1813b2298..dd4f7f981 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_net.h
+++ b/linux/drivers/media/dvb/dvb-core/dvb_net.h
@@ -33,18 +33,18 @@
 
 #define DVB_NET_DEVICES_MAX 10
 
-typedef struct dvb_net {
+struct dvb_net {
 	struct dvb_device *dvbdev;
 	int card_num;
 	int dev_num;
 	struct net_device device[DVB_NET_DEVICES_MAX];
 	int state[DVB_NET_DEVICES_MAX];
-	dmx_demux_t *demux;
-} dvb_net_t;
+	struct dmx_demux *demux;
+};
 
 
 void dvb_net_release(struct dvb_net *);
-int  dvb_net_init(struct dvb_adapter *, struct dvb_net *, dmx_demux_t *);
+int  dvb_net_init(struct dvb_adapter *, struct dvb_net *, struct dmx_demux *);
 
 #endif
 
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_ringbuffer.c b/linux/drivers/media/dvb/dvb-core/dvb_ringbuffer.c
index 8a32231b0..fa1970619 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_ringbuffer.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_ringbuffer.c
@@ -43,7 +43,7 @@
 
 
 
-void dvb_ringbuffer_init(dvb_ringbuffer_t *rbuf, void *data, size_t len)
+void dvb_ringbuffer_init(struct dvb_ringbuffer *rbuf, void *data, size_t len)
 {
         rbuf->pread=rbuf->pwrite=0;
         rbuf->data=data;
@@ -56,14 +56,14 @@ void dvb_ringbuffer_init(dvb_ringbuffer_t *rbuf, void *data, size_t len)
 
 
 
-int dvb_ringbuffer_empty(dvb_ringbuffer_t *rbuf)
+int dvb_ringbuffer_empty(struct dvb_ringbuffer *rbuf)
 {
         return (rbuf->pread==rbuf->pwrite);
 }
 
 
 
-ssize_t dvb_ringbuffer_free(dvb_ringbuffer_t *rbuf)
+ssize_t dvb_ringbuffer_free(struct dvb_ringbuffer *rbuf)
 {
         ssize_t free;
   
@@ -75,7 +75,7 @@ ssize_t dvb_ringbuffer_free(dvb_ringbuffer_t *rbuf)
 
 
 
-ssize_t dvb_ringbuffer_avail(dvb_ringbuffer_t *rbuf)
+ssize_t dvb_ringbuffer_avail(struct dvb_ringbuffer *rbuf)
 {
         ssize_t avail;
   
@@ -87,14 +87,14 @@ ssize_t dvb_ringbuffer_avail(dvb_ringbuffer_t *rbuf)
 
 
 
-void dvb_ringbuffer_flush(dvb_ringbuffer_t *rbuf)
+void dvb_ringbuffer_flush(struct dvb_ringbuffer *rbuf)
 {
         rbuf->pread = rbuf->pwrite;
 }
 
 
 
-void dvb_ringbuffer_flush_spinlock_wakeup(dvb_ringbuffer_t *rbuf)
+void dvb_ringbuffer_flush_spinlock_wakeup(struct dvb_ringbuffer *rbuf)
 {
         unsigned long flags;
 
@@ -107,7 +107,7 @@ void dvb_ringbuffer_flush_spinlock_wakeup(dvb_ringbuffer_t *rbuf)
 
 
 
-ssize_t dvb_ringbuffer_read(dvb_ringbuffer_t *rbuf, u8 *buf, size_t len, int usermem)
+ssize_t dvb_ringbuffer_read(struct dvb_ringbuffer *rbuf, u8 *buf, size_t len, int usermem)
 {
         size_t todo = len;
         size_t split;
@@ -136,7 +136,7 @@ ssize_t dvb_ringbuffer_read(dvb_ringbuffer_t *rbuf, u8 *buf, size_t len, int use
 
 
 
-ssize_t dvb_ringbuffer_write(dvb_ringbuffer_t *rbuf, const u8 *buf,
+ssize_t dvb_ringbuffer_write(struct dvb_ringbuffer *rbuf, const u8 *buf,
                              size_t len, int usermem)
 {
         size_t todo = len;
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_ringbuffer.h b/linux/drivers/media/dvb/dvb-core/dvb_ringbuffer.h
index f0d8b8caf..df17ffc36 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_ringbuffer.h
+++ b/linux/drivers/media/dvb/dvb-core/dvb_ringbuffer.h
@@ -35,8 +35,7 @@
 #include <linux/spinlock.h>
 #include <linux/wait.h>
 
-
-typedef struct dvb_ringbuffer {
+struct dvb_ringbuffer {
         u8               *data;
         ssize_t           size;
         ssize_t           pread;
@@ -44,7 +43,7 @@ typedef struct dvb_ringbuffer {
 
         wait_queue_head_t queue;
         spinlock_t        lock;
-} dvb_ringbuffer_t;
+};
 
 
 /*
@@ -76,25 +75,25 @@ typedef struct dvb_ringbuffer {
 */
 
 /* initialize ring buffer, lock and queue */
-extern void dvb_ringbuffer_init(dvb_ringbuffer_t *rbuf, void *data, size_t len);
+extern void dvb_ringbuffer_init(struct dvb_ringbuffer *rbuf, void *data, size_t len);
 
 /* test whether buffer is empty */
-extern int dvb_ringbuffer_empty(dvb_ringbuffer_t *rbuf);
+extern int dvb_ringbuffer_empty(struct dvb_ringbuffer *rbuf);
 
 /* return the number of free bytes in the buffer */
-extern ssize_t dvb_ringbuffer_free(dvb_ringbuffer_t *rbuf);
+extern ssize_t dvb_ringbuffer_free(struct dvb_ringbuffer *rbuf);
 
 /* return the number of bytes waiting in the buffer */
-extern ssize_t dvb_ringbuffer_avail(dvb_ringbuffer_t *rbuf);
+extern ssize_t dvb_ringbuffer_avail(struct dvb_ringbuffer *rbuf);
 
 
 /* read routines & macros */
 /* ---------------------- */
 /* flush buffer */
-extern void dvb_ringbuffer_flush(dvb_ringbuffer_t *rbuf);
+extern void dvb_ringbuffer_flush(struct dvb_ringbuffer *rbuf);
 
 /* flush buffer protected by spinlock and wake-up waiting task(s) */
-extern void dvb_ringbuffer_flush_spinlock_wakeup(dvb_ringbuffer_t *rbuf);
+extern void dvb_ringbuffer_flush_spinlock_wakeup(struct dvb_ringbuffer *rbuf);
 
 /* peek at byte <offs> in the buffer */
 #define DVB_RINGBUFFER_PEEK(rbuf,offs)	\
@@ -109,7 +108,7 @@ extern void dvb_ringbuffer_flush_spinlock_wakeup(dvb_ringbuffer_t *rbuf);
 ** <usermem> specifies whether <buf> resides in user space
 ** returns number of bytes transferred or -EFAULT
 */
-extern ssize_t dvb_ringbuffer_read(dvb_ringbuffer_t *rbuf, u8 *buf, 
+extern ssize_t dvb_ringbuffer_read(struct dvb_ringbuffer *rbuf, u8 *buf, 
                                    size_t len, int usermem);
 
 
@@ -124,7 +123,7 @@ extern ssize_t dvb_ringbuffer_read(dvb_ringbuffer_t *rbuf, u8 *buf,
 ** <usermem> specifies whether <buf> resides in user space
 ** returns number of bytes transferred or -EFAULT
 */
-extern ssize_t dvb_ringbuffer_write(dvb_ringbuffer_t *rbuf, const u8 *buf,
+extern ssize_t dvb_ringbuffer_write(struct dvb_ringbuffer *rbuf, const u8 *buf,
                                     size_t len, int usermem);
 
 #endif /* _DVB_RINGBUFFER_H_ */