git://git.onelab.eu / linux-2.6.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git] / drivers / video / sis / oem310.h
diff --git a/drivers/video/sis/oem310.h b/drivers/video/sis/oem310.h
index 2b7db91..8fce56e 100644 (file)
--- a/drivers/video/sis/oem310.h
+++ b/drivers/video/sis/oem310.h
@@ -1,9 +1,9 @@
 /* $XFree86$ */
 /* $XdotOrg$ */
 /*
- * OEM Data for 315/330 series
+ * OEM Data for 315/330/340 series
  *
- * Copyright (C) 2001-2004 by Thomas Winischhofer, Vienna, Austria
+ * Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria
  *
  * If distributed as part of the Linux kernel, the following license terms
  * apply:
@@ -50,206 +50,206 @@
  *
  */
 
-static const UCHAR SiS310_LCDDelayCompensation_301[] =                 /* 301 */
+static const unsigned char SiS310_LCDDelayCompensation_301[] =                 /* 301 */
 {
-                0x00,0x00,0x00,    /*   800x600 */
-                0x0b,0x0b,0x0b,    /*  1024x768 */
-                0x08,0x08,0x08,    /* 1280x1024 */
-                0x00,0x00,0x00,    /*   640x480 (unknown) */
-                0x00,0x00,0x00,    /*  1024x600 (unknown) */
-                0x00,0x00,0x00,    /*  1152x864 (unknown) */
-                0x08,0x08,0x08,    /*  1280x960 (guessed) */
-                0x00,0x00,0x00,    /*  1152x768 (unknown) */
-                0x08,0x08,0x08,    /* 1400x1050 */
-                0x08,0x08,0x08,    /*  1280x768  (guessed) */
-                0x00,0x00,0x00,    /* 1600x1200 */
-                0x00,0x00,0x00,    /*   320x480 (unknown) */
-                0x00,0x00,0x00,
-                0x00,0x00,0x00,
-                0x00,0x00,0x00
+       0x00,0x00,0x00,    /*   800x600 */
+       0x0b,0x0b,0x0b,    /*  1024x768 */
+       0x08,0x08,0x08,    /* 1280x1024 */
+       0x00,0x00,0x00,    /*   640x480 (unknown) */
+       0x00,0x00,0x00,    /*  1024x600 (unknown) */
+       0x00,0x00,0x00,    /*  1152x864 (unknown) */
+       0x08,0x08,0x08,    /*  1280x960 (guessed) */
+       0x00,0x00,0x00,    /*  1152x768 (unknown) */
+       0x08,0x08,0x08,    /* 1400x1050 */
+       0x08,0x08,0x08,    /*  1280x768  (guessed) */
+       0x00,0x00,0x00,    /* 1600x1200 */
+       0x00,0x00,0x00,    /*   320x480 (unknown) */
+       0x00,0x00,0x00,
+       0x00,0x00,0x00,
+       0x00,0x00,0x00
 };
 
 /* This is contained in 650+301B BIOSes, but it is wrong - so we don't use it */
-static const UCHAR SiS310_LCDDelayCompensation_650301LV[] =            /* 650 + 30xLV */
+static const unsigned char SiS310_LCDDelayCompensation_650301LV[] =            /* 650 + 30xLV */
 {
-                0x01,0x01,0x01,    /*   800x600 */
-                0x01,0x01,0x01,    /*  1024x768 */
-                0x01,0x01,0x01,    /* 1280x1024 */
-                 0x01,0x01,0x01,    /*   640x480 (unknown) */
-                0x01,0x01,0x01,    /*  1024x600 (unknown) */
-                0x01,0x01,0x01,    /*  1152x864 (unknown) */
-                0x01,0x01,0x01,    /*  1280x960 (guessed) */
-                0x01,0x01,0x01,    /*  1152x768 (unknown) */
-                0x01,0x01,0x01,    /* 1400x1050 */
-                0x01,0x01,0x01,    /*  1280x768  (guessed) */
-                0x01,0x01,0x01,    /* 1600x1200 */
-                0x02,0x02,0x02,
-                0x02,0x02,0x02,
-                0x02,0x02,0x02,
-                0x02,0x02,0x02
+       0x01,0x01,0x01,    /*   800x600 */
+       0x01,0x01,0x01,    /*  1024x768 */
+       0x01,0x01,0x01,    /* 1280x1024 */
+       0x01,0x01,0x01,    /*   640x480 (unknown) */
+       0x01,0x01,0x01,    /*  1024x600 (unknown) */
+       0x01,0x01,0x01,    /*  1152x864 (unknown) */
+       0x01,0x01,0x01,    /*  1280x960 (guessed) */
+       0x01,0x01,0x01,    /*  1152x768 (unknown) */
+       0x01,0x01,0x01,    /* 1400x1050 */
+       0x01,0x01,0x01,    /*  1280x768  (guessed) */
+       0x01,0x01,0x01,    /* 1600x1200 */
+       0x02,0x02,0x02,
+       0x02,0x02,0x02,
+       0x02,0x02,0x02,
+       0x02,0x02,0x02
 };
 
