1 files changed, 26 insertions, 26 deletions

diff --git a/linux/drivers/media/dvb/ttpci/av7110.h b/linux/drivers/media/dvb/ttpci/av7110.h
index 944ff7c1b..ac42c6e16 100644
--- a/linux/drivers/media/dvb/ttpci/av7110.h
+++ b/linux/drivers/media/dvb/ttpci/av7110.h
@@ -40,32 +40,32 @@
 #include "dvb_net.h"
 #include "dvb_ringbuffer.h"
 
-typedef enum BOOTSTATES
+enum av7110_bootstate
 {
 	BOOTSTATE_BUFFER_EMPTY	= 0,
 	BOOTSTATE_BUFFER_FULL	= 1,
 	BOOTSTATE_BOOT_COMPLETE	= 2
-} BOOTSTATES;
+};
 
-typedef enum
+enum av7110_type_rec_play_format
 {	RP_None,
 	AudioPES,
 	AudioMp2,
 	AudioPCM,
 	VideoPES,
 	AV_PES
-} TYPE_REC_PLAY_FORMAT;
+};
 
-typedef enum OSDPALTYPE
+enum av7110_osd_palette_type
 {
 	NoPalet =  0,      /* No palette */
 	Pal1Bit =  2,      /* 2 colors for 1 Bit Palette    */
 	Pal2Bit =  4,      /* 4 colors for 2 bit palette    */
 	Pal4Bit =  16,     /* 16 colors for 4 bit palette   */
 	Pal8Bit =  256     /* 256 colors for 16 bit palette */
-} OSDPALTYPE, *POSDPALTYPE;
+};
 
-typedef enum {
+enum av7110_window_display_type {
    BITMAP1,           /* 1 bit bitmap */
    BITMAP2,           /* 2 bit bitmap */
    BITMAP4,           /* 4 bit bitmap */
@@ -86,7 +86,7 @@ typedef enum {
    VIDEOTDSIZE,       /* True Size MPEG Video Display Double Resolution */
    VIDEONSIZE,        /* Full Size MPEG Video Display */
    CURSOR             /* Cursor */
-} DISPTYPE;           /* Window display type           */
+};
 
 /* switch defines */
 #define SB_GPIO 3
@@ -99,13 +99,13 @@ typedef enum {
 #define FB_ON   SAA7146_GPIO_OUTHI  //FastBlank an  (RGB-Mode)
 #define FB_LOOP	SAA7146_GPIO_INPUT  //FastBlank der PC-Grafik durchschleifen
 
-typedef enum
+enum av7110_video_output_mode
 {
         NO_OUT       = 0,		//disable analog Output
 	CVBS_RGB_OUT = 1,
 	CVBS_YC_OUT  = 2,
 	YC_OUT	     = 3
-} VIDEOOUTPUTMODE;
+};
 
 #define GPMQFull        0x0001                  //Main Message Queue Full
 #define GPMQOver        0x0002                  //Main Message Queue Overflow
@@ -133,7 +133,7 @@ typedef enum
 #define PBUFSIZE_16K  0x0700
 #define PBUFSIZE_32K  0x0800
 
-typedef enum {	
+enum av7110_osd_command {	
         WCreate,
 	WDestroy,
 	WMoveD,
@@ -154,9 +154,9 @@ typedef enum {
 	ReleaseBmp,
 	SetWTrans,
 	SetWNoTrans
-} OSDCOM;
+};
 
-typedef enum { 
+enum av7110_pid_command { 
 	MultiPID,
         VideoPID,
 	AudioPID,
@@ -169,13 +169,13 @@ typedef enum {
 	Scan,
 	SetDescr,
         SetIR
-} PIDCOM;
+};
 			
-typedef enum {
+enum av7110_mpeg_command {
         SelAudChannels
-} MPEGCOM;
+};
 
-typedef enum  { 
+enum av7110_audio_command { 
         AudioDAC,
 	CabADAC,
 	ON22K,
@@ -184,9 +184,9 @@ typedef enum  {
 	ADSwitch,
 	SendDiSEqC,
 	SetRegister
-} AUDCOM;
+};
 
-typedef enum  {
+enum av7110_request_command {
         AudioState,
 	AudioBuffState,
 	VideoState1,
@@ -198,18 +198,18 @@ typedef enum  {
 	ReqRegister,
 	ReqSecFilterError,
 	ReqSTC
-} REQCOM;
+};
 
-typedef enum  {
+enum av7110_encoder_command {
         SetVidMode,
 	SetTestMode,
 	LoadVidCode,
 	SetMonitorType,
 	SetPanScanType,
 	SetFreezeMode
-} ENC;
+};
 
-typedef enum  { 
+enum av7110_rec_play_state { 
         __Record,
 	__Stop,
 	__Play,
@@ -218,9 +218,9 @@ typedef enum  {
 	__FF_IP,
 	__Scan_I,
 	__Continue
-} REC_PLAY;
+};
 
-typedef enum  { 
+enum av7110_command_type { 
         COMTYPE_NOCOM,
 	COMTYPE_PIDFILTER,
 	COMTYPE_MPEGDECODER,
@@ -238,7 +238,7 @@ typedef enum  {
 	COMTYPE_VIDEO,
 	COMTYPE_AUDIO,
 	COMTYPE_CI_LL,
-} COMTYPE;
+};
 
 #define VID_NONE_PREF           0x00    /* No aspect ration processing preferred */
 #define VID_PAN_SCAN_PREF       0x01    /* Pan and Scan Display preferred */