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 / oem300.h
diff --git a/drivers/video/sis/oem300.h b/drivers/video/sis/oem300.h
index e4928e2..b73f268 100644 (file)
--- a/drivers/video/sis/oem300.h
+++ b/drivers/video/sis/oem300.h
@@ -1,8 +1,9 @@
 /* $XFree86$ */
+/* $XdotOrg$ */
 /*
  * OEM Data for 300 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:
@@ -31,10 +32,7 @@
  * * 2) Redistributions in binary form must reproduce the above copyright
  * *    notice, this list of conditions and the following disclaimer in the
  * *    documentation and/or other materials provided with the distribution.
- * * 3) All advertising materials mentioning features or use of this software
- * *    must display the following acknowledgement: "This product includes
- * *    software developed by Thomas Winischhofer, Vienna, Austria."
- * * 4) The name of the author may not be used to endorse or promote products
+ * * 3) The name of the author may not be used to endorse or promote products
  * *    derived from this software without specific prior written permission.
  * *
  * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
@@ -52,7 +50,7 @@
  *
  */
 
-const UCHAR SiS300_OEMTVDelay301[8][4] =
+static const unsigned char SiS300_OEMTVDelay301[8][4] =
 {
        {0x08,0x08,0x08,0x08},
        {0x08,0x08,0x08,0x08},
@@ -64,7 +62,7 @@ const UCHAR SiS300_OEMTVDelay301[8][4] =
        {0x20,0x20,0x20,0x20}
 };
 
-const UCHAR SiS300_OEMTVDelayLVDS[8][4] =
+static const unsigned char SiS300_OEMTVDelayLVDS[8][4] =
 {
        {0x20,0x20,0x20,0x20},
        {0x20,0x20,0x20,0x20},
@@ -76,7 +74,7 @@ const UCHAR SiS300_OEMTVDelayLVDS[8][4] =
        {0x20,0x20,0x20,0x20}
 };
 
-const UCHAR SiS300_OEMTVFlicker[8][4] =
+static const unsigned char SiS300_OEMTVFlicker[8][4] =
 {
        {0x00,0x00,0x00,0x00},
        {0x00,0x00,0x00,0x00},
@@ -88,25 +86,7 @@ const UCHAR SiS300_OEMTVFlicker[8][4] =
        {0x00,0x00,0x00,0x00}
 };
 
-#if 0   /* TW: Not used */
-const UCHAR SiS300_OEMLCDDelay1[12][4]={
-       {0x2c,0x2c,0x2c,0x2c},
-       {0x20,0x20,0x20,0x20},
-       {0x20,0x20,0x20,0x20},
-       {0x2c,0x2c,0x2c,0x2c},
-       {0x2c,0x2c,0x2c,0x2c},
-       {0x20,0x20,0x20,0x20},
-       {0x20,0x20,0x20,0x20},
-       {0x24,0x24,0x24,0x24},
-       {0x24,0x24,0x24,0x24},
-       {0x20,0x20,0x20,0x20},
-       {0x20,0x20,0x20,0x20},
-       {0x24,0x24,0x24,0x24}
-};
-#endif
-
-/* TW: From 630/301B BIOS */
-const UCHAR SiS300_OEMLCDDelay2[64][4] =                /* for 301/301b/302b/301LV/302LV */
+static const unsigned char SiS300_OEMLCDDelay2[64][4] =                 /* for 301/301b/302b/301LV/302LV */
 {
        {0x20,0x20,0x20,0x20},
        {0x20,0x20,0x20,0x20},
@@ -174,8 +154,7 @@ const UCHAR SiS300_OEMLCDDelay2[64][4] =             /* for 301/301b/302b/301LV/302LV */
        {0x20,0x20,0x20,0x20}
 };
 