-static const UCHAR SiS310_LCDDelayCompensation_651301LV[] =            /* M650/651 301LV */
+static const unsigned char SiS310_LCDDelayCompensation_651301LV[] =            /* M650/651 301LV */
 {
-                 0x33,0x33,0x33,    /*   800x600 (guessed) - new: PanelType, not PanelRes ! */
-                0x33,0x33,0x33,    /*  1024x768 */
-                0x33,0x33,0x33,    /* 1280x1024 */
-                0x33,0x33,0x33,    /*   640x480 (unknown) */
-                0x33,0x33,0x33,    /*  1024x600 (unknown) */
-                0x33,0x33,0x33,    /*  1152x864 (unknown) */
-                0x33,0x33,0x33,    /*  1280x960 (guessed) */
-                0x33,0x33,0x33,    /*  1152x768 (unknown) */
-                0x33,0x33,0x33,    /* 1400x1050 */
-                0x33,0x33,0x33,    /*  1280x768  (guessed) */
-                0x33,0x33,0x33,    /* 1600x1200 */
-                0x33,0x33,0x33,
-                0x33,0x33,0x33,
-                0x33,0x33,0x33,
-                0x33,0x33,0x33
+       0x33,0x33,0x33,    /*   800x600 (guessed) - new: PanelType, not PanelRes ! */
+       0x33,0x33,0x33,    /*  1024x768 */
+       0x33,0x33,0x33,    /* 1280x1024 */
+       0x33,0x33,0x33,    /*   640x480 (unknown) */
+       0x33,0x33,0x33,    /*  1024x600 (unknown) */
+       0x33,0x33,0x33,    /*  1152x864 (unknown) */
+       0x33,0x33,0x33,    /*  1280x960 (guessed) */
+       0x33,0x33,0x33,    /*  1152x768 (unknown) */
+       0x33,0x33,0x33,    /* 1400x1050 */
+       0x33,0x33,0x33,    /*  1280x768  (guessed) */
+       0x33,0x33,0x33,    /* 1600x1200 */
+       0x33,0x33,0x33,
+       0x33,0x33,0x33,
+       0x33,0x33,0x33,
+       0x33,0x33,0x33
 };
 
