patch-2.4.20 linux-2.4.20/drivers/video/sis/oem310.h
Next file: linux-2.4.20/drivers/video/sis/osdef.h
Previous file: linux-2.4.20/drivers/video/sis/oem300.h
Back to the patch index
Back to the overall index
- Lines: 346
- Date:
Thu Nov 28 15:53:15 2002
- Orig file:
linux-2.4.19/drivers/video/sis/oem310.h
- Orig date:
Fri Aug 2 17:39:45 2002
diff -urN linux-2.4.19/drivers/video/sis/oem310.h linux-2.4.20/drivers/video/sis/oem310.h
@@ -1,92 +1,181 @@
-UCHAR SiS310_CRT2DelayCompensation1=0x4; /* 301A */
-UCHAR SiS310_LCDDelayCompensation1[]=
- {0x0,0x0,0x0,0xb,0xb,0xb,0x8,0x8,0x8,0x8,0x8,0x8,
- 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0};
-UCHAR SiS310_TVDelayCompensation1[]={0x2,0x2,0x2,0x2,0x8,0xb};
-UCHAR SiS310_CRT2DelayCompensation2=0xC; /* 301B */
-UCHAR SiS310_LCDDelayCompensation2[]=
- {0x0,0x0,0x0,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x8,
- 0x8,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0};
-UCHAR SiS310_TVDelayCompensation2[]={0x3,0x3,0x3,0x3,0x8,0xb};
-UCHAR SiS310_TVAntiFlick1[3][2]={{0x4,0x0},{0x4,0x8},{0x0,0x0}};
-
-UCHAR SiS310_TVEdge1[3][2]={{0x0,0x4},{0x0,0x4},{0x0,0x0}};
-
-UCHAR SiS310_TVYFilter1[3][8][4]=
-{
- {
- {0x0,0xf4,0x10,0x38},
- {0x0,0xf4,0x10,0x38},
- {0xeb,0x4,0x25,0x18},
- {0xf7,0x6,0x19,0x14},
- {0x0,0xf4,0x10,0x38},
- {0xeb,0x4,0x25,0x18},
- {0xee,0xc,0x22,0x8},
- {0xeb,0x15,0x25,0xf6}
- },
- {
- {0x0,0xf4,0x10,0x38},
- {0x0,0xf4,0x10,0x38},
- {0xf1,0xf7,0x1f,0x32},
- {0xf3,0x0,0x1d,0x20},
- {0x0,0xf4,0x10,0x38},
- {0xf1,0xf7,0x1f,0x32},
- {0xf3,0x0,0x1d,0x20},
- {0xfc,0xfb,0x14,0x2a}
- },
- {
- {0x0,0x0,0x0,0x0},
- {0x0,0xf4,0x10,0x38},
- {0x0,0xf4,0x10,0x38},
- {0xeb,0x4,0x25,0x18},
- {0xf7,0x6,0x19,0x14},
- {0x0,0xf4,0x10,0x38},
- {0xeb,0x4,0x25,0x18},
- {0xee,0xc,0x22,0x8}
+/* OEM Data for 310/325 series */
+
+const UCHAR SiS310_CRT2DelayCompensation1 = 0x04; /* 301A */
+
+const UCHAR SiS310_LCDDelayCompensation1[] =
+{
+ 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
+};
+
+const UCHAR SiS310_TVDelayCompensation1[] =
+{
+ 0x02,0x02, /* NTSC Enhanced, Standard */
+ 0x02,0x02, /* PAL */
+ 0x08,0x0b /* HiVision */
+};
+
+const UCHAR SiS310_CRT2DelayCompensation2 = 0x00; /* TW: From 650/301LV BIOS; was 0x0C; */ /* 301B */
+
+UCHAR SiS310_LCDDelayCompensation2[] =
+{
+ 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 */
+ 0x08,0x08,0x08, /* 1280x768 (guessed) */
+ 0x01,0x01,0x01, /* 1600x1200 */
+ 0x02,0x02,0x02,
+ 0x02,0x02,0x02,
+ 0x02,0x02,0x02,
+ 0x02,0x02,0x02
+};
+
+const UCHAR SiS310_TVDelayCompensation2[] =
+{
+ 0x03,0x03, /* TW: From 650/301LVx 1.10.6s BIOS */
+ 0x03,0x03,
+ 0x03,0x03
+#if 0
+ 0x03,0x03, /* NTSC Enhanced, Standard */
+ 0x03,0x03, /* PAL */
+ 0x08,0x0b /* HiVision */
+#endif
+};
+
+const UCHAR SiS310_CRT2DelayCompensation3 = 0x00; /* LVDS */
+
+const UCHAR SiS310_LCDDelayCompensation3[] =
+{
+ 0x00,0x00,0x00, /* 800x600 */
+ 0x00,0x00,0x00, /* 1024x768 */
+ 0x00,0x00,0x00, /* 1280x1024 */
+ 0x00,0x00,0x00, /* 640x480 (unknown) */
+ 0x00,0x00,0x00, /* 1024x600 (unknown) */
+ 0x00,0x00,0x00, /* 1152x864 (unknown) */
+ 0x00,0x00,0x00, /* 1280x960 (guessed) */
+ 0x00,0x00,0x00, /* 1152x768 (unknown) */
+ 0x00,0x00,0x00, /* 1400x1050 */
+ 0x00,0x00,0x00, /* 1280x768 (guessed) */
+ 0x00,0x00,0x00, /* 1600x1200 */
+ 0x00,0x00,0x00,
+ 0x00,0x00,0x00,
+ 0x00,0x00,0x00,
+ 0x00,0x00,0x00
+};
+
+const UCHAR SiS310_TVDelayCompensation3[] =
+{
+ 0x0a,0x0a,
+ 0x0a,0x0a,
+ 0x0a,0x0a
+};
+
+const UCHAR SiS310_TVAntiFlick1[3][2] =
+{
+ {0x4,0x0},
+ {0x4,0x8},
+ {0x0,0x0}
+};
+
+const UCHAR SiS310_TVEdge1[3][2] =
+{
+ {0x0,0x4},
+ {0x0,0x4},
+ {0x0,0x0}
+};
+
+const UCHAR SiS310_TVYFilter1[3][8][4] =
+{
+ {
+ {0x00,0xf4,0x10,0x38},
+ {0x00,0xf4,0x10,0x38},
+ {0xeb,0x04,0x25,0x18},
+ {0xf1,0x04,0x1f,0x18},
+ {0x00,0xf4,0x10,0x38},
+ {0xeb,0x04,0x25,0x18},
+ {0xee,0x0c,0x22,0x08},
+ {0xeb,0x15,0x25,0xf6}
+ },
+ {
+ {0x00,0xf4,0x10,0x38},
+ {0x00,0xf4,0x10,0x38},
+ {0xf1,0xf7,0x1f,0x32},
+ {0xf3,0x00,0x1d,0x20},
+ {0x00,0xf4,0x10,0x38},
+ {0xf1,0xf7,0x1f,0x32},
+ {0xf3,0x00,0x1d,0x20},
+ {0xfc,0xfb,0x14,0x2a}
+ },
+ {
+ {0x00,0x00,0x00,0x00},
+ {0x00,0xf4,0x10,0x38},
+ {0x00,0xf4,0x10,0x38},
+ {0xeb,0x04,0x25,0x18},
+ {0xf7,0x06,0x19,0x14},
+ {0x00,0xf4,0x10,0x38},
+ {0xeb,0x04,0x25,0x18},
+ {0xee,0x0c,0x22,0x08}
}
};
-/*301b*/
-UCHAR SiS310_TVYFilter2[3][9][7]=
+
+const UCHAR SiS310_TVYFilter2[3][9][7] =
{
{
- {0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},
- {0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C},
- {0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},
- {0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C},
- {0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},
- {0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},
- {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},
- {0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C},
- {0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},
- {0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C},
- {0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},
- {0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},
- {0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C},
- {0x01,0x01,0xFC,0xF8,0x08,0x26,0x38},
- {0xFF,0xFF,0xFC,0x00,0x0F,0x22,0x28}
- },
- {
-
- {0x0,0x0,0x0,0xF4,0xFF,0x1C,0x22},
- {0x0,0x0,0x0,0xF4,0xFF,0x1C,0x22},
- {0x0,0x0,0x0,0xF4,0xFF,0x1C,0x22},
- {0x0,0x0,0x0,0xF4,0xFF,0x1C,0x22},
- {0x0,0x0,0x0,0xF4,0xFF,0x1C,0x22},
- {0x0,0x0,0x0,0xF4,0xFF,0x1C,0x22},
- {0x0,0x0,0x0,0xF4,0xFF,0x1C,0x22},
- {0x0,0x0,0x0,0xF4,0xFF,0x1C,0x22}
+ {0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},
+ {0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C},
+ {0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},
+ {0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C},
+ {0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},
+ {0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},
+ {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},
+ {0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C},
+ {0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},
+ {0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C},
+ {0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},
+ {0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},
+ {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},
+ {0x00,0x00,0x00,0xF4,0xFF,0x1C,0x22},
+ {0x00,0x00,0x00,0xF4,0xFF,0x1C,0x22},
+ {0x00,0x00,0x00,0xF4,0xFF,0x1C,0x22},
+ {0x00,0x00,0x00,0xF4,0xFF,0x1C,0x22},
+ {0x00,0x00,0x00,0xF4,0xFF,0x1C,0x22},
+ {0x00,0x00,0x00,0xF4,0xFF,0x1C,0x22},
+ {0x00,0x00,0x00,0xF4,0xFF,0x1C,0x22}
}
};
-/*end 301b*/
-/*add PALMN*/
-UCHAR SiS310_PALMFilter[17][4]={
+const UCHAR SiS310_PALMFilter[17][4] =
+{
{0x00,0xf4,0x10,0x38},
{0x00,0xf4,0x10,0x38},
{0xeb,0x04,0x10,0x18},
@@ -106,7 +195,8 @@
{0xff,0xff,0xff,0xff}
};
-UCHAR SiS310_PALNFilter[17][4]={
+const UCHAR SiS310_PALNFilter[17][4] =
+{
{0x00,0xf4,0x10,0x38},
{0x00,0xf4,0x10,0x38},
{0xeb,0x04,0x10,0x18},
@@ -127,7 +217,8 @@
};
-UCHAR SiS310_PALMFilter2[9][7]={
+const UCHAR SiS310_PALMFilter2[9][7] =
+{
{0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},
{0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C},
{0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},
@@ -139,7 +230,8 @@
{0xFF,0xFF,0xFC,0x00,0x0F,0x22,0x28}
};
-UCHAR SiS310_PALNFilter2[9][7]={
+const UCHAR SiS310_PALNFilter2[9][7] =
+{
{0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},
{0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C},
{0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},
@@ -151,35 +243,37 @@
{0xFF,0xFF,0xFC,0x00,0x0F,0x22,0x28}
};
-/*end PALMN*/
-UCHAR SiS310_TVPhaseIncr1[3][2][4]=
+const UCHAR SiS310_TVPhaseIncr1[3][2][4]=
{
{
- {0x21,0xed,0x8a,0x8},
- {0x21,0xed,0x8a,0x8}
+ {0x21,0xed,0xba,0x08},
+ {0x21,0xed,0xba,0x08}
},
{
- {0x2a,0x5,0xd3,0x0},
- {0x2a,0x5,0xd3,0x0}
+ {0x2a,0x05,0xe3,0x00},
+ {0x2a,0x05,0xe3,0x00}
},
{
- {0x2a,0x5,0xd3,0x0},
- {0x2a,0x5,0xd3,0x0}
+ {0x2a,0x05,0xd3,0x00},
+ {0x2a,0x05,0xd3,0x00}
}
};
-UCHAR SiS310_TVPhaseIncr2[3][2][4]=
+const UCHAR SiS310_TVPhaseIncr2[3][2][4]=
{
{
- {0x21,0xF0,0x7b,0xd6},
- {0x21,0xF0,0x7b,0xd6}
+ {0x1e,0x8b,0xda,0xa7}, /* {0x21,0xF1,0x37,0x56}, - new (1.10.6s) */
+ {0x1e,0x8b,0xda,0xa7} /* {0x21,0xF1,0x37,0x56} */
},
{
- {0x2a,0x09,0x86,0xe9},
- {0x2a,0x09,0x86,0xe9}
+ {0x2a,0x0a,0x41,0xe9}, /* {0x2a,0x09,0x86,0xe9}, */
+ {0x2a,0x0a,0x41,0xe9} /* {0x2a,0x09,0x86,0xe9} */
},
{
- {0x2a,0x5,0xd3,0x0},
- {0x2a,0x5,0xd3,0x0}
+ {0x2a,0x05,0xd3,0x00},
+ {0x2a,0x05,0xd3,0x00}
}
};
+
+
+
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)