-/* TW: From 300/301LV BIOS */
-const UCHAR SiS300_OEMLCDDelay4[12][4] =
+static const unsigned char SiS300_OEMLCDDelay4[12][4] =
 {
        {0x2c,0x2c,0x2c,0x2c},
        {0x20,0x20,0x20,0x20},
@@ -191,8 +170,7 @@ const UCHAR SiS300_OEMLCDDelay4[12][4] =
        {0x24,0x24,0x24,0x24}
 };
 
-/* TW: From 300/301LV BIOS */
-const UCHAR SiS300_OEMLCDDelay5[32][4] =
+static const unsigned char SiS300_OEMLCDDelay5[32][4] =
 {
        {0x20,0x20,0x20,0x20},
        {0x20,0x20,0x20,0x20},
@@ -228,8 +206,8 @@ const UCHAR SiS300_OEMLCDDelay5[32][4] =
        {0x20,0x20,0x20,0x20},
 };
 
-/* TW: Added for LVDS */
-const UCHAR SiS300_OEMLCDDelay3[64][4] = {     /* For LVDS */
+static const unsigned char SiS300_OEMLCDDelay3[64][4] =                /* For LVDS */
+{
        {0x20,0x20,0x20,0x20},
        {0x20,0x20,0x20,0x20},
        {0x20,0x20,0x20,0x20},
@@ -296,7 +274,7 @@ const UCHAR SiS300_OEMLCDDelay3[64][4] = {  /* For LVDS */
        {0x20,0x20,0x20,0x20}
 };
 
-const UCHAR SiS300_Phase1[8][5][4] =
+static const unsigned char SiS300_Phase1[8][5][4] =
 {
     {
        {0x21,0xed,0x00,0x08},
@@ -356,11 +334,10 @@ const UCHAR SiS300_Phase1[8][5][4] =
     }
 };
 
-
-const UCHAR SiS300_Phase2[8][5][4] =
+static const unsigned char SiS300_Phase2[8][5][4] =
 {
     {
-        {0x21,0xed,0x00,0x08},
+       {0x21,0xed,0x00,0x08},
        {0x21,0xed,0x8a,0x08},
        {0x21,0xed,0x8a,0x08},
        {0x21,0xed,0x8a,0x08},
@@ -374,42 +351,42 @@ const UCHAR SiS300_Phase2[8][5][4] =
        {0x2a,0x05,0xd3,0x00}
     },
     {
-        {0x2a,0x05,0xd3,0x00},
+       {0x2a,0x05,0xd3,0x00},
        {0x2a,0x05,0xd3,0x00},
        {0x2a,0x05,0xd3,0x00},
        {0x2a,0x05,0xd3,0x00},
        {0x2a,0x05,0xd3,0x00}
     },
     {
-        {0x2a,0x05,0xd3,0x00},
+       {0x2a,0x05,0xd3,0x00},
        {0x2a,0x05,0xd3,0x00},
        {0x2a,0x05,0xd3,0x00},
        {0x2a,0x05,0xd3,0x00},
        {0x2a,0x05,0xd3,0x00}
     },
     {
-        {0x21,0xed,0x00,0x08},
+       {0x21,0xed,0x00,0x08},
        {0x21,0xed,0x8a,0x08},
        {0x21,0xed,0x8a,0x08},
        {0x21,0xed,0x8a,0x08},
        {0x21,0xed,0x8a,0x08}
     },
     {
-        {0x2a,0x05,0xd3,0x00},
+       {0x2a,0x05,0xd3,0x00},
        {0x2a,0x05,0xd3,0x00},
        {0x2a,0x05,0xd3,0x00},
        {0x2a,0x05,0xd3,0x00},
        {0x2a,0x05,0xd3,0x00}
     },
     {
-        {0x2a,0x05,0xd3,0x00},
+       {0x2a,0x05,0xd3,0x00},
        {0x2a,0x05,0xd3,0x00},
        {0x2a,0x05,0xd3,0x00},
        {0x2a,0x05,0xd3,0x00},
        {0x2a,0x05,0xd3,0x00}
     },
     {
-        {0x2a,0x05,0xd3,0x00},
+       {0x2a,0x05,0xd3,0x00},
        {0x2a,0x05,0xd3,0x00},
        {0x2a,0x05,0xd3,0x00},
        {0x2a,0x05,0xd3,0x00},
@@ -417,7 +394,7 @@ const UCHAR SiS300_Phase2[8][5][4] =
     }
 };
 
-const UCHAR SiS300_Filter1[10][16][4] =
+static const unsigned char SiS300_Filter1[10][16][4] =
 {
     {
        {0x00,0xf4,0x10,0x38},
@@ -601,7 +578,7 @@ const UCHAR SiS300_Filter1[10][16][4] =
     },
 };
 
-const UCHAR SiS300_Filter2[10][9][7] =
+static const unsigned char SiS300_Filter2[10][9][7] =
 {
     {
        {0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},
@@ -716,142 +693,144 @@ const UCHAR SiS300_Filter2[10][9][7] =
 };
 
 /* Custom data for Barco iQ Pro R300 */
-const UCHAR barco_p1[2][9][7][3] = {
-    {
-       {  { 0x16, 0xcf, 0x00 },
-          { 0x18, 0x00, 0x00 },
-          { 0x1a, 0xe7, 0x00 },
-          { 0x1b, 0x26, 0x00 },
-          { 0x1c, 0xff, 0x00 },
-          { 0x1d, 0x1c, 0x00 },
-          { 0x1e, 0x19, 0x00 }
-       },
-       {
-          { 0x16, 0xcf, 0x00 },
-          { 0x18, 0x00, 0x00 },
-          { 0x1a, 0xe7, 0x00 },
-          { 0x1b, 0x1e, 0x00 },
-          { 0x1c, 0xff, 0x00 },
-          { 0x1d, 0x1c, 0x00 },
-          { 0x1e, 0x16, 0x00 }
-       },
-       {
-          { 0x16, 0xcf, 0x00 },
-          { 0x1a, 0xe7, 0x00 },
-          { 0x1b, 0x26, 0x00 },
-          { 0x1c, 0xff, 0x00 },
-          { 0x1d, 0x1c, 0x00 },
-          { 0x1e, 0x19, 0x00 },
-          {    0,    0,    0 }
-       },
-       {
-          {    0,    0,    0 }
-       },
-       {
-          { 0x16, 0xcf, 0x00 },
-          { 0x1a, 0xe7, 0x00 },
-          { 0x1b, 0x26, 0x00 },
-          { 0x1c, 0xff, 0x00 },
-          { 0x1d, 0x1c, 0x00 },
-          { 0x1e, 0x1e, 0x00 },
-          {    0,    0,    0 }
-       },
-       {
-          { 0x16, 0xd1, 0x00 },
-          { 0x18, 0x00, 0x00 },
-          { 0x1a, 0xe7, 0x00 },
-          { 0x1b, 0x11, 0x00 },
-          { 0x1c, 0xff, 0x00 },
-          { 0x1d, 0x1c, 0x00 },
-          { 0x1e, 0x26, 0x00 }
-       },
-       {
-          { 0x16, 0xd1, 0x00 },
-          { 0x1a, 0xe7, 0x00 },
-          { 0x1b, 0x26, 0x00 },
-          { 0x1c, 0xff, 0x00 },
-          { 0x1d, 0x1c, 0x00 },
-          { 0x1e, 0x30, 0x00 },
-          {    0,    0,    0 }
-       },
-       {
-          { 0x16, 0x00, 0x00 },
-          { 0x17, 0xa0, 0x00 },
-          { 0x1a, 0xa0, 0x00 },
-          { 0x1b, 0x2a, 0x00 },
-          { 0x1c, 0xff, 0x00 },
-          { 0x1d, 0x1c, 0x00 },
-          {    0,    0,    0 }
-       },
-       {
-          { 0x16, 0x00, 0x00 },
-          { 0x17, 0xaa, 0x00 },
-          { 0x1a, 0xa0, 0x00 },
-          { 0x1b, 0x2a, 0x00 },
-          { 0x1c, 0xff, 0x00 },
-          { 0x1d, 0x1c, 0x00 },
-          {    0,    0,    0 }
-       }
-    },
-    {
-       {
-          { 0x16, 0xcf, 0x00 },
-          { 0x18, 0x00, 0x00 },
-          { 0x1a, 0xe7, 0x00 },
-          { 0x1b, 0x26, 0x00 },
-          { 0x1c, 0xff, 0x00 },
-          { 0x1d, 0x1c, 0x00 },
-          { 0x1e, 0x19, 0x00 }
-       },
-       {
-          {    0,    0,    0 }
-       },
-       {
-          { 0x16, 0xcf, 0x00 },
-          { 0x18, 0x00, 0x00 },
-          { 0x1a, 0xe7, 0x00 },
-          { 0x1b, 0x26, 0x00 },
-          { 0x1c, 0xff, 0x00 },
-          { 0x1d, 0x1c, 0x00 },
-          { 0x1e, 0x19, 0x00 },
-       },
-       {
-          {    0,    0,    0 }
-       },
-       {
-          { 0x16, 0xcf, 0x00 },
-          { 0x18, 0x00, 0x00 },
-          { 0x1a, 0xe7, 0x00 },
-          { 0x1b, 0x26, 0x00 },
-          { 0x1c, 0xff, 0x00 },
-          { 0x1d, 0x1c, 0x00 },
-          { 0x1e, 0x1e, 0x00 }
-       },
-       {
-          { 0x16, 0xd1, 0x00 },
-          { 0x18, 0x00, 0x00 },
-          { 0x1a, 0xe6, 0x00 },
-          { 0x1b, 0x11, 0x00 },
-          { 0x1c, 0xff, 0x00 },
-          { 0x1d, 0x1c, 0x00 },
-          { 0x1e, 0x26, 0x00 }
-       },
-       {
-          { 0x18, 0x00, 0x00 },
-          { 0x1a, 0xe0, 0x00 },
-          { 0x1b, 0x26, 0x00 },
-          { 0x1c, 0xff, 0x00 },
-          { 0x1d, 0x1c, 0x00 },
-          { 0x1e, 0x30, 0x00 },
-          {    0,    0,    0 }
-       },
-       {
-          {    0,    0,    0 }
-       },
-       {
-          {    0,    0,    0 }
-       }
-    }
+static const unsigned char barco_p1[2][9][7][3] =
+{
+  {
+     {
+       { 0x16, 0xcf, 0x00 },
+       { 0x18, 0x00, 0x00 },
+       { 0x1a, 0xe7, 0x00 },
+       { 0x1b, 0x26, 0x00 },
+       { 0x1c, 0xff, 0x00 },
+       { 0x1d, 0x1c, 0x00 },
+       { 0x1e, 0x19, 0x00 }
+     },
+     {
+       { 0x16, 0xcf, 0x00 },
+       { 0x18, 0x00, 0x00 },
+       { 0x1a, 0xe7, 0x00 },
+       { 0x1b, 0x1e, 0x00 },
+       { 0x1c, 0xff, 0x00 },
+       { 0x1d, 0x1c, 0x00 },
+       { 0x1e, 0x16, 0x00 }
+     },
+     {
+       { 0x16, 0xcf, 0x00 },
+       { 0x1a, 0xe7, 0x00 },
+       { 0x1b, 0x26, 0x00 },
+       { 0x1c, 0xff, 0x00 },
+       { 0x1d, 0x1c, 0x00 },
+       { 0x1e, 0x19, 0x00 },
+       {    0,    0,    0 }
+     },
+     {
+       {    0,    0,    0 }
+     },
+     {
+       { 0x16, 0xcf, 0x00 },
+       { 0x1a, 0xe7, 0x00 },
+       { 0x1b, 0x26, 0x00 },
+       { 0x1c, 0xff, 0x00 },
+       { 0x1d, 0x1c, 0x00 },
+       { 0x1e, 0x1e, 0x00 },
+       {    0,    0,    0 }
+     },
+     {
+       { 0x16, 0xd1, 0x00 },
+       { 0x18, 0x00, 0x00 },
+       { 0x1a, 0xe7, 0x00 },
+       { 0x1b, 0x11, 0x00 },
+       { 0x1c, 0xff, 0x00 },
+       { 0x1d, 0x1c, 0x00 },
+       { 0x1e, 0x26, 0x00 }
+     },
+     {
+       { 0x16, 0xd1, 0x00 },
+       { 0x1a, 0xe7, 0x00 },
+       { 0x1b, 0x26, 0x00 },
+       { 0x1c, 0xff, 0x00 },
+       { 0x1d, 0x1c, 0x00 },
+       { 0x1e, 0x30, 0x00 },
+       {    0,    0,    0 }
+     },
+     {
+       { 0x16, 0x00, 0x00 },
+       { 0x17, 0xa0, 0x00 },
+       { 0x1a, 0xa0, 0x00 },
+       { 0x1b, 0x2a, 0x00 },
+       { 0x1c, 0xff, 0x00 },
+       { 0x1d, 0x1c, 0x00 },
+       {    0,    0,    0 }
+     },
+     {
+       { 0x16, 0x00, 0x00 },
+       { 0x17, 0xaa, 0x00 },
+       { 0x1a, 0xa0, 0x00 },
+       { 0x1b, 0x2a, 0x00 },
+       { 0x1c, 0xff, 0x00 },
+       { 0x1d, 0x1c, 0x00 },
+       {    0,    0,    0 }
+     }
+  },
+  {
+     {
+       { 0x16, 0xcf, 0x00 },
+       { 0x18, 0x00, 0x00 },
+       { 0x1a, 0xe7, 0x00 },
+       { 0x1b, 0x26, 0x00 },
+       { 0x1c, 0xff, 0x00 },
+       { 0x1d, 0x1c, 0x00 },
+       { 0x1e, 0x19, 0x00 }
+     },
+     {
+       {    0,    0,    0 }
+     },
+     {
+       { 0x16, 0xcf, 0x00 },
+       { 0x18, 0x00, 0x00 },
+       { 0x1a, 0xe7, 0x00 },
+       { 0x1b, 0x26, 0x00 },
+       { 0x1c, 0xff, 0x00 },
+       { 0x1d, 0x1c, 0x00 },
+       { 0x1e, 0x19, 0x00 },
+     },
+     {
+       {    0,    0,    0 }
+     },
+     {
+       { 0x16, 0xcf, 0x00 },
+       { 0x18, 0x00, 0x00 },
+       { 0x1a, 0xe7, 0x00 },
+       { 0x1b, 0x26, 0x00 },
+       { 0x1c, 0xff, 0x00 },
+       { 0x1d, 0x1c, 0x00 },
+       { 0x1e, 0x1e, 0x00 }
+     },
+     {
+       { 0x16, 0xd1, 0x00 },
+       { 0x18, 0x00, 0x00 },
+       { 0x1a, 0xe6, 0x00 },
+       { 0x1b, 0x11, 0x00 },
+       { 0x1c, 0xff, 0x00 },
+       { 0x1d, 0x1c, 0x00 },
+       { 0x1e, 0x26, 0x00 }
+     },
+     {
+       { 0x18, 0x00, 0x00 },
+       { 0x1a, 0xe0, 0x00 },
+       { 0x1b, 0x26, 0x00 },
+       { 0x1c, 0xff, 0x00 },
+       { 0x1d, 0x1c, 0x00 },
+       { 0x1e, 0x30, 0x00 },
+       {    0,    0,    0 }
+     },
+     {
+       {    0,    0,    0 }
+     },
+     {
+       {    0,    0,    0 }
+     }
+  }
 };
 
 
linux-2.6