-static const UCHAR SiS310_LCDDelayCompensation_651302LV[] =            /* M650/651 302LV */
+static const unsigned char SiS310_LCDDelayCompensation_651302LV[] =            /* M650/651 302LV */
 {
-                 0x33,0x33,0x33,    /*   800x600 (guessed) */
-                0x33,0x33,0x33,    /*  1024x768 */
-                0x33,0x33,0x33,    /* 1280x1024 */
-                0x33,0x33,0x33,    /*   640x480 (unknown) */
-                0x33,0x33,0x33,    /*  1024x600 (unknown) */
-                0x33,0x33,0x33,    /*  1152x864 (unknown) */
-                0x33,0x33,0x33,    /*  1280x960 (guessed) */
-                0x33,0x33,0x33,    /*  1152x768 (unknown) */
-                0x33,0x33,0x33,    /* 1400x1050 */
-                0x33,0x33,0x33,    /*  1280x768  (guessed) */
-                0x33,0x33,0x33,    /* 1600x1200 */
-                0x33,0x33,0x33,
-                0x33,0x33,0x33,
-                0x33,0x33,0x33,
-                0x33,0x33,0x33
+       0x33,0x33,0x33,    /*   800x600 (guessed) */
+       0x33,0x33,0x33,    /*  1024x768 */
+       0x33,0x33,0x33,    /* 1280x1024 */
+       0x33,0x33,0x33,    /*   640x480 (unknown) */
+       0x33,0x33,0x33,    /*  1024x600 (unknown) */
+       0x33,0x33,0x33,    /*  1152x864 (unknown) */
+       0x33,0x33,0x33,    /*  1280x960 (guessed) */
+       0x33,0x33,0x33,    /*  1152x768 (unknown) */
+       0x33,0x33,0x33,    /* 1400x1050 */
+       0x33,0x33,0x33,    /*  1280x768  (guessed) */
+       0x33,0x33,0x33,    /* 1600x1200 */
+       0x33,0x33,0x33,
+       0x33,0x33,0x33,
+       0x33,0x33,0x33,
+       0x33,0x33,0x33
 };
 
-static const UCHAR SiS310_LCDDelayCompensation_3xx301B[] =             /* 30xB */
+static const unsigned char SiS310_LCDDelayCompensation_3xx301B[] =             /* 30xB */
 {
-                0x01,0x01,0x01,    /*   800x600 */
-                0x0C,0x0C,0x0C,    /*  1024x768 */
-                0x0C,0x0C,0x0C,    /* 1280x1024 */
-                 0x08,0x08,0x08,    /*   640x480 */
-                0x0C,0x0C,0x0C,    /*  1024x600 (guessed) */
-                0x0C,0x0C,0x0C,    /*  1152x864 (guessed) */
-                0x0C,0x0C,0x0C,    /*  1280x960 (guessed) */
-                0x0C,0x0C,0x0C,    /*  1152x768 (guessed) */
-                0x0C,0x0C,0x0C,    /* 1400x1050 (guessed) */
-                0x0C,0x0C,0x0C,    /*  1280x768 (guessed) */
-                0x0C,0x0C,0x0C,    /* 1600x1200 (guessed) */
-                0x02,0x02,0x02,
-                0x02,0x02,0x02,
-                0x02,0x02,0x02,
-                0x02,0x02,0x02
+       0x01,0x01,0x01,    /*   800x600 */
+       0x0C,0x0C,0x0C,    /*  1024x768 */
+       0x0C,0x0C,0x0C,    /* 1280x1024 */
+       0x08,0x08,0x08,    /*   640x480 */
+       0x0C,0x0C,0x0C,    /*  1024x600 (guessed) */
+       0x0C,0x0C,0x0C,    /*  1152x864 (guessed) */
+       0x0C,0x0C,0x0C,    /*  1280x960 (guessed) */
+       0x0C,0x0C,0x0C,    /*  1152x768 (guessed) */
+       0x0C,0x0C,0x0C,    /* 1400x1050 (guessed) */
+       0x0C,0x0C,0x0C,    /*  1280x768 (guessed) */
+       0x0C,0x0C,0x0C,    /* 1600x1200 (guessed) */
+       0x02,0x02,0x02,
+       0x02,0x02,0x02,
+       0x02,0x02,0x02,
+       0x02,0x02,0x02
 };
 
