Merge branch 'wm8996-rename' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[firefly-linux-kernel-4.4.55.git] / drivers / staging / xgifb / vgatypes.h

diff --git a/drivers/staging/xgifb/vgatypes.h b/drivers/staging/xgifb/vgatypes.h
index d613e84aab620e3c3b9ffce884dbb1f450332e4c..5aeb3a4d66fb744a262a642bc24c6ba2491a82ff 100644 (file)
--- a/drivers/staging/xgifb/vgatypes.h
+++ b/drivers/staging/xgifb/vgatypes.h
@@ -1,4 +1,3 @@
-
 #ifndef _VGATYPES_
 #define _VGATYPES_
 
@@ -6,79 +5,79 @@
 
 #ifndef XGI_VB_CHIP_TYPE
 enum XGI_VB_CHIP_TYPE {
-    VB_CHIP_Legacy = 0,
-    VB_CHIP_301,
-    VB_CHIP_301B,
-    VB_CHIP_301LV,
-    VB_CHIP_302,
-    VB_CHIP_302B,
-    VB_CHIP_302LV,
-    VB_CHIP_301C,
-    VB_CHIP_302ELV,
-    VB_CHIP_UNKNOWN, /* other video bridge or no video bridge */
-    MAX_VB_CHIP
+       VB_CHIP_Legacy = 0,
+       VB_CHIP_301,
+       VB_CHIP_301B,
+       VB_CHIP_301LV,
+       VB_CHIP_302,
+       VB_CHIP_302B,
+       VB_CHIP_302LV,
+       VB_CHIP_301C,
+       VB_CHIP_302ELV,
+       VB_CHIP_UNKNOWN, /* other video bridge or no video bridge */
+       MAX_VB_CHIP
 };
 #endif
 
 #ifndef XGI_LCD_TYPE
 enum XGI_LCD_TYPE {
-    LCD_INVALID = 0,
-    LCD_320x480,       /* FSTN, DSTN */
-    LCD_640x480,
-    LCD_640x480_2,     /* FSTN, DSTN */
-    LCD_640x480_3,     /* FSTN, DSTN */
-    LCD_800x600,
-    LCD_848x480,
-    LCD_1024x600,
-    LCD_1024x768,
-    LCD_1152x768,
-    LCD_1152x864,
-    LCD_1280x720,
-    LCD_1280x768,
-    LCD_1280x800,
-    LCD_1280x960,
-    LCD_1280x1024,
-    LCD_1400x1050,
-    LCD_1600x1200,
-    LCD_1680x1050,
-    LCD_1920x1440,
-    LCD_2048x1536,
-    LCD_CUSTOM,
-    LCD_UNKNOWN
+       LCD_INVALID = 0,
+       LCD_320x480,       /* FSTN, DSTN */
+       LCD_640x480,
+       LCD_640x480_2,     /* FSTN, DSTN */
+       LCD_640x480_3,     /* FSTN, DSTN */
+       LCD_800x600,
+       LCD_848x480,
+       LCD_1024x600,
+       LCD_1024x768,
+       LCD_1152x768,
+       LCD_1152x864,
+       LCD_1280x720,
+       LCD_1280x768,
+       LCD_1280x800,
+       LCD_1280x960,
+       LCD_1280x1024,
+       LCD_1400x1050,
+       LCD_1600x1200,
+       LCD_1680x1050,
+       LCD_1920x1440,
+       LCD_2048x1536,
+       LCD_CUSTOM,
+       LCD_UNKNOWN
 };
 #endif
 
-struct XGI_DSReg
-{
-  unsigned char  jIdx;
-  unsigned char  jVal;
+struct XGI_DSReg {
+       unsigned char jIdx;
+       unsigned char jVal;
 };
 
-struct xgi_hw_device_info
-{
-    unsigned long  ulExternalChip;       /* NO VB or other video bridge*/
-                                 /* if ujVBChipID = VB_CHIP_UNKNOWN, */
+struct xgi_hw_device_info {
+       unsigned long ulExternalChip; /* NO VB or other video bridge*/
+                                     /* if ujVBChipID = VB_CHIP_UNKNOWN, */
 
-    unsigned char *pjVirtualRomBase;    /* ROM image */
+       unsigned char *pjVirtualRomBase; /* ROM image */
 
-    unsigned char *pjVideoMemoryAddress;/* base virtual memory address */
-                                 /* of Linear VGA memory */
+       unsigned char *pjVideoMemoryAddress;/* base virtual memory address */
+                                           /* of Linear VGA memory */
 
-    unsigned long  ulVideoMemorySize;    /* size, in bytes, of the memory on the board */
+       unsigned long ulVideoMemorySize; /* size, in bytes, of the
+                                           memory on the board */
 
-    unsigned char *pjIOAddress;          /* base I/O address of VGA ports (0x3B0) */
+       unsigned char *pjIOAddress; /* base I/O address of VGA ports (0x3B0) */
 
-    unsigned char  jChipType;            /* Used to Identify Graphics Chip */
-                                 /* defined in the data structure type  */
-                                 /* "XGI_CHIP_TYPE" */
+       unsigned char jChipType; /* Used to Identify Graphics Chip */
+                                /* defined in the data structure type  */
+                                /* "XGI_CHIP_TYPE" */
 
-    unsigned char  jChipRevision;        /* Used to Identify Graphics Chip Revision */
+       unsigned char jChipRevision; /* Used to Identify Graphics
+                                       Chip Revision */
 
-    unsigned char  ujVBChipID;           /* the ID of video bridge */
-                                 /* defined in the data structure type */
-                                 /* "XGI_VB_CHIP_TYPE" */
+       unsigned char ujVBChipID; /* the ID of video bridge */
+                                 /* defined in the data structure type */
+                                 /* "XGI_VB_CHIP_TYPE" */
 
-    unsigned long  ulCRT2LCDType;        /* defined in the data structure type */
+       unsigned long ulCRT2LCDType; /* defined in the data structure type */
 
        unsigned char(*pQueryVGAConfigSpace)(struct xgi_hw_device_info *,
                                            unsigned long, unsigned long,
@@ -87,7 +86,5 @@ struct xgi_hw_device_info
 
 /* Additional IOCTL for communication xgifb <> X driver        */
 /* If changing this, xgifb.h must also be changed (for xgifb) */
-
-
 #endif