-static const UCHAR SiS310_LCDDelayCompensation_3xx301LV[] =            /* 315+30xLV */
+static const unsigned char SiS310_LCDDelayCompensation_3xx301LV[] =            /* 315+30xLV */
 {
-                0x01,0x01,0x01,    /*   800x600 */
-                0x04,0x04,0x04,    /*  1024x768 (A531/BIOS 1.14.05f: 4 - works with 6 */
-                0x0C,0x0C,0x0C,    /* 1280x1024 */
-                 0x08,0x08,0x08,    /*   640x480 */
-                0x0C,0x0C,0x0C,    /*  1024x600 (guessed) */
-                0x0C,0x0C,0x0C,    /*  1152x864 (guessed) */
-                0x0C,0x0C,0x0C,    /*  1280x960 (guessed) */
-                0x0C,0x0C,0x0C,    /*  1152x768 (guessed) */
-                0x0C,0x0C,0x0C,    /* 1400x1050 (guessed) */
-                0x0C,0x0C,0x0C,    /*  1280x768 (guessed) */
-                0x0C,0x0C,0x0C,    /* 1600x1200 (guessed) */
-                0x02,0x02,0x02,
-                0x02,0x02,0x02,
-                0x02,0x02,0x02,
-                0x02,0x02,0x02
+       0x01,0x01,0x01,    /*   800x600 */
+       0x04,0x04,0x04,    /*  1024x768 (A531/BIOS 1.14.05f: 4 - works with 6 */
+       0x0C,0x0C,0x0C,    /* 1280x1024 */
+       0x08,0x08,0x08,    /*   640x480 */
+       0x0C,0x0C,0x0C,    /*  1024x600 (guessed) */
+       0x0C,0x0C,0x0C,    /*  1152x864 (guessed) */
+       0x0C,0x0C,0x0C,    /*  1280x960 (guessed) */
+       0x0C,0x0C,0x0C,    /*  1152x768 (guessed) */
+       0x0C,0x0C,0x0C,    /* 1400x1050 (guessed) */
+       0x0C,0x0C,0x0C,    /*  1280x768 (guessed) */
+       0x0C,0x0C,0x0C,    /* 1600x1200 (guessed) */
+       0x02,0x02,0x02,
+       0x02,0x02,0x02,
+       0x02,0x02,0x02,
+       0x02,0x02,0x02
 };
 
-static const UCHAR SiS310_TVDelayCompensation_301[] =          /* 301 */
+static const unsigned char SiS310_TVDelayCompensation_301[] =          /* 301 */
 {
-                0x02,0x02,    /* NTSC Enhanced, Standard */
-                 0x02,0x02,    /* PAL */
-                0x08,0x0b     /* HiVision */
+       0x02,0x02,    /* NTSC Enhanced, Standard */
+       0x02,0x02,    /* PAL */
+       0x08,0x0b     /* HiVision */
 };
 
-static const UCHAR SiS310_TVDelayCompensation_301B[] =         /* 30xB, 30xLV */
+static const unsigned char SiS310_TVDelayCompensation_301B[] =         /* 30xB, 30xLV */
 {
-                0x03,0x03,
-                0x03,0x03,
-                0x03,0x03
+       0x03,0x03,
+       0x03,0x03,
+       0x03,0x03
 };
 
-static const UCHAR SiS310_TVDelayCompensation_740301B[] =      /* 740 + 30xB (30xLV?) */
+static const unsigned char SiS310_TVDelayCompensation_740301B[] =      /* 740 + 30xB (30xLV?) */
 {
-                0x05,0x05,
-                0x05,0x05,
-                0x05,0x05
+       0x05,0x05,
+       0x05,0x05,
+       0x05,0x05
 };
 
-static const UCHAR SiS310_TVDelayCompensation_651301LV[] =     /* M650, 651, 301LV */
+static const unsigned char SiS310_TVDelayCompensation_651301LV[] =     /* M650, 651, 301LV */
 {
-                0x33,0x33,
-                0x33,0x33,
-                0x33,0x33
+       0x33,0x33,
+       0x33,0x33,
+       0x33,0x33
 };
 
-static const UCHAR SiS310_TVDelayCompensation_651302LV[] =     /* M650, 651, 302LV */
+static const unsigned char SiS310_TVDelayCompensation_651302LV[] =     /* M650, 651, 302LV */
 {
-                0x33,0x33,
-                0x33,0x33,
-                0x33,0x33
+       0x33,0x33,
+       0x33,0x33,
+       0x33,0x33
 };
 
-static const UCHAR SiS_TVDelay661_301[] =                      /* 661, 301 */
+static const unsigned char SiS_TVDelay661_301[] =                      /* 661, 301 */
 {
-                0x44,0x44,
-                0x44,0x44,
-                0x00,0x00,
-                0x44,0x44,
-                0x44,0x44,
-                0x44,0x44
+       0x44,0x44,
+       0x44,0x44,
+       0x00,0x00,
+       0x44,0x44,
+       0x44,0x44,
+       0x44,0x44
 };
 
-static const UCHAR SiS_TVDelay661_301B[] =                     /* 661, 301B et al */
+static const unsigned char SiS_TVDelay661_301B[] =                     /* 661, 301B et al */
 {
-                0x44,0x44,
-                0x44,0x44,
-                0x00,0x00,
-                0x44,0x44,
-                0x44,0x44,
-                0x44,0x44
+       0x44,0x44,
+       0x44,0x44,
+       0x00,0x00,
+       0x44,0x44,
+       0x44,0x44,
+       0x44,0x44
 };
 
-static const UCHAR SiS310_TVDelayCompensation_LVDS[] =         /* LVDS */
+static const unsigned char SiS310_TVDelayCompensation_LVDS[] =         /* LVDS */
 {
-                0x0a,0x0a,
-                0x0a,0x0a,
-                0x0a,0x0a
+       0x0a,0x0a,
+       0x0a,0x0a,
+       0x0a,0x0a
 };
 
-static const UCHAR SiS310_TVAntiFlick1[6][2] =
+static const unsigned char SiS310_TVAntiFlick1[6][2] =
 {
-            {0x4,0x0},
-           {0x4,0x8},
-           {0x0,0x0},
-           {0x0,0x0},
-           {0x0,0x0},
-           {0x0,0x0}
+       {0x4,0x0},
+       {0x4,0x8},
+       {0x0,0x0},
+       {0x0,0x0},
+       {0x0,0x0},
+       {0x0,0x0}
 };
 
-static const UCHAR SiS310_TVEdge1[6][2] =
+static const unsigned char SiS310_TVEdge1[6][2] =
 {
-            {0x0,0x4},
-           {0x0,0x4},
-           {0x0,0x0},
-           {0x0,0x0},
-           {0x0,0x0},
-           {0x0,0x0}
+       {0x0,0x4},
+       {0x0,0x4},
+       {0x0,0x0},
+       {0x0,0x0},
+       {0x0,0x0},
+       {0x0,0x0}
 };
 
-static const UCHAR SiS310_TVYFilter1[5][8][4] =
+static const unsigned char SiS310_TVYFilter1[5][8][4] =
 {
- {
+   {
        {0x00,0xf4,0x10,0x38},  /* NTSC */
        {0x00,0xf4,0x10,0x38},
        {0xeb,0x04,0x25,0x18},
@@ -258,8 +258,8 @@ static const UCHAR SiS310_TVYFilter1[5][8][4] =
        {0xeb,0x04,0x25,0x18},
        {0xee,0x0c,0x22,0x08},
        {0xeb,0x15,0x25,0xf6}
- },
- {
+   },
+   {
        {0x00,0xf4,0x10,0x38},  /* PAL */
        {0x00,0xf4,0x10,0x38},
        {0xf1,0xf7,0x1f,0x32},
@@ -268,8 +268,8 @@ static const UCHAR SiS310_TVYFilter1[5][8][4] =
        {0xf1,0xf7,0x1f,0x32},
        {0xf3,0x00,0x1d,0x20},
        {0xfc,0xfb,0x14,0x2a}
- },
- {
+   },
+   {
        {0x00,0x00,0x00,0x00},  /* HiVision */
        {0x00,0xf4,0x10,0x38},
        {0x00,0xf4,0x10,0x38},
@@ -278,9 +278,9 @@ static const UCHAR SiS310_TVYFilter1[5][8][4] =
        {0x00,0xf4,0x10,0x38},
        {0xeb,0x04,0x25,0x18},
        {0xee,0x0c,0x22,0x08}
- },
- {
-       {0x00,0xf4,0x10,0x38},  /* PAL-M */
+   },
+   {
+       {0x00,0xf4,0x10,0x38},  /* PAL-M */
        {0x00,0xf4,0x10,0x38},
        {0xeb,0x04,0x10,0x18},
        {0xf7,0x06,0x19,0x14},
@@ -288,9 +288,9 @@ static const UCHAR SiS310_TVYFilter1[5][8][4] =
        {0xeb,0x04,0x25,0x18},
        {0xeb,0x04,0x25,0x18},
        {0xeb,0x15,0x25,0xf6}
- },
- {
-       {0x00,0xf4,0x10,0x38},  /* PAL-N */
+   },
+   {
+       {0x00,0xf4,0x10,0x38},  /* PAL-N */
        {0x00,0xf4,0x10,0x38},
        {0xeb,0x04,0x10,0x18},
        {0xf7,0x06,0x19,0x14},
@@ -298,12 +298,12 @@ static const UCHAR SiS310_TVYFilter1[5][8][4] =
        {0xeb,0x04,0x25,0x18},
        {0xeb,0x04,0x25,0x18},
        {0xeb,0x15,0x25,0xf6}
- }
+   }
 };
 
-static const UCHAR SiS310_TVYFilter2[5][9][7] =
+static const unsigned char SiS310_TVYFilter2[5][9][7] =
 {
- {
+   {
        {0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},   /* NTSC */
        {0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C},
        {0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},
@@ -313,8 +313,8 @@ static const UCHAR SiS310_TVYFilter2[5][9][7] =
        {0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C},
        {0x01,0x01,0xFC,0xF8,0x08,0x26,0x38},
        {0xFF,0xFF,0xFC,0x00,0x0F,0x22,0x28}
- },
- {
+   },
+   {
        {0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},   /* PAL */
        {0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C},
        {0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},
@@ -324,8 +324,8 @@ static const UCHAR SiS310_TVYFilter2[5][9][7] =
        {0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C},
        {0x01,0x01,0xFC,0xF8,0x08,0x26,0x38},
        {0xFF,0xFF,0xFC,0x00,0x0F,0x22,0x28}
- },
- {
+   },
+   {
        {0x00,0x00,0x00,0xF4,0xFF,0x1C,0x22},   /* HiVision */
        {0x00,0x00,0x00,0xF4,0xFF,0x1C,0x22},
        {0x00,0x00,0x00,0xF4,0xFF,0x1C,0x22},
@@ -335,9 +335,9 @@ static const UCHAR SiS310_TVYFilter2[5][9][7] =
        {0x00,0x00,0x00,0xF4,0xFF,0x1C,0x22},
        {0x00,0x00,0x00,0xF4,0xFF,0x1C,0x22},
        {0x00,0x00,0x00,0xF4,0xFF,0x1C,0x22}
- },
- {
-       {0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},   /* PAL-M */
+   },
+   {
+       {0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},   /* PAL-M */
        {0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C},
        {0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},
        {0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C},
@@ -346,9 +346,9 @@ static const UCHAR SiS310_TVYFilter2[5][9][7] =
        {0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C},
        {0x01,0x01,0xFC,0xF8,0x08,0x26,0x38},
        {0xFF,0xFF,0xFC,0x00,0x0F,0x22,0x28}
- },
- {
-       {0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},   /* PAL-N */
+   },
+   {
+       {0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},   /* PAL-N */
        {0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C},
        {0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},
        {0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C},
@@ -357,58 +357,39 @@ static const UCHAR SiS310_TVYFilter2[5][9][7] =
        {0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C},
        {0x01,0x01,0xFC,0xF8,0x08,0x26,0x38},
        {0xFF,0xFF,0xFC,0x00,0x0F,0x22,0x28}
- }
+   }
 };
 
-static const UCHAR SiS310_TVPhaseIncr1[3][2][4] =
+static const unsigned char SiS310_TVPhaseIncr1[3][2][4] =
 {
- {
+   {
        {0x21,0xed,0xba,0x08},
        {0x21,0xed,0xba,0x08}
- },
- {
+   },
+   {
        {0x2a,0x05,0xe3,0x00},
        {0x2a,0x05,0xe3,0x00}
- },
- {
+   },
+   {
        {0x2a,0x05,0xd3,0x00},
        {0x2a,0x05,0xd3,0x00}
- }
+   }
 };
 
-static const UCHAR SiS310_TVPhaseIncr2[3][2][4] =
+static const unsigned char SiS310_TVPhaseIncr2[3][2][4] =
 {
- {
+   {
        {0x21,0xf0,0x7b,0xd6},
        {0x21,0xf0,0x7b,0xd6}
- },
- {
+   },
+   {
        {0x2a,0x0a,0x41,0xe9},
        {0x2a,0x0a,0x41,0xe9}
- },
- {
+   },
+   {
        {0x2a,0x05,0xd3,0x00},
        {0x2a,0x05,0xd3,0x00}
- }
-};
-
-static const UCHAR SiS661_TVPhase[] = {
-    0x21,0xED,0xBA,0x08,
-    0x2A,0x05,0xE3,0x00,
-    0x21,0xE4,0x2E,0x9B,
-    0x21,0xF4,0x3E,0xBA,
-    0x1E,0x8B,0xA2,0xA7,
-    0x1E,0x83,0x0A,0xE0,
-    0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,
-    0x21,0xF0,0x7B,0xD6,
-    0x2A,0x09,0x86,0xE9,
-    0x21,0xE6,0xEF,0xA4,
-    0x21,0xF6,0x94,0x46,
-    0x1E,0x8B,0xA2,0xA7,
-    0x1E,0x83,0x0A,0xE0,
-    0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00
+   }
 };
 
 /**************************************************************/
@@ -417,7 +398,7 @@ static const UCHAR SiS661_TVPhase[] = {
 
 /* Inventec / Compaq Presario 3045US, 3017 */
 
-static const SiS_LCDDataStruct  SiS310_ExtCompaq1280x1024Data[] =
+static const struct SiS_LCDData SiS310_ExtCompaq1280x1024Data[] =
 {
        {  211,  60,1024, 501,1688,1066},
        {  211,  60,1024, 508,1688,1066},
@@ -431,17 +412,17 @@ static const SiS_LCDDataStruct  SiS310_ExtCompaq1280x1024Data[] =
 
 /* Asus A2xxxH _2 */
 
-static const SiS_Part2PortTblStruct SiS310_CRT2Part2_Asus1024x768_3[] =
+static const struct SiS_Part2PortTbl SiS310_CRT2Part2_Asus1024x768_3[] =
 {
- {{0x25,0x13,0xc9,0x25,0xff,0x59,0x45,0x09,0x07,0xf9,0x09,0x24}},
- {{0x2c,0x13,0x9a,0x25,0xff,0x59,0x45,0x09,0x07,0xf9,0x09,0x24}},
- {{0x25,0x13,0xc9,0x25,0xff,0x59,0x45,0x09,0x07,0xf9,0x09,0x24}},
- {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}},
- {{0x38,0x13,0x13,0x25,0xff,0x59,0x45,0x09,0x07,0xf9,0x09,0x24}},
- {{0x38,0x13,0x16,0x25,0xff,0x5a,0x45,0x0a,0x07,0xfa,0x0a,0x24}},
- {{0x36,0x13,0x13,0x25,0xff,0x5a,0x45,0x0a,0x07,0xfa,0x0a,0x24}},
- {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}},
- {{0x25,0x13,0xc9,0x25,0xff,0x59,0x45,0x09,0x07,0xf9,0x09,0x24}}
+       {{0x25,0x13,0xc9,0x25,0xff,0x59,0x45,0x09,0x07,0xf9,0x09,0x24}},
+       {{0x2c,0x13,0x9a,0x25,0xff,0x59,0x45,0x09,0x07,0xf9,0x09,0x24}},
+       {{0x25,0x13,0xc9,0x25,0xff,0x59,0x45,0x09,0x07,0xf9,0x09,0x24}},
+       {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}},
+       {{0x38,0x13,0x13,0x25,0xff,0x59,0x45,0x09,0x07,0xf9,0x09,0x24}},
+       {{0x38,0x13,0x16,0x25,0xff,0x5a,0x45,0x0a,0x07,0xfa,0x0a,0x24}},
+       {{0x36,0x13,0x13,0x25,0xff,0x5a,0x45,0x0a,0x07,0xfa,0x0a,0x24}},
+       {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}},
+       {{0x25,0x13,0xc9,0x25,0xff,0x59,0x45,0x09,0x07,0xf9,0x09,0x24}}
 };
 
 
linux-2.6