patch-2.4.21 linux-2.4.21/drivers/video/sis/300vtbl.h
Next file: linux-2.4.21/drivers/video/sis/310vtbl.h
Previous file: linux-2.4.21/drivers/video/riva/rivafb.h
Back to the patch index
Back to the overall index
- Lines: 2421
- Date:
2003-06-13 07:51:37.000000000 -0700
- Orig file:
linux-2.4.20/drivers/video/sis/300vtbl.h
- Orig date:
2002-11-28 15:53:15.000000000 -0800
diff -urN linux-2.4.20/drivers/video/sis/300vtbl.h linux-2.4.21/drivers/video/sis/300vtbl.h
@@ -15,7 +15,7 @@
UCHAR VB_StTVYFilterIndex;
} SiS300_StStruct;
-static const SiS300_StStruct SiS300_SModeIDTable[]=
+static const SiS300_StStruct SiS300_SModeIDTable[] =
{
{0x01,0x9208,0x01,0x00,0x00,0x00,0x00,0x00},
{0x01,0x1210,0x14,0x01,0x01,0x00,0x00,0x00},
@@ -34,10 +34,9 @@
{0x11,0x0212,0x1a,0x04,0x04,0x00,0x00,0x00},
{0x12,0x0212,0x1b,0x04,0x04,0x00,0x00,0x00},
{0x13,0x021b,0x1c,0x00,0x00,0x00,0x00,0x00},
- /* {0x12,0x0210,0x18,0x00,0x00,0x00,0x00,0x00}, */ /* <--- Different in BIOS */
{0x12,0x0010,0x18,0x02,0x02,0x00,0x00,0x00},
{0x12,0x0210,0x18,0x01,0x01,0x00,0x00,0x00},
- {0xff,0,0,0,0,0,0,0}
+ {0xff, 0, 0, 0, 0, 0, 0, 0}
};
typedef struct _SiS300_StandTableStruct
@@ -53,9 +52,9 @@
UCHAR GRC[9];
} SiS300_StandTableStruct;
-static const SiS300_StandTableStruct SiS300_StandTable[]=
-{ /* TW: @ 0x38d4 in BIOS */
- {0x28,0x18,0x08,0x0800,
+static const SiS300_StandTableStruct SiS300_StandTable[] =
+{
+ {0x28,0x18,0x08,0x0800, /* 0x00 */
{0x09,0x03,0x00,0x02},
0x63,
{0x2d,0x27,0x28,0x90,0x2b,0xa0,0xbf,0x1f,
@@ -67,7 +66,7 @@
0x08,0x00,0x0f,0x00},
{0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
0xff} },
- {0x28,0x18,0x08,0x0800,
+ {0x28,0x18,0x08,0x0800, /* 0x01 */
{0x09,0x03,0x00,0x02},
0x63,
{0x2d,0x27,0x28,0x90,0x2b,0xa0,0xbf,0x1f,
@@ -79,7 +78,7 @@
0x08,0x00,0x0f,0x00},
{0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
0xff} },
- {0x50,0x18,0x08,0x1000,
+ {0x50,0x18,0x08,0x1000, /* 0x02 */
{0x01,0x03,0x00,0x02},
0x63,
{0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
@@ -91,7 +90,7 @@
0x08,0x00,0x0f,0x00},
{0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
0xff} },
- {0x50,0x18,0x08,0x1000,
+ {0x50,0x18,0x08,0x1000, /* 0x03 */
{0x01,0x03,0x00,0x02},
0x63,
{0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
@@ -103,7 +102,7 @@
0x08,0x00,0x0f,0x00},
{0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
0xff} },
- {0x28,0x18,0x08,0x4000,
+ {0x28,0x18,0x08,0x4000, /* 0x04 */
{0x09,0x03,0x00,0x02},
0x63,
{0x2d,0x27,0x28,0x90,0x2b,0x80,0xbf,0x1f,
@@ -115,7 +114,7 @@
0x01,0x00,0x03,0x00},
{0x00,0x00,0x00,0x00,0x00,0x30,0x0f,0x00,
0xff} },
- {0x28,0x18,0x08,0x4000,
+ {0x28,0x18,0x08,0x4000, /* 0x05 */
{0x09,0x03,0x00,0x02},
0x63,
{0x2d,0x27,0x28,0x90,0x2b,0x80,0xbf,0x1f,
@@ -127,7 +126,7 @@
0x01,0x00,0x03,0x00},
{0x00,0x00,0x00,0x00,0x00,0x30,0x0f,0x00,
0xff} },
- {0x50,0x18,0x08,0x4000,
+ {0x50,0x18,0x08,0x4000, /* 0x06 */
{0x01,0x01,0x00,0x06},
0x63,
{0x5f,0x4f,0x50,0x82,0x54,0x80,0xbf,0x1f,
@@ -139,7 +138,7 @@
0x01,0x00,0x01,0x00},
{0x00,0x00,0x00,0x00,0x00,0x00,0x0d,0x00,
0xff} },
- {0x50,0x18,0x0e,0x1000,
+ {0x50,0x18,0x0e,0x1000, /* 0x07 */
{0x00,0x03,0x00,0x03},
0xa6,
{0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
@@ -152,7 +151,7 @@
{0x00,0x00,0x00,0x00,0x00,0x10,0x0a,0x00,
0xff} },
/* MDA_DAC*/
- {0x00,0x00,0x00,0x0000,
+ {0x00,0x00,0x00,0x0000, /* 0x08 */
{0x00,0x00,0x00,0x15},
0x15,
{0x15,0x15,0x15,0x15,0x15,0x15,0x15,0x15,
@@ -165,7 +164,7 @@
{0x15,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,
0x3f} },
/* CGA_DAC*/
- {0x00,0x10,0x04,0x0114,
+ {0x00,0x10,0x04,0x0114, /* 0x09 */
{0x11,0x09,0x15,0x00},
0x10,
{0x04,0x14,0x01,0x11,0x09,0x15,0x2a,0x3a,
@@ -178,7 +177,7 @@
{0x3f,0x2a,0x3a,0x2e,0x3e,0x2b,0x3b,0x2f,
0x3f} },
/* EGA_DAC*/
- {0x00,0x10,0x04,0x0114,
+ {0x00,0x10,0x04,0x0114, /* 0x0a */
{0x11,0x05,0x15,0x20},
0x30,
{0x24,0x34,0x21,0x31,0x25,0x35,0x08,0x18,
@@ -191,7 +190,7 @@
{0x1f,0x2a,0x3a,0x2e,0x3e,0x2b,0x3b,0x2f,
0x3f} },
/* VGA_DAC*/
- {0x00,0x10,0x04,0x0114,
+ {0x00,0x10,0x04,0x0114, /* 0x0b */
{0x11,0x09,0x15,0x2a},
0x3a,
{0x2e,0x3e,0x2b,0x3b,0x2f,0x3f,0x00,0x05,
@@ -203,7 +202,7 @@
0x1c,0x0e,0x11,0x15},
{0x18,0x1c,0x14,0x16,0x18,0x1a,0x1c,0x00,
0x04} },
- {0x08,0x0c,0x10,0x0a08,
+ {0x08,0x0c,0x10,0x0a08, /* 0x0c */
{0x0c,0x0e,0x10,0x0b},
0x0c,
{0x0d,0x0f,0x10,0x10,0x01,0x08,0x00,0x00,
@@ -215,7 +214,7 @@
0x00,0x00,0x00,0x00},
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00} },
- {0x28,0x18,0x08,0x2000,
+ {0x28,0x18,0x08,0x2000, /* 0x0d */
{0x09,0x0f,0x00,0x06},
0x63,
{0x2d,0x27,0x28,0x90,0x2b,0x80,0xbf,0x1f,
@@ -227,7 +226,7 @@
0x01,0x00,0x0f,0x00},
{0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x0f,
0xff} },
- {0x50,0x18,0x08,0x4000,
+ {0x50,0x18,0x08,0x4000, /* 0x0e */
{0x01,0x0f,0x00,0x06},
0x63,
{0x5f,0x4f,0x50,0x82,0x54,0x80,0xbf,0x1f,
@@ -239,8 +238,8 @@
0x01,0x00,0x0f,0x00},
{0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x0f,
0xff} },
- {0x00,0x00,0x00,0x0000, /* TW: Standtable for VGA modes */
- {0x01,0x0f,0x00,0x0e}, /* (identical to BIOS) */
+ {0x00,0x00,0x00,0x0000, /* 0x0f */ /* TW: Standtable for VGA modes */
+ {0x01,0x0f,0x00,0x0e},
0x23,
{0x5f,0x4f,0x50,0x82,0x54,0x80,0x0b,0x3e,
0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -251,7 +250,7 @@
0x01,0x00,0x00,0x00},
{0x00,0x00,0x00,0x00,0x00,0x40,0x05,0x0f,
0xff} },
- {0x4a,0x36,0x00,0x00c0,
+ {0x4a,0x36,0x00,0x00c0, /* 0x10 */
{0x00,0x00,0x00,0x00},
0x00,
{0x00,0x00,0x00,0x00,0x00,0x00,0x66,0x3a,
@@ -263,7 +262,7 @@
0x00,0x00,0x00,0x00},
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00} },
- {0x50,0x18,0x0e,0x8000,
+ {0x50,0x18,0x0e,0x8000, /* 0x11 */
{0x01,0x0f,0x00,0x06},
0xa2,
{0x5f,0x4f,0x50,0x82,0x54,0x80,0xbf,0x1f,
@@ -275,7 +274,7 @@
0x0b,0x00,0x05,0x00},
{0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x05,
0xff} },
- {0x50,0x18,0x0e,0x8000,
+ {0x50,0x18,0x0e,0x8000, /* 0x12 */
{0x01,0x0f,0x00,0x06},
0xa3,
{0x5f,0x4f,0x50,0x82,0x54,0x80,0xbf,0x1f,
@@ -287,7 +286,7 @@
0x01,0x00,0x0f,0x00},
{0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x0f,
0xff} },
- {0x28,0x18,0x0e,0x0800,
+ {0x28,0x18,0x0e,0x0800, /* 0x13 */
{0x09,0x03,0x00,0x02},
0xa3,
{0x2d,0x27,0x28,0x90,0x2b,0xa0,0xbf,0x1f,
@@ -299,7 +298,7 @@
0x08,0x00,0x0f,0x00},
{0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
0xff} },
- {0x28,0x18,0x0e,0x0800,
+ {0x28,0x18,0x0e,0x0800, /* 0x14 */
{0x09,0x03,0x00,0x02},
0xa3,
{0x2d,0x27,0x28,0x90,0x2b,0xa0,0xbf,0x1f,
@@ -311,7 +310,7 @@
0x08,0x00,0x0f,0x00},
{0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
0xff} },
- {0x50,0x18,0x0e,0x1000,
+ {0x50,0x18,0x0e,0x1000, /* 0x15 */
{0x01,0x03,0x00,0x02},
0xa3,
{0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
@@ -323,7 +322,7 @@
0x08,0x00,0x0f,0x00},
{0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
0xff} },
- {0x50,0x18,0x0e,0x1000,
+ {0x50,0x18,0x0e,0x1000, /* 0x16 */
{0x01,0x03,0x00,0x02},
0xa3,
{0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
@@ -335,7 +334,7 @@
0x08,0x00,0x0f,0x00},
{0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
0xff} },
- {0x28,0x18,0x10,0x0800,
+ {0x28,0x18,0x10,0x0800, /* 0x17 */
{0x08,0x03,0x00,0x02},
0x67,
{0x2d,0x27,0x28,0x90,0x2b,0xa0,0xbf,0x1f,
@@ -347,7 +346,7 @@
0x0c,0x00,0x0f,0x08},
{0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
0xff} },
- {0x50,0x18,0x10,0x1000,
+ {0x50,0x18,0x10,0x1000, /* 0x18 */
{0x00,0x03,0x00,0x02},
0x67,
{0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
@@ -359,7 +358,7 @@
0x0c,0x00,0x0f,0x08},
{0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
0xff} },
- {0x50,0x18,0x10,0x1000,
+ {0x50,0x18,0x10,0x1000, /* 0x19 */
{0x00,0x03,0x00,0x02},
0x66,
{0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
@@ -371,7 +370,7 @@
0x0e,0x00,0x0f,0x08},
{0x00,0x00,0x00,0x00,0x00,0x10,0x0a,0x00,
0xff} },
- {0x50,0x1d,0x10,0xa000,
+ {0x50,0x1d,0x10,0xa000, /* 0x1a */
{0x01,0x0f,0x00,0x06},
0xe3,
{0x5f,0x4f,0x50,0x82,0x54,0x80,0x0b,0x3e,
@@ -383,7 +382,7 @@
0x01,0x00,0x0f,0x00},
{0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x01,
0xff} },
- {0x50,0x1d,0x10,0xa000,
+ {0x50,0x1d,0x10,0xa000, /* 0x1b */
{0x01,0x0f,0x00,0x06},
0xe3,
{0x5f,0x4f,0x50,0x82,0x54,0x80,0x0b,0x3e,
@@ -395,7 +394,7 @@
0x01,0x00,0x0f,0x00},
{0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x0f,
0xff} },
- {0x28,0x18,0x08,0x2000,
+ {0x28,0x18,0x08,0x2000, /* 0x1c */
{0x01,0x0f,0x00,0x0e},
0x63,
{0x5f,0x4f,0x50,0x82,0x54,0x80,0xbf,0x1f,
@@ -424,61 +423,88 @@
UCHAR REFindex;
} SiS300_ExtStruct;
-static const SiS300_ExtStruct SiS300_EModeIDTable[]=
+static const SiS300_ExtStruct SiS300_EModeIDTable[] =
{
- {0x6a,0x2212,0x47,0x3563,0x0102,0x08,0x07,0x00,0x00,0x00,0x00}, /* 37ed */ /* 800x600x? */
- {0x2e,0x0a1b,0x36,0x3539,0x0101,0x08,0x06,0x00,0x00,0x00,0x08}, /* 37c3 */
- {0x2f,0x021b,0x35,0x3532,0x0100,0x08,0x05,0x00,0x00,0x00,0x10}, /* 37bc */
- {0x30,0x2a1b,0x47,0x3563,0x0103,0x08,0x07,0x00,0x00,0x00,0x00}, /* 37ed */
- {0x31,0x0a1b,0xad,0x3630,0x0000,0x08,0x0c,0x00,0x00,0x00,0x11}, /* 38ba */ /* 720x480x8 */
- {0x32,0x2a1b,0xae,0x3637,0x0000,0x08,0x0d,0x00,0x00,0x00,0x12}, /* 38c1 */ /* 720x576x8 */
- {0x33,0x0a1d,0xad,0x3630,0x0000,0x08,0x0c,0x00,0x00,0x00,0x11}, /* 38ba */ /* 720x480x16 */
- {0x34,0x2a1d,0xae,0x3637,0x0000,0x08,0x0d,0x00,0x00,0x00,0x12}, /* 38c1 */ /* 720x576x16 */
- {0x35,0x0a1f,0xad,0x3630,0x0000,0x08,0x0c,0x00,0x00,0x00,0x11}, /* 38ba */ /* 720x480x32 */
- {0x36,0x2a1f,0xae,0x3637,0x0000,0x08,0x0d,0x00,0x00,0x00,0x12}, /* 38c1 */ /* 720x576x32 */
- {0x37,0x0212,0x58,0x358d,0x0104,0x08,0x08,0x00,0x00,0x00,0x13}, /* 3817 */ /* 1024x768x? */
- {0x38,0x0a1b,0x58,0x358d,0x0105,0x08,0x08,0x00,0x00,0x00,0x13}, /* 3817 */ /* 1024x768x8 */
- {0x3a,0x0e3b,0x69,0x35be,0x0107,0x08,0x09,0x00,0x00,0x00,0x1a}, /* 3848 */ /* 1280x1024x8 */
- {0x3c,0x063b,0x7a,0x35d4,0x0130,0x08,0x0a,0x00,0x00,0x00,0x1e}, /* 385e */
- {0x3d,0x067d,0x7a,0x35d4,0x0131,0x08,0x0a,0x00,0x00,0x00,0x1e}, /* 385e */
- {0x40,0x921c,0x00,0x3516,0x010d,0x08,0x00,0x00,0x00,0x00,0x23}, /* 37a0 */
- {0x41,0x921d,0x00,0x3516,0x010e,0x08,0x00,0x00,0x00,0x00,0x23}, /* 37a0 */
- {0x43,0x0a1c,0x36,0x3539,0x0110,0x08,0x06,0x00,0x00,0x00,0x08}, /* 37c3 */
- {0x44,0x0a1d,0x36,0x3539,0x0111,0x08,0x06,0x00,0x00,0x00,0x08}, /* 37c3 */
- {0x46,0x2a1c,0x47,0x3563,0x0113,0x08,0x07,0x00,0x00,0x00,0x00}, /* 37ed */ /* 800x600 */
- {0x47,0x2a1d,0x47,0x3563,0x0114,0x08,0x07,0x00,0x00,0x00,0x00}, /* 37ed */ /* 800x600 */
- {0x49,0x0a3c,0x58,0x358d,0x0116,0x08,0x08,0x00,0x00,0x00,0x13}, /* 3817 */
- {0x4a,0x0a3d,0x58,0x358d,0x0117,0x08,0x08,0x00,0x00,0x00,0x13}, /* 3817 */
- {0x4c,0x0e7c,0x69,0x35be,0x0119,0x08,0x09,0x00,0x00,0x00,0x1a}, /* 3848 */
- {0x4d,0x0e7d,0x69,0x35be,0x011a,0x08,0x09,0x00,0x00,0x00,0x1a}, /* 3848 */
- {0x50,0x921b,0x01,0x351d,0x0132,0x08,0x01,0x00,0x00,0x00,0x24}, /* 37a7 */
- {0x51,0xb21b,0x13,0x3524,0x0133,0x08,0x03,0x00,0x00,0x00,0x25}, /* 37ae */ /* 400x300 */
- {0x52,0x921b,0x24,0x352b,0x0134,0x08,0x04,0x00,0x00,0x00,0x26}, /* 37b5 */
- {0x56,0x921d,0x01,0x351d,0x0135,0x08,0x01,0x00,0x00,0x00,0x24}, /* 37a7 */
- {0x57,0xb21d,0x13,0x3524,0x0136,0x08,0x03,0x00,0x00,0x00,0x25}, /* 37ae */ /* 400x300 */
- {0x58,0x921d,0x24,0x352b,0x0137,0x08,0x04,0x00,0x00,0x00,0x26}, /* 37b5 */
- {0x59,0x921b,0x00,0x3516,0x0138,0x08,0x00,0x00,0x00,0x00,0x23}, /* 37a0 */
+ {0x6a,0x2212,0x47,0x3563,0x0102,0x08,0x07,0x00,0x00,0x00,0x00}, /* 800x600x? */
+ {0x2e,0x0a1b,0x36,0x3539,0x0101,0x08,0x06,0x00,0x00,0x00,0x08},
+ {0x2f,0x021b,0x35,0x3532,0x0100,0x08,0x05,0x00,0x00,0x00,0x10}, /* 640x400x8 */
+ {0x30,0x2a1b,0x47,0x3563,0x0103,0x08,0x07,0x00,0x00,0x00,0x00},
+ {0x31,0x0a1b,0xad,0x3630,0x0000,0x08,0x0c,0x00,0x00,0x00,0x11}, /* 720x480x8 */
+ {0x32,0x2a1b,0xae,0x3637,0x0000,0x08,0x0d,0x00,0x00,0x00,0x12}, /* 720x576x8 */
+ {0x33,0x0a1d,0xad,0x3630,0x0000,0x08,0x0c,0x00,0x00,0x00,0x11}, /* 720x480x16 */
+ {0x34,0x2a1d,0xae,0x3637,0x0000,0x08,0x0d,0x00,0x00,0x00,0x12}, /* 720x576x16 */
+ {0x35,0x0a1f,0xad,0x3630,0x0000,0x08,0x0c,0x00,0x00,0x00,0x11}, /* 720x480x32 */
+ {0x36,0x2a1f,0xae,0x3637,0x0000,0x08,0x0d,0x00,0x00,0x00,0x12}, /* 720x576x32 */
+ {0x37,0x0212,0x58,0x358d,0x0104,0x08,0x08,0x00,0x00,0x00,0x13}, /* 1024x768x? */
+ {0x38,0x0a1b,0x58,0x358d,0x0105,0x08,0x08,0x00,0x00,0x00,0x13}, /* 1024x768x8 */
+ {0x3a,0x0e3b,0x69,0x35be,0x0107,0x08,0x09,0x00,0x00,0x00,0x1a}, /* 1280x1024x8 */
+ {0x3c,0x063b,0x7a,0x35d4,0x0130,0x08,0x0a,0x00,0x00,0x00,0x1e},
+ {0x3d,0x067d,0x7a,0x35d4,0x0131,0x08,0x0a,0x00,0x00,0x00,0x1e},
+ {0x40,0x921c,0x00,0x3516,0x010d,0x08,0x00,0x00,0x00,0x00,0x23}, /* 320x200x15 */
+ {0x41,0x921d,0x00,0x3516,0x010e,0x08,0x00,0x00,0x00,0x00,0x23}, /* 320x200x16 */
+ {0x43,0x0a1c,0x36,0x3539,0x0110,0x08,0x06,0x00,0x00,0x00,0x08},
+ {0x44,0x0a1d,0x36,0x3539,0x0111,0x08,0x06,0x00,0x00,0x00,0x08},
+ {0x46,0x2a1c,0x47,0x3563,0x0113,0x08,0x07,0x00,0x00,0x00,0x00}, /* 800x600x15 */
+ {0x47,0x2a1d,0x47,0x3563,0x0114,0x08,0x07,0x00,0x00,0x00,0x00}, /* 800x600x16 */
+ {0x49,0x0a3c,0x58,0x358d,0x0116,0x08,0x08,0x00,0x00,0x00,0x13},
+ {0x4a,0x0a3d,0x58,0x358d,0x0117,0x08,0x08,0x00,0x00,0x00,0x13},
+ {0x4c,0x0e7c,0x69,0x35be,0x0119,0x08,0x09,0x00,0x00,0x00,0x1a},
+ {0x4d,0x0e7d,0x69,0x35be,0x011a,0x08,0x09,0x00,0x00,0x00,0x1a},
+ {0x50,0x921b,0x01,0x351d,0x0132,0x08,0x01,0x00,0x00,0x00,0x24}, /* 320x240x8 */
+ {0x51,0xb21b,0x13,0x3524,0x0133,0x08,0x03,0x00,0x00,0x00,0x25}, /* 400x300x8 */
+ {0x52,0x921b,0x24,0x352b,0x0134,0x08,0x04,0x00,0x00,0x00,0x26}, /* 512x384x8 */
+ {0x56,0x921d,0x01,0x351d,0x0135,0x08,0x01,0x00,0x00,0x00,0x24}, /* 320x240x16 */
+ {0x57,0xb21d,0x13,0x3524,0x0136,0x08,0x03,0x00,0x00,0x00,0x25}, /* 400x300x16 */
+ {0x58,0x921d,0x24,0x352b,0x0137,0x08,0x04,0x00,0x00,0x00,0x26}, /* 512x384x16 */
+ {0x59,0x921b,0x00,0x3516,0x0138,0x08,0x00,0x00,0x00,0x00,0x23}, /* 320x200x8 */
{0x5c,0x921f,0x24,0x352b,0x0000,0x08,0x04,0x00,0x00,0x00,0x26}, /* TW: inserted 512x384x32 */
- {0x5d,0x021d,0x35,0x3532,0x0139,0x08,0x05,0x00,0x00,0x00,0x10}, /* 37bc */
- {0x62,0x0a3f,0x36,0x3539,0x013a,0x08,0x06,0x00,0x00,0x00,0x08}, /* 37c3 */
- {0x63,0x2a3f,0x47,0x3563,0x013b,0x08,0x07,0x00,0x00,0x00,0x00}, /* 37ed */ /* 800x600 */
- {0x64,0x0a7f,0x58,0x358d,0x013c,0x08,0x08,0x00,0x00,0x00,0x13}, /* 3817 */
- {0x65,0x0eff,0x69,0x35be,0x013d,0x08,0x09,0x00,0x00,0x00,0x1a}, /* 3848 */
- {0x66,0x06ff,0x7a,0x35d4,0x013e,0x08,0x0a,0x00,0x00,0x00,0x1e}, /* 385e */
- {0x68,0x067b,0x8b,0x35ef,0x013f,0x08,0x0b,0x00,0x00,0x00,0x27}, /* 3879 */
- {0x69,0x06fd,0x8b,0x35ef,0x0140,0x08,0x0b,0x00,0x00,0x00,0x27}, /* 3879 */
- {0x6b,0x07ff,0x8b,0x35ef,0x0000,0x10,0x0b,0x00,0x00,0x00,0x27}, /* 3879 */
- {0x6c,0x067b,0x9c,0x35f6,0x0000,0x08,0x0c,0x00,0x00,0x00,0x28}, /* 3880 */
- {0x6d,0x06fd,0x9c,0x35f6,0x0000,0x10,0x0c,0x00,0x00,0x00,0x28}, /* 3880 */
- {0x6e,0x0e3b,0x6f,0x35b2,0x0000,0x08,0x0e,0x00,0x00,0x00,0x29}, /* 383c */ /* 1280x960x8 */
- {0x6f,0x0e7d,0x6f,0x35b2,0x0000,0x08,0x0e,0x00,0x00,0x00,0x29}, /* 383c */ /* 1280x960x16 */
- {0x7b,0x0eff,0x6f,0x35b2,0x0000,0x08,0x0e,0x00,0x00,0x00,0x29}, /* 383c */ /* 1280x960x32 */
- {0x20,0x0a1b,0x54,0x0000,0x0000,0x08,0x0f,0x00,0x00,0x00,0x2b}, /* 1024x600 */
+ {0x5d,0x021d,0x35,0x3532,0x0139,0x08,0x05,0x00,0x00,0x00,0x10}, /* 640x400x16 */
+ {0x5e,0x021f,0x35,0x3532,0x0000,0x08,0x05,0x00,0x00,0x00,0x10}, /* TW: inserted 640x400x32 */
+ {0x62,0x0a3f,0x36,0x3539,0x013a,0x08,0x06,0x00,0x00,0x00,0x08},
+ {0x63,0x2a3f,0x47,0x3563,0x013b,0x08,0x07,0x00,0x00,0x00,0x00}, /* 800x600x32 */
+ {0x64,0x0a7f,0x58,0x358d,0x013c,0x08,0x08,0x00,0x00,0x00,0x13},
+ {0x65,0x0eff,0x69,0x35be,0x013d,0x08,0x09,0x00,0x00,0x00,0x1a},
+ {0x66,0x06ff,0x7a,0x35d4,0x013e,0x08,0x0a,0x00,0x00,0x00,0x1e},
+ {0x68,0x067b,0x8b,0x35ef,0x013f,0x08,0x0b,0x00,0x00,0x00,0x27},
+ {0x69,0x06fd,0x8b,0x35ef,0x0140,0x08,0x0b,0x00,0x00,0x00,0x27},
+ {0x6b,0x07ff,0x8b,0x35ef,0x0000,0x10,0x0b,0x00,0x00,0x00,0x27},
+ {0x6c,0x067b,0x9c,0x35f6,0x0000,0x08,0x11,0x00,0x00,0x00,0x28}, /* TW: 2048x1536x8 - not in BIOS! */
+ {0x6d,0x06fd,0x9c,0x35f6,0x0000,0x10,0x11,0x00,0x00,0x00,0x28}, /* TW: 2048x1536x16 - not in BIOS! */
+ {0x6e,0x0a3b,0x6f,0x35b2,0x0000,0x08,0x0e,0x00,0x00,0x00,0x29}, /* 1280x960x8 */
+ {0x6f,0x0a7d,0x6f,0x35b2,0x0000,0x08,0x0e,0x00,0x00,0x00,0x29}, /* 1280x960x16 */
+ /* TW: 16:9 modes - not in ANY BIOS */
+ {0x70,0x2a1b,0x40,0x3b52,0x0000,0x08,0x12,0x00,0x00,0x07,0x2d}, /* 800x480x8 */
+ {0x71,0x0a1b,0x51,0x3b63,0x0000,0x08,0x13,0x00,0x00,0x00,0x30}, /* 1024x576x8 */
+ {0x74,0x0a1d,0x51,0x3b63,0x0000,0x08,0x13,0x00,0x00,0x00,0x30}, /* 1024x576x16 */
+ {0x75,0x0e3d,0x62,0x3b74,0x0000,0x08,0x14,0x00,0x00,0x00,0x33}, /* 1280x720x16 */
+ {0x76,0x2a1f,0x40,0x3b52,0x0000,0x08,0x12,0x00,0x00,0x07,0x2d}, /* 800x480x32 */
+ {0x77,0x0a3f,0x51,0x3b63,0x0000,0x08,0x13,0x00,0x00,0x00,0x30}, /* 1024x576x32 */
+ {0x78,0x0eff,0x62,0x3b74,0x0000,0x08,0x14,0x00,0x00,0x00,0x33}, /* 1280x720x32 */
+ {0x79,0x0e3b,0x62,0x3b74,0x0000,0x08,0x14,0x00,0x00,0x00,0x33}, /* 1280x720x8 */
+ {0x7a,0x2a1d,0x40,0x3b52,0x0000,0x08,0x12,0x00,0x00,0x07,0x2d}, /* 800x480x16 */
+ /* TW: End of new 16:9 modes */
+ {0x7b,0x0aff,0x6f,0x35b2,0x0000,0x08,0x0e,0x00,0x00,0x00,0x29}, /* 1280x960x32 */
+ {0x20,0x0a1b,0x54,0x0000,0x0000,0x08,0x0f,0x00,0x00,0x00,0x2b}, /* 1024x600 */
{0x21,0x0a3d,0x54,0x0000,0x0000,0x08,0x0f,0x00,0x00,0x00,0x2b},
{0x22,0x0a7f,0x54,0x0000,0x0000,0x08,0x0f,0x00,0x00,0x00,0x2b},
- {0x23,0x0a1b,0xc5,0x0000,0x0000,0x08,0x10,0x00,0x00,0x00,0x2c}, /* 1152x768 */
+ {0x23,0x0a1b,0xc5,0x0000,0x0000,0x08,0x10,0x00,0x00,0x00,0x2c}, /* 1152x768 */
{0x24,0x0a3d,0xc5,0x431d,0x0000,0x08,0x10,0x00,0x00,0x00,0x2c},
{0x25,0x0a7f,0xc5,0x431d,0x0000,0x08,0x10,0x00,0x00,0x00,0x2c},
+ {0x29,0x0e1b,0xc5,0x0000,0x0000,0x08,0x15,0x00,0x00,0x00,0x36}, /* TW: NEW 1152x864 - not in BIOS */
+ {0x2a,0x0e3d,0xc5,0x0000,0x0000,0x08,0x15,0x00,0x00,0x00,0x36},
+ {0x2b,0x0e7f,0xc5,0x0000,0x0000,0x08,0x15,0x00,0x00,0x00,0x36},
+ {0x39,0x2a1b,0xd6,0x0000,0x0000,0x08,0x16,0x00,0x00,0x00,0x38}, /* TW: NEW 848x480 - not in BIOS */
+ {0x3b,0x2a3d,0xd6,0x0000,0x0000,0x08,0x16,0x00,0x00,0x00,0x38},
+ {0x3e,0x2a7f,0xd6,0x0000,0x0000,0x08,0x16,0x00,0x00,0x00,0x38},
+ {0x3f,0x2a1b,0xd7,0x0000,0x0000,0x08,0x17,0x00,0x00,0x00,0x3a}, /* TW: NEW 856x480 - not in BIOS */
+ {0x42,0x2a3d,0xd7,0x0000,0x0000,0x08,0x17,0x00,0x00,0x00,0x3a},
+ {0x45,0x2a7f,0xd7,0x0000,0x0000,0x08,0x17,0x00,0x00,0x00,0x3a},
+ {0x48,0x223b,0xe8,0x0000,0x0000,0x08,0x18,0x00,0x00,0x00,0x3c}, /* TW: NEW 1360x768 - not in BIOS */
+ {0x4b,0x227d,0xe8,0x0000,0x0000,0x08,0x18,0x00,0x00,0x00,0x3c},
+ {0x4e,0x22ff,0xe8,0x0000,0x0000,0x08,0x18,0x00,0x00,0x00,0x3c},
+ {0x4f,0x921f,0x00,0x0000,0x0000,0x08,0x00,0x00,0x00,0x00,0x23}, /* TW: New 320x200x32 */
+ {0x53,0x921f,0x01,0x0000,0x0000,0x08,0x01,0x00,0x00,0x00,0x24}, /* TW: New 320x240x32 */
+ {0x54,0xb21f,0x13,0x0000,0x0000,0x08,0x03,0x00,0x00,0x00,0x25}, /* TW: New 400x300x32 */
{0xff,0x0000,0x00,0x0000,0xffff,0x00,0x00,0x00,0x00,0x00,0x00}
};
@@ -486,7 +512,7 @@
{
USHORT Ext_InfoFlag;
UCHAR Ext_CRT1CRTC; /* TW: Index in SiS300_CRT1Table */
- UCHAR Ext_CRTVCLK;
+ UCHAR Ext_CRTVCLK; /* TW: Index in VCLK array */
UCHAR Ext_CRT2CRTC; /* TW: Index in LCD Paneltype arrays (&3f) */
UCHAR ModeID;
USHORT XRes;
@@ -494,15 +520,15 @@
USHORT ROM_OFFSET;
} SiS300_Ext2Struct;
-static const SiS300_Ext2Struct SiS300_RefIndex[]=
+static const SiS300_Ext2Struct SiS300_RefIndex[] =
{ /* TW: Don't ever insert anything here, table is indexed */
{0x085f,0x0d,0x03,0x05,0x6a, 800, 600,0x3563}, /* 00 */
{0x0467,0x0e,0x44,0x05,0x6a, 800, 600,0x3568}, /* 01 */
- {0x0067,0x4f,0x07,0x48,0x6a, 800, 600,0x356d}, /* 02 */
+ {0x0067,0x0f,0x07,0x48,0x6a, 800, 600,0x356d}, /* 02 - CRT1CRTC was 0x4f */
{0x0067,0x10,0x06,0x8b,0x6a, 800, 600,0x3572}, /* 03 */
{0x0147,0x11,0x08,0x00,0x6a, 800, 600,0x3577}, /* 04 */
{0x0147,0x12,0x0c,0x00,0x6a, 800, 600,0x357c}, /* 05 */
- {0x0047,0x51,0x4e,0x00,0x6a, 800, 600,0x3581}, /* 06 */
+ {0x0047,0x11,0x4e,0x00,0x6a, 800, 600,0x3581}, /* 06 - CRT1CRTC was 0x51 */
{0x0047,0x11,0x13,0x00,0x6a, 800, 600,0x3586}, /* 07 */
{0xc85f,0x05,0x00,0x04,0x2e, 640, 480,0x3539}, /* 08 */
{0xc067,0x06,0x02,0x04,0x2e, 640, 480,0x353e}, /* 09 */
@@ -517,30 +543,46 @@
{0x000f,0x32,0x03,0x06,0x32, 720, 576,0x3637}, /* 12 */
{0x0187,0x15,0x05,0x00,0x37,1024, 768,0x358d}, /* 13 */
{0xc877,0x16,0x09,0x06,0x37,1024, 768,0x3592}, /* 14 */
- {0xc067,0x97,0x0b,0x49,0x37,1024, 768,0x3597}, /* 15 */
+ {0xc067,0x17,0x0b,0x49,0x37,1024, 768,0x3597}, /* 15 - CRT1CRTC was 0x97 */
{0x0267,0x18,0x0d,0x00,0x37,1024, 768,0x359c}, /* 16 */
- {0x0047,0x59,0x11,0x8c,0x37,1024, 768,0x35a1}, /* 17 */
+ {0x0047,0x19,0x11,0x8c,0x37,1024, 768,0x35a1}, /* 17 - CRT1CRTC was 0x59 */
{0x0047,0x1a,0x52,0x00,0x37,1024, 768,0x35a6}, /* 18 */
- {0x0047,0x5b,0x16,0x00,0x37,1024, 768,0x35ab}, /* 19 */
- {0x0387,0x5c,0x4d,0x00,0x3a,1280,1024,0x35be}, /* 1a */
+ {0x0007,0x1b,0x16,0x00,0x37,1024, 768,0x35ab}, /* 19 - CRT1CRTC was 0x5b */
+ {0x0387,0x1c,0x4d,0x00,0x3a,1280,1024,0x35be}, /* 1a - CRT1CRTC was 0x5c */
{0x0077,0x1d,0x14,0x07,0x3a,1280,1024,0x35c3}, /* 1b */
{0x0047,0x1e,0x17,0x00,0x3a,1280,1024,0x35c8}, /* 1c */
{0x0007,0x1f,0x98,0x00,0x3a,1280,1024,0x35cd}, /* 1d */
- {0x0007,0x60,0x59,0x00,0x3c,1600,1200,0x35d4}, /* 1e */
+ {0x0007,0x20,0x59,0x00,0x3c,1600,1200,0x35d4}, /* 1e - CRT1CRTC was 0x60 */
{0x0007,0x21,0x5a,0x00,0x3c,1600,1200,0x35d9}, /* 1f */
{0x0007,0x22,0x1b,0x00,0x3c,1600,1200,0x35de}, /* 20 */
- {0x0007,0x63,0x1d,0x00,0x3c,1600,1200,0x35e3}, /* 21 */
+ {0x0007,0x23,0x1d,0x00,0x3c,1600,1200,0x35e3}, /* 21 - CRT1CRTC was 0x63 */
{0x0007,0x24,0x1e,0x00,0x3c,1600,1200,0x35e8}, /* 22 */
{0x407f,0x00,0x00,0x00,0x40, 320, 200,0x3516}, /* 23 */
{0xc07f,0x01,0x00,0x04,0x50, 320, 240,0x351d}, /* 24 */
{0x0077,0x02,0x04,0x05,0x51, 400, 300,0x3524}, /* 25 */
{0xc877,0x03,0x09,0x06,0x52, 512, 384,0x352b}, /* 26 */ /* was c077 */
{0x8207,0x25,0x1f,0x00,0x68,1920,1440,0x35ef}, /* 27 */
- {0x0007,0x26,0x20,0x00,0x6c, 720, 480,0x35f6}, /* 28 */
- {0x0027,0x27,0x14,0x08,0x6e,1280, 960,0x35b2}, /* 29 */
- {0x0027,0x27,0x14,0x08,0x6e,1280, 960,0x35b7}, /* 2a */
+ {0x0007,0x26,0x20,0x00,0x6c,2048,1536,0x35f6}, /* 28 */
+ {0x0067,0x27,0x14,0x08,0x6e,1280, 960,0x35b7}, /* 29 - TW: 1280x960-60 */
+ {0x0027,0x45,0x3c,0x08,0x6e,1280, 960,0x35b7}, /* 2a - TW: 1280x960-85 */
{0xc077,0x33,0x09,0x06,0x20,1024, 600,0x0000}, /* 2b */
- {0xc077,0x34,0x09,0x06,0x23,1152, 768,0x0000}, /* 2c */
+ {0xc077,0x34,0x0b,0x06,0x23,1152, 768,0x0000}, /* 2c */ /* VCLK 0x09 */
+ {0x0057,0x35,0x27,0x08,0x70, 800, 480,0x3b52}, /* 2d - TW: 16:9 modes */
+ {0x0047,0x36,0x37,0x08,0x70, 800, 480,0x3b57}, /* 2e */
+ {0x0047,0x37,0x08,0x08,0x70, 800, 480,0x3b5c}, /* 2f */
+ {0x0057,0x38,0x09,0x09,0x71,1024, 576,0x3b63}, /* 30 */
+ {0x0047,0x39,0x38,0x09,0x71,1024, 576,0x3b68}, /* 31 */
+ {0x0047,0x3a,0x11,0x09,0x71,1024, 576,0x3b6d}, /* 32 */
+ {0x0057,0x3b,0x39,0x0a,0x75,1280, 720,0x3b74}, /* 33 */
+ {0x0047,0x3c,0x3a,0x0a,0x75,1280, 720,0x3b79}, /* 34 */
+ {0x0007,0x3d,0x3b,0x0a,0x75,1280, 720,0x3b7e}, /* 35 - TW: END of 16:9 modes */
+ {0x0047,0x3e,0x34,0x06,0x29,1152, 864,0x0000}, /* 36 TW: 1152x864-75Hz - Non-BIOS, new */
+ {0x0047,0x44,0x3a,0x06,0x29,1152, 864,0x0000}, /* 37 TW: 1152x864-85Hz - Non-BIOS, new */
+ {0x00c7,0x3f,0x28,0x00,0x39, 848, 480,0x0000}, /* 38 TW: 848x480-38Hzi - Non-BIOS, new */
+ {0xc047,0x40,0x3d,0x00,0x39, 848, 480,0x0000}, /* 39 TW: 848x480-60Hz - Non-BIOS, new */
+ {0x00c7,0x41,0x28,0x00,0x3f, 856, 480,0x0000}, /* 3a TW: 856x480-38Hzi - Non-BIOS, new */
+ {0xc047,0x42,0x28,0x00,0x3f, 856, 480,0x0000}, /* 3b TW: 856x480-60Hz - Non-BIOS, new */
+ {0x0047,0x43,0x3e,0x00,0x48,1360, 768,0x0000}, /* 3c TW: 1360x768-60Hz - Non-BIOS, new */
{0xffff,0,0,0,0,0,0,0}
};
@@ -557,9 +599,9 @@
UCHAR _VB_LCDVIndex;
}SiS_VBModeIDTableStruct;
-static const SiS_VBModeIDTableStruct SiS300_VBModeIDTable[]=
+static const SiS_VBModeIDTableStruct SiS300_VBModeIDTable[] =
{
- {0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, /* TW: Identical to 630/301B 2.04.50 BIOS */
+ {0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
{0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x01},
{0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x02},
{0x03,0x00,0x00,0x00,0x02,0x00,0x02,0x00},
@@ -619,46 +661,87 @@
UCHAR CR[17];
} SiS300_CRT1TableStruct;
-static const SiS300_CRT1TableStruct SiS300_CRT1Table[]=
+static const SiS300_CRT1TableStruct SiS300_CRT1Table[] =
{
- {{0x2d,0x27,0x28,0x90,0x2c,0x80,0xbf,0x1f, /* 0x00 */
- 0x9c,0x8e,0x8f,0x96,0xb9,0x30,0x00,0x00,
+#if 1
+ {{0x2d,0x27,0x28,0x90,0x2c,0x80,0xbf,0x1f, /* 0x00 - 320x200 */
+ 0x9c,0x8e,0x8f,0x96,0xb9,0x30,0x00,0x00, /* HRE [4],[15] is invalid - but correcting it does not work */
+ 0x00}},
+#endif
+#if 0
+ {{0x2d,0x27,0x27,0x91,0x2c,0x92,0xbf,0x1f, /* 0x00 - corrected 320x200-72 - does not work */
+ 0x9c,0x8e,0x8f,0x96,0xb9,0x30,0x00,0x04,
0x00}},
- {{0x2d,0x27,0x28,0x90,0x2c,0x80,0x0b,0x3e,
- 0xe9,0x8b,0xdf,0xe7,0x04,0x00,0x00,0x00,
+#endif
+#if 1
+ {{0x2d,0x27,0x28,0x90,0x2c,0x80,0x0b,0x3e, /* 0x01 */
+ 0xe9,0x8b,0xdf,0xe7,0x04,0x00,0x00,0x00, /* HRE [4],[15] is invalid - but correcting it does not work */
0x00}},
- {{0x3d,0x31,0x31,0x81,0x37,0x1f,0x72,0xf0,
+#endif
+#if 0
+ {{0x2d,0x27,0x27,0x91,0x2c,0x92,0x0b,0x3e, /* 0x01 - corrected 320x240-60 - does not work */
+ 0xe9,0x8b,0xdf,0xe7,0x04,0x00,0x00,0x04,
+ 0x00}},
+#endif
+#if 1
+ {{0x3d,0x31,0x31,0x81,0x37,0x1f,0x72,0xf0, /* 0x02 */
+ 0x58,0x8c,0x57,0x57,0x73,0x20,0x00,0x05,
+ 0x01}},
+#endif
+#if 0
+ {{0x3d,0x31,0x31,0x81,0x37,0x1f,0x72,0xf0, /* 0x02 - corrected 400x300-60 */
0x58,0x8c,0x57,0x57,0x73,0x20,0x00,0x05,
0x01}},
+#endif
{{0x4f,0x3f,0x3f,0x93,0x45,0x0d,0x24,0xf5,
0x02,0x88,0xff,0xff,0x25,0x10,0x00,0x01,
0x01}},
{{0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
0x9c,0x8e,0x8f,0x96,0xb9,0x30,0x00,0x05,
0x00}},
- {{0x5f,0x4f,0x50,0x82,0x55,0x81,0x0b,0x3e,
+#if 0
+ {{0x5f,0x4f,0x50,0x82,0x55,0x81,0x0b,0x3e, /* 0x05 */
0xe9,0x8b,0xdf,0xe7,0x04,0x00,0x00,0x05,
0x00}},
- {{0x63,0x4f,0x50,0x86,0x56,0x9b,0x06,0x3e,
+#endif
+ {{0x5f,0x4f,0x4f,0x83,0x55,0x81,0x0b,0x3e, /* 0x05 - corrected 640x480-60 */
+ 0xe9,0x8b,0xdf,0xe8,0x0c,0x00,0x00,0x05,
+ 0x00}},
+ #if 0
+ {{0x63,0x4f,0x50,0x86,0x56,0x9b,0x06,0x3e, /* 0x06 */
0xe8,0x8b,0xdf,0xe7,0xff,0x10,0x00,0x01,
0x00}},
+#endif
+ {{0x63,0x4f,0x4f,0x87,0x56,0x9b,0x06,0x3e, /* 0x06 - corrected 640x480-72 */
+ 0xe8,0x8a,0xdf,0xe7,0x07,0x00,0x00,0x01,
+ 0x00}},
{{0x64,0x4f,0x4f,0x88,0x55,0x9d,0xf2,0x1f,
0xe0,0x83,0xdf,0xdf,0xf3,0x10,0x00,0x01,
0x00}},
{{0x63,0x4f,0x4f,0x87,0x5a,0x81,0xfb,0x1f,
0xe0,0x83,0xdf,0xdf,0xfc,0x10,0x00,0x05,
0x00}},
- {{0x66,0x4f,0x4f,0x86,0x56,0x9e,0x03,0x3e,
+#if 0
+ {{0x66,0x4f,0x4f,0x86,0x56,0x9e,0x03,0x3e, /* 0x09 */
0xe4,0x87,0xdf,0xdf,0x04,0x00,0x00,0x01,
0x00}},
+#endif
+ {{0x67,0x4f,0x4f,0x8b,0x57,0x83,0x10,0x3e, /* 0x09 - corrected 640x480-100 */
+ 0xe7,0x8d,0xdf,0xe6,0x11,0x00,0x00,0x05,
+ 0x00}},
+#if 0
{{0x6c,0x4f,0x4f,0x83,0x59,0x9e,0x00,0x3e, /* 0x0a */
0xe5,0x8d,0xdf,0xdf,0x01,0x00,0x00,0x01,
0x00}},
+#endif
+ {{0x67,0x4f,0x4f,0x8b,0x57,0x83,0x10,0x3e, /* 0x0a - corrected 640x480-120 */
+ 0xe7,0x8d,0xdf,0xe6,0x11,0x00,0x00,0x05,
+ 0x00}},
{{0x63,0x4f,0x4f,0x87,0x56,0x9d,0xfb,0x1f,
0xe0,0x83,0xdf,0xdf,0xfc,0x10,0x00,0x01,
0x00}},
{{0x65,0x4f,0x4f,0x89,0x57,0x9f,0xfb,0x1f,
- 0xe6,0x8a,0xe5,0xe5,0xfc,0x00,0x00,0x01,
+ 0xe6,0x8a,0xdf,0xdf,0xfc,0x10,0x00,0x01, /* TW: Corrected VDE, VBE */
0x00}},
{{0x7b,0x63,0x63,0x9f,0x6a,0x93,0x6f,0xf0,
0x58,0x8a,0x57,0x57,0x70,0x20,0x00,0x05,
@@ -699,7 +782,7 @@
{{0xa7,0x7f,0x7f,0x8b,0x89,0x95,0x26,0xf5,
0x00,0x83,0xff,0xff,0x27,0x10,0x00,0x02,
0x01}},
- {{0x9f,0x7f,0x7f,0x83,0x83,0x93,0x1e,0xf5,
+ {{0x9f,0x7f,0x7f,0x83,0x83,0x93,0x1e,0xf5, /* 0x1a */
0x00,0x84,0xff,0xff,0x1f,0x10,0x00,0x02,
0x01}},
{{0xa2,0x7f,0x7f,0x86,0x84,0x94,0x37,0xf5,
@@ -738,9 +821,14 @@
{{0x55,0xff,0xff,0x99,0x0d,0x0c,0x3e,0xba,
0x00,0x84,0xff,0xff,0x3f,0x0f,0x41,0x05,
0x00}},
- {{0xdc,0x9f,0x9f,0x00,0xab,0x19,0xe6,0xef,
+#if 0
+ {{0xdc,0x9f,0x9f,0x00,0xab,0x19,0xe6,0xef, /* 0x27: 1280x960-70 - invalid! */
0xc0,0xc3,0xbf,0xbf,0xe7,0x10,0x00,0x07,
0x01}},
+#endif
+ {{0xdc,0x9f,0x9f,0x80,0xaf,0x9d,0xe6,0xff, /* 0x27: 1280x960-60 - correct */
+ 0xc0,0x83,0xbf,0xbf,0xe7,0x10,0x00,0x07,
+ 0x01}},
{{0x7f,0x63,0x63,0x83,0x6c,0x1c,0x72,0xba, /* 0x28 */
0x27,0x8b,0xdf,0xdf,0x73,0x00,0x00,0x06,
0x01}},
@@ -777,9 +865,70 @@
{{0xa3,0x7f,0x7f,0x87,0x86,0x97,0x1e,0xf1, /* 0x33 - 1024x600 */
0xae,0x85,0x57,0x57,0x1f,0x30,0x00,0x02,
0x01}},
+#if 0
{{0xa3,0x7f,0x7f,0x87,0x86,0x97,0x24,0xf5, /* 0x34 - 1152x768 */
0x02,0x88,0xff,0xff,0x25,0x10,0x00,0x02,
- 0x01}}
+ 0x01}},
+#endif
+ {{0xa3,0x8f,0x8f,0x97,0x96,0x97,0x24,0xf5, /* 0x34 - 1152x768 - TW: corrected */
+ 0x02,0x88,0xff,0xff,0x25,0x10,0x00,0x02,
+ 0x01}},
+ {{0x7f,0x63,0x63,0x83,0x6c,0x1c,0x72,0xba, /* 0x35 - NEW 16:9 modes, not in BIOS ------ */
+ 0x27,0x8b,0xdf,0xdf,0x73,0x00,0x00,0x06,
+ 0x01}}, /* 0x35 */
+ {{0x7f,0x63,0x63,0x83,0x69,0x13,0x6f,0xba,
+ 0x26,0x89,0xdf,0xdf,0x6f,0x00,0x00,0x06,
+ 0x01}}, /* 0x36 */
+ {{0x7f,0x63,0x63,0x82,0x6b,0x13,0x75,0xba,
+ 0x29,0x8c,0xdf,0xdf,0x75,0x00,0x00,0x06,
+ 0x01}}, /* 0x37 */
+ {{0xa3,0x7f,0x7f,0x87,0x86,0x97,0x24,0xf1,
+ 0xaf,0x85,0x3f,0x3f,0x25,0x30,0x00,0x02,
+ 0x01}}, /* 0x38 */
+ {{0x9f,0x7f,0x7f,0x83,0x85,0x91,0x1e,0xf1,
+ 0xad,0x81,0x3f,0x3f,0x1f,0x30,0x00,0x02,
+ 0x01}}, /* 0x39 */
+ {{0xa7,0x7f,0x7f,0x88,0x89,0x95,0x26,0xf1, /* TW: 95 was 15 - illegal HBE! */
+ 0xb1,0x85,0x3f,0x3f,0x27,0x30,0x00,0x02,
+ 0x01}}, /* 0x3a */
+ {{0xce,0x9f,0x9f,0x92,0xa9,0x17,0x28,0xc4,
+ 0x7a,0x8e,0xcf,0xcf,0x29,0x21,0x00,0x07,
+ 0x01}}, /* 0x3b */
+ {{0xce,0x9f,0x9f,0x92,0xa5,0x17,0x28,0xd4,
+ 0x7a,0x8e,0xcf,0xcf,0x29,0x21,0x00,0x07,
+ 0x01}}, /* 0x3c */
+ {{0xd3,0x9f,0x9f,0x97,0xab,0x1f,0x2e,0xd4,
+ 0x7d,0x81,0xcf,0xcf,0x2f,0x21,0x00,0x07,
+ 0x01}}, /* 0x3d */ /* TW: End of 16:9 modes --------------- */
+ {{0xc3,0x8f,0x8f,0x87,0x9b,0x0b,0x82,0xef, /* TW: New, 1152x864-75 (not in any BIOS) */
+ 0x60,0x83,0x5f,0x5f,0x83,0x10,0x00,0x07,
+ 0x01}}, /* 0x3e */
+ {{0x86,0x69,0x69,0x8A,0x74,0x06,0x8C,0x15, /* TW: New, 848x480-38i, not in BIOS */
+ 0x4F,0x83,0xEF,0xEF,0x8D,0x30,0x00,0x02,
+ 0x00}}, /* 0x3f */
+#if 0
+ {{0x81,0x69,0x69,0x85,0x70,0x00,0x0F,0x3E, /* TW: New, 848x480-60, not in BIOS - incorrect for Philips panel */
+ 0xEB,0x8E,0xDF,0xDF,0x10,0x00,0x00,0x02,
+ 0x00}}, /* 0x40 */
+#endif
+ {{0x83,0x69,0x69,0x87,0x6f,0x1d,0x03,0x3E, /* TW: New, 848x480-60, not in BIOS */
+ 0xE5,0x8d,0xDF,0xe4,0x04,0x00,0x00,0x06,
+ 0x00}}, /* 0x40 */
+ {{0x86,0x6A,0x6A,0x8A,0x74,0x06,0x8C,0x15, /* TW: New, 856x480-38i, not in BIOS */
+ 0x4F,0x83,0xEF,0xEF,0x8D,0x30,0x00,0x02,
+ 0x00}}, /* 0x41 */
+ {{0x81,0x6A,0x6A,0x85,0x70,0x00,0x0F,0x3E, /* TW: New, 856x480-60, not in BIOS */
+ 0xEB,0x8E,0xDF,0xDF,0x10,0x00,0x00,0x02,
+ 0x00}}, /* 0x42 */
+ {{0xdd,0xa9,0xa9,0x81,0xb4,0x97,0x26,0xfd, /* TW: New, 1360x768-60, not in BIOS */
+ 0x01,0x8d,0xff,0x00,0x27,0x10,0x00,0x03,
+ 0x01}}, /* 0x43 */
+ {{0xd9,0x8f,0x8f,0x9d,0xba,0x0a,0x8a,0xff, /* TW: New, 1152x864-84 (not in any BIOS) */
+ 0x60,0x8b,0x5f,0x5f,0x8b,0x10,0x00,0x03,
+ 0x01}}, /* 0x44 */
+ {{0xd3,0x9f,0x9f,0x97,0xab,0x1f,0xf1,0xff, /* TW: New, 1280x960-85 (not in any BIOS) */
+ 0xc0,0x83,0xbf,0xbf,0xf2,0x10,0x00,0x07,
+ 0x01}} /* 0x45 */
};
typedef struct _SiS300_MCLKDataStruct
@@ -818,7 +967,7 @@
USHORT CLOCK;
} SiS300_ECLKDataStruct;
-static const SiS300_ECLKDataStruct SiS300_ECLKData[]=
+static const SiS300_ECLKDataStruct SiS300_ECLKData[] =
{
{ 0x54,0x43,0x80,100},
{ 0x53,0x43,0x80,100},
@@ -836,68 +985,79 @@
USHORT CLOCK;
} SiS300_VCLKDataStruct;
-static const SiS300_VCLKDataStruct SiS300_VCLKData[]=
+static const SiS300_VCLKDataStruct SiS300_VCLKData[] =
{
- { 0x1b,0xe1, 25},
+ { 0x1b,0xe1, 25}, /* 0x00 */
{ 0x4e,0xe4, 28},
- { 0x57,0xe4, 32},
+ { 0x57,0xe4, 32}, /* 0x02 */
{ 0xc3,0xc8, 36},
- { 0x42,0xc3, 40},
+ { 0x42,0xc3, 40}, /* 0x04 */
{ 0x5d,0xc4, 45},
- { 0x52,0x65, 50},
+ { 0x52,0x65, 50}, /* 0x06 */
{ 0x53,0x65, 50},
- { 0x6d,0x66, 56},
+ { 0x6d,0x66, 56}, /* 0x08 */
{ 0x5a,0x64, 65},
- { 0x46,0x44, 68},
+ { 0x46,0x44, 68}, /* 0x0a */
{ 0x3e,0x43, 75},
- { 0x6d,0x46, 76}, /* 0x0c: 800x600 | LVDS_2(CH), MITAC(CH); - LVDS2(CH), A901(301B): 0xb1,0x46, 76 */
+ { 0x6d,0x46, 76}, /* 0x0c: 800x600 | LVDS_2(CH), MITAC(CH); - 730, A901(301B): 0xb1,0x46, 76 */
{ 0x41,0x43, 79},
- { 0x31,0x42, 79},
+ { 0x31,0x42, 79}, /* 0x0e */
{ 0x46,0x25, 85},
{ 0x78,0x29, 87}, /* 0x10 */
{ 0x62,0x44, 95},
- { 0x2b,0x22,105},
+ { 0x2b,0x22,105}, /* 0x12 */
{ 0x49,0x24,106},
- { 0xc3,0x28,108},
+ { 0xc3,0x28,108}, /* 0x14 */
{ 0x3c,0x23,109},
- { 0xf7,0x2c,132},
+ { 0xf7,0x2c,132}, /* 0x16 */
{ 0xd4,0x28,136},
- { 0x41,0x05,158},
+ { 0x41,0x05,158}, /* 0x18 */
{ 0x43,0x05,162},
- { 0xe1,0x0f,175},
- { 0xfc,0x12,189},
- { 0xde,0x26,194},
+ { 0xe1,0x0f,175}, /* 0x1a */
+ { 0xfc,0x12,189}, /* 0x1b */
+ { 0xde,0x26,194}, /* 0x1c */
{ 0x54,0x05,203},
- { 0x3f,0x03,230},
+ { 0x3f,0x03,230}, /* 0x1e */
{ 0x30,0x02,234},
- { 0x24,0x01,266}, /* 0x20 */
- { 0x52,0x2a, 54}, /* 301 TV */
- { 0x52,0x6a, 27}, /* 301 TV */
- { 0x62,0x24, 70}, /* 301 TV */
- { 0x62,0x64, 70}, /* 301 TV */
- { 0xa8,0x4c, 30}, /* 301 TV */
- { 0x20,0x26, 33}, /* 301 TV */
+ { 0x24,0x01,266}, /* 0x20 */
+ { 0x52,0x2a, 54}, /* 301 TV */
+ { 0x52,0x6a, 27}, /* 301 TV */
+ { 0x62,0x24, 70}, /* 301 TV */
+ { 0x62,0x64, 70}, /* 301 TV */
+ { 0xa8,0x4c, 30}, /* 301 TV */
+ { 0x20,0x26, 33}, /* 301 TV */
{ 0x31,0xc2, 39},
- { 0xbf,0xc8, 35}, /* 0x28 */
- { 0x60,0x36, 30}, /* 0x29 CH/UNTSC TEXT | LVDS_2(CH) - LVDS2(CH), A901(301B), Mitac(CH): 0xe0, 0xb6, 30 */
+ { 0xbf,0xc8, 35}, /* 0x28 - 856x480 */
+ { 0x60,0x36, 30}, /* 0x29 CH/UNTSC TEXT | LVDS_2(CH) - 730, A901(301B), Mitac(CH): 0xe0, 0xb6, 30 */
{ 0x40,0x4a, 28},
{ 0x9f,0x46, 44},
{ 0x97,0x2c, 26},
{ 0x44,0xe4, 25},
{ 0x7e,0x32, 47},
- { 0x8a,0x24, 31}, /* 0x2f CH/PAL TEXT | LVDS_2(CH), Mitac(CH) - LVDS2(CH), A901(301B): 0x57, 0xe4, 31 */
+ { 0x8a,0x24, 31}, /* 0x2f CH/PAL TEXT | LVDS_2(CH), Mitac(CH) - 730, A901(301B): 0x57, 0xe4, 31 */
{ 0x97,0x2c, 26},
{ 0xce,0x3c, 39},
- { 0x52,0x4a, 36},
+ { 0x52,0x4a, 36}, /* 0x32 CH/PAL 800x600 5/6 */
{ 0x34,0x61, 95},
{ 0x78,0x27,108},
- { 0xce,0x25,189},
- { 0x45,0x6b, 21}, /* 0x36 */ /* TW: Added from Mitac */
- { 0xff,0x00, 0}
+ { 0xce,0x25,189}, /* 0x35 */
+ { 0x45,0x6b, 21}, /* 0x36 */ /* TW: Added from Mitac */
+ { 0x52,0xe2, 49}, /* 0x37 - added for 16:9 modes (not in any BIOS) */
+ { 0x2b,0x61, 78}, /* 0x38 - added for 16:9 modes (not in any BIOS) */
+ { 0x70,0x44,108}, /* 0x39 - added for 16:9 modes (not in any BIOS) */
+ { 0x54,0x42,135}, /* 0x3a - added for 16:9 modes (not in any BIOS) */
+ { 0x41,0x22,157}, /* 0x3b - added for 16:9 modes (not in any BIOS) */
+ { 0x52,0x07,149}, /* 0x3c - added for 1280x960-85 (not in any BIOS)*/
+ { 0x62,0xc6, 34}, /* 0x3d - added for 848x480-60 (not in any BIOS) */
+ { 0x30,0x23, 88}, /* 0x3e - added for 1360x768-60 (not in any BIOS)*/
+ { 0x3f,0x64, 46}, /* 0x3f - added for 640x480-100 (not in any BIOS)*/
+ { 0x72,0x2a, 76}, /* 0x40 - test for SiS730 */
+ { 0x15,0x21, 79}, /* 0x41 - test for SiS730 */
+ { 0xff,0x00, 0}
};
#if 0 /* TW: This table is in all BIOSes, but not used */
-static const SiS300_VCLKDataStruct SiS300_VBVCLKData[]=
+static const SiS300_VCLKDataStruct SiS300_VBVCLKData[] =
{
{ 0x1b,0xe1, 25},
{ 0x4e,0xe4, 28},
@@ -953,7 +1113,8 @@
static const UCHAR SiS300_ScreenOffset[] =
{
0x14,0x19,0x20,0x28,0x32,0x40,0x50,
- 0x64,0x78,0x80,0x2d,0x35,0x48,0xff
+ 0x64,0x78,0x80,0x2d,0x35,0x48,0x35, /* 0x35 for 848 and 856 */
+ 0x55,0xff /* 0x55 for 1360 */
};
typedef struct _SiS300_StResInfoStruct
@@ -997,12 +1158,20 @@
{ 720, 576, 8,16}, /* 0x0d */
{ 1280, 960, 8,16}, /* 0x0e */
{ 1024, 600, 8,16}, /* 0x0f */
- { 1152, 768, 8,16} /* 0x10 */
+ { 1152, 768, 8,16}, /* 0x10 */
+ { 2048,1536, 8,16}, /* 0x11 - TW: Not in BIOS! */
+ { 800, 480, 8,16}, /* 0x12 - TW: New, not in any BIOS */
+ { 1024, 576, 8,16}, /* 0x13 - TW: New, not in any BIOS */
+ { 1280, 720, 8,16}, /* 0x14 - TW: New, not in any BIOS */
+ { 1152, 864, 8,16}, /* 0x15 - TW: New, not in any BIOS */
+ { 848, 480, 8,16}, /* 0x16 - TW: New, not in any BIOS */
+ { 856, 480, 8,16}, /* 0x17 - TW: New, not in any BIOS */
+ { 1360, 768, 8,16} /* 0x18 - TW: New, not in any BIOS */
};
static const UCHAR SiS300_OutputSelect = 0x40;
-static const UCHAR SiS300_SoftSetting = 30;
+static const UCHAR SiS300_SoftSetting = 0x30;
#ifndef LINUX_XF86
static UCHAR SiS300_SR07 = 0x10;
@@ -1111,7 +1280,7 @@
USHORT LCDVT;
} SiS300_LCDDataStruct;
-static const SiS300_LCDDataStruct SiS300_StLCD1024x768Data[]=
+static const SiS300_LCDDataStruct SiS300_StLCD1024x768Data[] =
{
{ 66, 31, 992, 510,1320, 816},
{ 66, 31, 992, 510,1320, 816},
@@ -1122,7 +1291,7 @@
{ 1, 1,1344, 806,1344, 806}
};
-static const SiS300_LCDDataStruct SiS300_ExtLCD1024x768Data[]=
+static const SiS300_LCDDataStruct SiS300_ExtLCD1024x768Data[] =
{
{ 12, 5, 896, 512,1344, 806},
{ 12, 5, 896, 510,1344, 806},
@@ -1139,7 +1308,7 @@
{ 1, 1,1344, 806,1344, 806}
};
-static const SiS300_LCDDataStruct SiS300_St2LCD1024x768Data[]=
+static const SiS300_LCDDataStruct SiS300_St2LCD1024x768Data[] =
{
{ 62, 25, 800, 546,1344, 806},
{ 32, 15, 930, 546,1344, 806},
@@ -1150,7 +1319,7 @@
{ 1, 1,1344, 806,1344, 806}
};
-static const SiS300_LCDDataStruct SiS300_StLCD1280x1024Data[]=
+static const SiS300_LCDDataStruct SiS300_StLCD1280x1024Data[] =
{
{ 4, 1, 880, 510,1650,1088},
{ 4, 1, 880, 510,1650,1088},
@@ -1162,7 +1331,7 @@
{ 1, 1,1688,1066,1688,1066}
};
-static const SiS300_LCDDataStruct SiS300_ExtLCD1280x1024Data[]=
+static const SiS300_LCDDataStruct SiS300_ExtLCD1280x1024Data[] =
{
{ 211, 60,1024, 501,1688,1066},
{ 211, 60,1024, 508,1688,1066},
@@ -1174,7 +1343,7 @@
{ 1, 1,1688,1066,1688,1066}
};
-static const SiS300_LCDDataStruct SiS300_St2LCD1280x1024Data[]=
+static const SiS300_LCDDataStruct SiS300_St2LCD1280x1024Data[] =
{
{ 22, 5, 800, 510,1650,1088},
{ 22, 5, 800, 510,1650,1088},
@@ -1186,7 +1355,7 @@
{ 1, 1,1688,1066,1688,1066}
};
-static const SiS300_LCDDataStruct SiS300_NoScaleData1024x768[]=
+static const SiS300_LCDDataStruct SiS300_NoScaleData1024x768[] =
{
{ 1, 1, 800, 449, 800, 449},
{ 1, 1, 800, 449, 800, 449},
@@ -1198,7 +1367,7 @@
{ 1, 1,1688,1066,1688,1066}
};
-static const SiS300_LCDDataStruct SiS300_NoScaleData1280x1024[]= /* TW: Fake */
+static const SiS300_LCDDataStruct SiS300_NoScaleData1280x1024[] = /* TW: Fake */
{
{ 1, 1, 800, 449, 800, 449},
{ 1, 1, 800, 449, 800, 449},
@@ -1210,7 +1379,20 @@
{ 1, 1,1688,1066,1688,1066}
};
-static const SiS300_LCDDataStruct SiS300_LCD1280x960Data[]=
+static const SiS300_LCDDataStruct SiS300_NoScaleData[] =
+{
+ { 1, 1, 800, 449, 800, 449 },
+ { 1, 1, 800, 449, 800, 449 },
+ { 1, 1, 900, 449, 900, 449 },
+ { 1, 1, 900, 449, 900, 449 },
+ { 1, 1, 800, 525, 800, 525 },
+ { 1, 1,1056, 628,1056, 628 },
+ { 1, 1,1344, 806,1344, 806 },
+ { 1, 1,1688,1066,1688,1066 },
+ { 1, 1,1800,1000,1800,1000 } /* 1280x960 */
+};
+
+static const SiS300_LCDDataStruct SiS300_LCD1280x960Data[] =
{
{ 9, 2, 800, 500,1800,1000},
{ 9, 2, 800, 500,1800,1000},
@@ -1325,7 +1507,7 @@
UCHAR RY4COE;
} SiS300_TVDataStruct;
-static const SiS300_TVDataStruct SiS300_StPALData[]=
+static const SiS300_TVDataStruct SiS300_StPALData[] =
{
{ 1, 1, 864, 525,1270, 400, 100, 0, 760,0xf4,0xff,0x1c,0x22},
{ 1, 1, 864, 525,1270, 350, 100, 0, 760,0xf4,0xff,0x1c,0x22},
@@ -1335,7 +1517,7 @@
{ 1, 1, 864, 525,1270, 600, 50, 0, 0,0xf4,0xff,0x1c,0x22}
};
-static const SiS300_TVDataStruct SiS300_ExtPALData[]=
+static const SiS300_TVDataStruct SiS300_ExtPALData[] =
{
{ 27, 10, 848, 448,1270, 530, 50, 0, 50,0xf4,0xff,0x1c,0x22},
{ 108, 35, 848, 398,1270, 530, 50, 0, 50,0xf4,0xff,0x1c,0x22},
@@ -1348,7 +1530,7 @@
};
-static const SiS300_TVDataStruct SiS300_StNTSCData[]=
+static const SiS300_TVDataStruct SiS300_StNTSCData[] =
{
{ 1, 1, 858, 525,1270, 400, 50, 0, 760,0xf1,0x04,0x1f,0x18},
{ 1, 1, 858, 525,1270, 350, 50, 0, 640,0xf1,0x04,0x1f,0x18},
@@ -1357,7 +1539,7 @@
{ 1, 1, 858, 525,1270, 480, 0, 0, 760,0xf1,0x04,0x1f,0x18}
};
-static const SiS300_TVDataStruct SiS300_ExtNTSCData[]=
+static const SiS300_TVDataStruct SiS300_ExtNTSCData[] =
{
{ 143, 65, 858, 443,1270, 440, 171, 0, 171,0xf1,0x04,0x1f,0x18},
{ 88, 35, 858, 393,1270, 440, 171, 0, 171,0xf1,0x04,0x1f,0x18},
@@ -1369,49 +1551,68 @@
{ 65, 64,1056, 791,1270, 480, 638, 0, 0,0xf1,0x04,0x1f,0x18}
};
-static const SiS_TVDataStruct SiS300_St1HiTVData[]=
+#if 0
+static const SiS300_TVDataStruct SiS300_St1HiTVData[]=
{
- {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}
+
};
+#endif
-static const SiS_TVDataStruct SiS300_St2HiTVData[]=
+static const SiS300_TVDataStruct SiS300_St2HiTVData[]=
{
- {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}
+ { 3, 1, 0x348,0x1e3,0x670,0x3c0,0x032, 0, 0, 0x00,0x00,0x00,0x00},
+ { 1, 1, 0x37c,0x233,0x2b2,0x2bc, 0, 0, 0, 0x00,0x00,0x00,0x00},
+ { 3, 1, 0x348,0x1e3,0x670,0x3c0,0x032, 0, 0, 0x00,0x00,0x00,0x00},
+ { 1, 1, 0x3e8,0x233,0x311,0x2bc, 0, 0, 0, 0x00,0x00,0x00,0x00},
+ { 5, 2, 0x348,0x233,0x670,0x3c0,0x08d,128, 0, 0x00,0x00,0x00,0x00},
+ { 8, 5, 0x41a,0x2ab,0x670,0x3c0,0x17c,128, 0, 0x00,0x00,0x00,0x00}
+};
+
+static const SiS300_TVDataStruct SiS300_ExtHiTVData[]=
+{
+ { 6, 1, 0x348,0x233,0x660,0x3c0, 0, 0, 0, 0x00,0x00,0x00,0x00},
+ { 3, 1, 0x3c0,0x233,0x660,0x3c0, 0, 0, 0, 0x00,0x00,0x00,0x00},
+ { 3, 1, 0x348,0x1e3,0x660,0x3c0, 0, 0, 0, 0x00,0x00,0x00,0x00},
+ { 3, 1, 0x3c0,0x233,0x660,0x3c0, 0, 0, 0, 0x00,0x00,0x00,0x00},
+ { 5, 1, 0x348,0x233,0x670,0x3c0,0x166,128, 0, 0x00,0x00,0x00,0x00},
+ { 16, 5, 0x41a,0x2ab,0x670,0x3c0,0x143,128, 0, 0x00,0x00,0x00,0x00},
+ { 25, 12, 0x4ec,0x353,0x670,0x3c0,0x032, 0, 0, 0x00,0x00,0x00,0x00},
+ { 5, 4, 0x627,0x464,0x670,0x3c0,0x128, 0, 0, 0x00,0x00,0x00,0x00},
+ { 4, 1, 0x41a,0x233,0x670,0x3c0,0x143,128, 0, 0x00,0x00,0x00,0x00},
+ { 5, 2, 0x578,0x293,0x670,0x3c0,0x032, 0, 0, 0x00,0x00,0x00,0x00},
+ { 8, 5, 0x6d6,0x323,0x670,0x3c0,0x128, 0, 0, 0x00,0x00,0x00,0x00}
};
-static const SiS_TVDataStruct SiS300_ExtHiTVData[]=
+static const UCHAR SiS300_NTSCTiming[] =
{
- {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}
-};
-
-static const UCHAR SiS300_NTSCTiming[] = {
0x17,0x1d,0x03,0x09,0x05,0x06,0x0c,0x0c,
0x94,0x49,0x01,0x0a,0x06,0x0d,0x04,0x0a,
0x06,0x14,0x0d,0x04,0x0a,0x00,0x85,0x1b,
-/* 0x0c,0x50,0x00,0x97,0x00,0xda,0x4a,0x17, - old */
- 0x0c,0x50,0x00,0x99,0x00,0xec,0x4a,0x17, /* new (2.04.5a) */
-/* 0x7d,0x05,0x4b,0x00,0x00,0xe2,0x00,0x02, - old */
- 0x88,0x00,0x4b,0x00,0x00,0xe2,0x00,0x02, /* new */
+ 0x0c,0x50,0x00,0x97,0x00,0xda,0x4a,0x17, /* (in 2.06.50) */
+/* 0x0c,0x50,0x00,0x99,0x00,0xec,0x4a,0x17, (in 2.04.5a) */
+ 0x7d,0x05,0x4b,0x00,0x00,0xe2,0x00,0x02, /* (in 2.06.50) */
+/* 0x88,0x00,0x4b,0x00,0x00,0xe2,0x00,0x02, (in 2.04.5a) */
0x03,0x0a,0x65,0x9d,0x08,0x92,0x8f,0x40,
0x60,0x80,0x14,0x90,0x8c,0x60,0x14,0x50,
0x00,0x40,0x44,0x00,0xdb,0x02,0x3b,0x00
};
-static const UCHAR SiS300_PALTiming[] = {
+static const UCHAR SiS300_PALTiming[] =
+{
0x19,0x52,0x35,0x6e,0x04,0x38,0x3d,0x70,
0x94,0x49,0x01,0x12,0x06,0x3e,0x35,0x6d,
0x06,0x14,0x3e,0x35,0x6d,0x00,0x45,0x2b,
-/* 0x70,0x50,0x00,0x9b,0x00,0xd9,0x5d,0x17, - old */
- 0x70,0x50,0x00,0x97,0x00,0xd7,0x5d,0x17, /* new */
-/* 0x7d,0x05,0x45,0x00,0x00,0xe8,0x00,0x02, -old */
- 0x88,0x00,0x45,0x00,0x00,0xe8,0x00,0x02, /* new */
+ 0x70,0x50,0x00,0x9b,0x00,0xd9,0x5d,0x17, /* (in 2.06.50) */
+/* 0x70,0x50,0x00,0x97,0x00,0xd7,0x5d,0x17, (in 2.04.5a) */
+ 0x7d,0x05,0x45,0x00,0x00,0xe8,0x00,0x02, /* (in 2.06.50) */
+/* 0x88,0x00,0x45,0x00,0x00,0xe8,0x00,0x02, (in 2.04.5a) */
0x0d,0x00,0x68,0xb0,0x0b,0x92,0x8f,0x40,
0x60,0x80,0x14,0x90,0x8c,0x60,0x14,0x63,
0x00,0x40,0x3e,0x00,0xe1,0x02,0x28,0x00
};
-#ifdef oldHV
-static const UCHAR SiS300_HiTVExtTiming[] = { /* TW: New */
+static const UCHAR SiS300_HiTVExtTiming[] = /* TW: New */
+{
0x32,0x65,0x2c,0x5f,0x08,0x31,0x3a,0x64,
0x28,0x02,0x01,0x3d,0x06,0x3e,0x35,0x6d,
0x06,0x14,0x3e,0x35,0x6d,0x00,0xc5,0x3f,
@@ -1422,7 +1623,8 @@
0x63,0x4f,0x27,0x00,0xfc,0xff,0x6a,0x00
};
-static const UCHAR SiS300_HiTVSt1Timing[] = { /* TW: New */
+static const UCHAR SiS300_HiTVSt1Timing[] = /* TW: New */
+{
0x32,0x65,0x2c,0x5f,0x08,0x31,0x3a,0x65,
0x28,0x02,0x01,0x3d,0x06,0x3e,0x35,0x6d,
0x06,0x14,0x3e,0x35,0x6d,0x00,0xc5,0x3f,
@@ -1433,7 +1635,8 @@
0xaf,0x5d,0x0e,0x00,0xfc,0xff,0x2d,0x00
};
-static const UCHAR SiS300_HiTVSt2Timing[] = { /* TW: New */
+static const UCHAR SiS300_HiTVSt2Timing[] = /* TW: New */
+{
0x32,0x65,0x2c,0x5f,0x08,0x31,0x3a,0x64,
0x28,0x02,0x01,0x3d,0x06,0x3e,0x35,0x6d,
0x06,0x14,0x3e,0x35,0x6d,0x00,0xc5,0x3f,
@@ -1444,7 +1647,8 @@
0x63,0x4f,0x27,0x00,0xfc,0xff,0x6a,0x00
};
-static const UCHAR SiS300_HiTVTextTiming[] = { /* TW: New */
+static const UCHAR SiS300_HiTVTextTiming[] = /* TW: New */
+{
0x32,0x65,0x2c,0x5f,0x08,0x31,0x3a,0x65,
0x28,0x02,0x01,0x3d,0x06,0x3e,0x35,0x6d,
0x06,0x14,0x3e,0x35,0x6d,0x00,0xc5,0x3f,
@@ -1455,7 +1659,8 @@
0x72,0x5c,0x11,0x00,0xfc,0xff,0x32,0x00
};
-static const UCHAR SiS300_HiTVGroup3Data[] = { /* TW: New */
+static const UCHAR SiS300_HiTVGroup3Data[] = /* TW: New */
+{
0x00,0x1a,0x22,0x63,0x62,0x22,0x08,0x5f,
0x05,0x21,0xb2,0xb2,0x55,0x77,0x2a,0xa6,
0x25,0x2f,0x47,0xfa,0xc8,0xff,0x8e,0x20,
@@ -1466,7 +1671,8 @@
0x18,0x05,0x18,0x05,0x4c,0xa8,0x01
};
-static const UCHAR SiS300_HiTVGroup3Simu[] = { /* TW: New */
+static const UCHAR SiS300_HiTVGroup3Simu[] = /* TW: New */
+{
0x00,0x1a,0x22,0x63,0x62,0x22,0x08,0x95,
0xdb,0x20,0xb8,0xb8,0x55,0x47,0x2a,0xa6,
0x25,0x2f,0x47,0xfa,0xc8,0xff,0x8e,0x20,
@@ -1477,7 +1683,8 @@
0x18,0x05,0x18,0x05,0x4c,0xa8,0x01
};
-static const UCHAR SiS300_HiTVGroup3Text[] = { /* TW: New */
+static const UCHAR SiS300_HiTVGroup3Text[] = /* TW: New */
+{
0x00,0x1a,0x22,0x63,0x62,0x22,0x08,0xa7,
0xf5,0x20,0xce,0xce,0x55,0x47,0x2a,0xa6,
0x25,0x2f,0x47,0xfa,0xc8,0xff,0x8e,0x20,
@@ -1487,7 +1694,6 @@
0x01,0x05,0x03,0x7e,0x65,0x31,0x14,0x75,
0x18,0x05,0x18,0x05,0x4c,0xa8,0x01
};
-#endif
typedef struct _SiS300_LVDSDataStruct
{
@@ -1497,7 +1703,7 @@
USHORT LCDVT;
} SiS300_LVDSDataStruct;
-static const SiS300_LVDSDataStruct SiS300_LVDS320x480Data_1[]=
+static const SiS300_LVDSDataStruct SiS300_LVDS320x480Data_1[] =
{
{848, 433,400, 525},
{848, 389,400, 525},
@@ -1510,7 +1716,7 @@
{800, 525,1000, 635}
};
-static const SiS300_LVDSDataStruct SiS300_LVDS800x600Data_1[]=
+static const SiS300_LVDSDataStruct SiS300_LVDS800x600Data_1[] =
{
{848, 433,1060, 629},
{848, 389,1060, 629},
@@ -1523,7 +1729,7 @@
{800, 525,1000, 635}
};
-static const SiS300_LVDSDataStruct SiS300_LVDS800x600Data_2[]=
+static const SiS300_LVDSDataStruct SiS300_LVDS800x600Data_2[] =
{
{1056, 628,1056, 628},
{1056, 628,1056, 628},
@@ -1536,7 +1742,7 @@
{800, 525,1000, 635}
};
-static const SiS300_LVDSDataStruct SiS300_LVDS1024x768Data_1[]=
+static const SiS300_LVDSDataStruct SiS300_LVDS1024x768Data_1[] =
{
{840, 438,1344, 806},
{840, 409,1344, 806},
@@ -1549,7 +1755,7 @@
{800, 525,1280, 813}
};
-static const SiS300_LVDSDataStruct SiS300_LVDS1024x768Data_2[]=
+static const SiS300_LVDSDataStruct SiS300_LVDS1024x768Data_2[] =
{
{1344, 806,1344, 806},
{1344, 806,1344, 806},
@@ -1562,33 +1768,31 @@
{800, 525,1280, 813}
};
-static const SiS300_LVDSDataStruct SiS300_LVDS1280x1024Data_1[]=
-{
- {840, 438,1344, 806},
- {840, 409,1344, 806},
- {840, 438,1344, 806},
- {840, 409,1344, 806},
- {840, 518,1344, 806},
- {1050, 638,1344, 806},
- {1344, 806,1344, 806},
- {800, 449,1280, 801},
- {800, 525,1280, 813}
+static const SiS300_LVDSDataStruct SiS300_LVDS1280x1024Data_1[]=
+{
+ {1048, 442,1688,1066},
+ {1048, 392,1688,1066},
+ {1048, 442,1688,1066},
+ {1048, 392,1688,1066},
+ {1048, 522,1688,1066},
+ {1208, 642,1688,1066},
+ {1432, 810,1688,1066},
+ {1688,1066,1688,1066}
+};
+
+static const SiS300_LVDSDataStruct SiS300_LVDS1280x1024Data_2[]=
+{
+ {1688,1066,1688,1066},
+ {1688,1066,1688,1066},
+ {1688,1066,1688,1066},
+ {1688,1066,1688,1066},
+ {1688,1066,1688,1066},
+ {1688,1066,1688,1066},
+ {1688,1066,1688,1066},
+ {1688,1066,1688,1066}
};
-static const SiS300_LVDSDataStruct SiS300_LVDS1280x1024Data_2[]=
-{
- {1344, 806,1344, 806},
- {1344, 806,1344, 806},
- {1344, 806,1344, 806},
- {1344, 806,1344, 806},
- {1344, 806,1344, 806},
- {1344, 806,1344, 806},
- {1344, 806,1344, 806},
- {800, 449,1280, 801},
- {800, 525,1280, 813}
-};
-
-static const SiS300_LVDSDataStruct SiS300_LVDS1400x1050Data_1[]= /* TW: New */
+static const SiS300_LVDSDataStruct SiS300_LVDS1400x1050Data_1[] =
{
{928, 416, 1688, 1066},
{928, 366, 1688, 1066},
@@ -1601,7 +1805,7 @@
{1688, 1066, 1688, 1066}
};
-static const SiS300_LVDSDataStruct SiS300_LVDS1400x1050Data_2[]= /* TW: New */
+static const SiS300_LVDSDataStruct SiS300_LVDS1400x1050Data_2[] =
{
{1688,1066, 1688,1066},
{1688,1066, 1688,1066},
@@ -1614,8 +1818,61 @@
{1688,1066, 1688,1066},
};
-/* TW: New: */
-static const SiS300_LVDSDataStruct SiS300_LVDS1024x600Data_1[]=
+static const SiS300_LVDSDataStruct SiS300_LVDS1600x1200Data_1[]=
+{
+ {1088, 450, 2048,1250},
+ {1088, 400, 2048,1250},
+ {1088, 450, 2048,1250},
+ {1088, 400, 2048,1250},
+ {1088, 530, 2048,1250},
+ {1248, 650, 2048,1250},
+ {1472, 818, 2048,1250},
+ {1728,1066, 2048,1250},
+ {1848,1066, 2048,1250},
+ {2048,1250, 2048,1250}
+};
+
+static const SiS300_LVDSDataStruct SiS300_LVDS1600x1200Data_2[]=
+{
+ {2048,1250, 2048,1250},
+ {2048,1250, 2048,1250},
+ {2048,1250, 2048,1250},
+ {2048,1250, 2048,1250},
+ {2048,1250, 2048,1250},
+ {2048,1250, 2048,1250},
+ {2048,1250, 2048,1250},
+ {2048,1250, 2048,1250},
+ {2048,1250, 2048,1250},
+ {2048,1250, 2048,1250}
+};
+
+static const SiS300_LVDSDataStruct SiS300_LVDS1280x768Data_1[]=
+{
+ { 768, 438, 1408, 806},
+ { 768, 388, 1408, 806},
+ { 768, 438, 1408, 806},
+ { 768, 388, 1408, 806},
+ { 768, 518, 1408, 806},
+ { 928, 638, 1408, 806},
+ {1152, 806, 1408, 806},
+ {1408, 806, 1408, 806},
+ {1408, 806, 1408, 806}
+};
+
+static const SiS300_LVDSDataStruct SiS300_LVDS1280x768Data_2[]=
+{
+ {1408, 806, 1408, 806},
+ {1408, 806, 1408, 806},
+ {1408, 806, 1408, 806},
+ {1408, 806, 1408, 806},
+ {1408, 806, 1408, 806},
+ {1408, 806, 1408, 806},
+ {1408, 806, 1408, 806},
+ {1408, 806, 1408, 806},
+ {1408, 806, 1408, 806}
+};
+
+static const SiS300_LVDSDataStruct SiS300_LVDS1024x600Data_1[] =
{
{840, 604,1344, 800},
{840, 560,1344, 800},
@@ -1628,8 +1885,7 @@
{800, 525,1280, 785}
};
-/* TW: New: */
-static const SiS300_LVDSDataStruct SiS300_LVDS1024x600Data_2[]=
+static const SiS300_LVDSDataStruct SiS300_LVDS1024x600Data_2[] =
{
{1344, 800,1344, 800},
{1344, 800,1344, 800},
@@ -1642,8 +1898,7 @@
{800, 525,1280, 813}
};
-/* TW: New: */
-static const SiS300_LVDSDataStruct SiS300_LVDS1152x768Data_1[]=
+static const SiS300_LVDSDataStruct SiS300_LVDS1152x768Data_1[] =
{
{840, 438,1344, 806},
{840, 409,1344, 806},
@@ -1656,8 +1911,7 @@
{800, 525,1280, 813}
};
-/* TW: New: */
-static const SiS300_LVDSDataStruct SiS300_LVDS1152x768Data_2[]=
+static const SiS300_LVDSDataStruct SiS300_LVDS1152x768Data_2[] =
{
{1344, 806,1344, 806},
{1344, 806,1344, 806},
@@ -1670,20 +1924,22 @@
{800, 525,1280, 813}
};
-/* TW: New in 650/LVDS BIOS - resolution unknown */
-static const SiS300_LVDSDataStruct SiS300_LVDSXXXxXXXData_1[]= /* TW: New */
+/* TW: pass 1:1 data */
+static const SiS300_LVDSDataStruct SiS300_LVDSXXXxXXXData_1[]=
{
- { 800, 449, 800, 449},
- { 800, 449, 800, 449},
- { 900, 449, 900, 449},
- { 900, 449, 900, 449},
- { 800, 525, 800, 525},
- {1056, 628,1056, 628},
- {1344, 806,1344, 806},
- {1688, 806,1688, 806}
+ { 800, 449, 800, 449},
+ { 800, 449, 800, 449},
+ { 900, 449, 900, 449},
+ { 900, 449, 900, 449},
+ { 800, 525, 800, 525}, /* 640x480 */
+ {1056, 628, 1056, 628}, /* 800x600 */
+ {1344, 806, 1344, 806}, /* 1024x768 */
+ {1344,1066, 1344,1066}, /* 1280x1024 */ /* INSERTED ! */
+ {1688, 806, 1688, 806}, /* 1280x768 ! */
+ /* No other panels ! */
};
-static const SiS300_LVDSDataStruct SiS300_LVDS640x480Data_1[]=
+static const SiS300_LVDSDataStruct SiS300_LVDS640x480Data_1[] =
{
{800, 449, 800, 449},
{800, 449, 800, 449},
@@ -1696,7 +1952,7 @@
{1056, 628,1056, 628}
};
-static const SiS300_LVDSDataStruct SiS300_LVDS1280x960Data_1[]= /* TW: New */
+static const SiS300_LVDSDataStruct SiS300_LVDS1280x960Data_1[] = /* TW: New */
{
{840, 438,1344, 806},
{840, 409,1344, 806},
@@ -1709,7 +1965,7 @@
{800, 525,1280, 813}
};
-static const SiS300_LVDSDataStruct SiS300_LVDS1280x960Data_2[]= /* TW: New */
+static const SiS300_LVDSDataStruct SiS300_LVDS1280x960Data_2[] = /* TW: New */
{
{1344, 806,1344, 806},
{1344, 806,1344, 806},
@@ -1722,7 +1978,7 @@
{800, 525,1280, 813}
};
-static const SiS300_LVDSDataStruct SiS300_LCDA1400x1050Data_1[]= /* TW: New */
+static const SiS300_LVDSDataStruct SiS300_LCDA1400x1050Data_1[] = /* TW: New */
{ /* TW: Might be temporary (invalid) data */
{928, 416, 1688, 1066},
{928, 366, 1688, 1066},
@@ -1735,7 +1991,7 @@
{1688, 1066, 1688, 1066}
};
-static const SiS300_LVDSDataStruct SiS300_LCDA1400x1050Data_2[]= /* TW: New */
+static const SiS300_LVDSDataStruct SiS300_LCDA1400x1050Data_2[] = /* TW: New */
{ /* TW: Temporary data. Not valid */
{1344, 806,1344, 806},
{1344, 806,1344, 806},
@@ -1748,7 +2004,7 @@
{800, 525,1280, 813}
};
-static const SiS300_LVDSDataStruct SiS300_LCDA1600x1200Data_1[]= /* TW: New */
+static const SiS300_LVDSDataStruct SiS300_LCDA1600x1200Data_1[] = /* TW: New */
{ /* TW: Temporary data. Not valid */
{1344, 806,1344, 806},
{1344, 806,1344, 806},
@@ -1761,7 +2017,7 @@
{800, 525,1280, 813}
};
-static const SiS300_LVDSDataStruct SiS300_LCDA1600x1200Data_2[]= /* TW: New */
+static const SiS300_LVDSDataStruct SiS300_LCDA1600x1200Data_2[] = /* TW: New */
{ /* TW: Temporary data. Not valid */
{0, 0, 0, 0},
{0, 0, 0, 0},
@@ -1779,7 +2035,7 @@
/* TW: New: */
-static const SiS300_LVDSDataStruct SiS300_CHTVUNTSCData[]=
+static const SiS300_LVDSDataStruct SiS300_CHTVUNTSCData[] =
{
{840, 600, 840, 600},
{840, 600, 840, 600},
@@ -1789,7 +2045,7 @@
{1064, 750,1064, 750}
};
-static const SiS300_LVDSDataStruct SiS300_CHTVONTSCData[]=
+static const SiS300_LVDSDataStruct SiS300_CHTVONTSCData[] =
{
{840, 525, 840, 525},
{840, 525, 840, 525},
@@ -1799,7 +2055,7 @@
{1040, 700,1040, 700}
};
-static const SiS300_LVDSDataStruct SiS300_CHTVUPALData[]=
+static const SiS300_LVDSDataStruct SiS300_CHTVUPALData[] =
{
{1008, 625,1008, 625},
{1008, 625,1008, 625},
@@ -1809,7 +2065,7 @@
{936, 836, 936, 836}
};
-static const SiS300_LVDSDataStruct SiS300_CHTVOPALData[]=
+static const SiS300_LVDSDataStruct SiS300_CHTVOPALData[] =
{
{1008, 625,1008, 625},
{1008, 625,1008, 625},
@@ -1818,6 +2074,17 @@
{840, 625, 840, 625},
{960, 750, 960, 750}
};
+
+static const SiS300_LVDSDataStruct SiS300_CHTVSOPALData[] =
+{
+ {1008, 625,1008, 625},
+ {1008, 625,1008, 625},
+ {1008, 625,1008, 625},
+ {1008, 625,1008, 625},
+ {840, 500, 840, 500},
+ {944, 625, 944, 625}
+};
+
/* TW: new end */
typedef struct _SiS300_LVDSDesStruct
@@ -1826,7 +2093,7 @@
USHORT LCDVDES;
} SiS300_LVDSDesStruct;
-static const SiS300_LVDSDesStruct SiS300_PanelType00_1[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType00_1[] =
{
{0, 626},
{0, 624},
@@ -1839,7 +2106,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType01_1[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType01_1[] =
{
{1343, 798},
{1343, 794},
@@ -1852,7 +2119,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType02_1[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType02_1[] =
{
{0, 626},
{0, 624},
@@ -1865,7 +2132,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType03_1[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType03_1[] =
{
{ 8, 436},
{ 8, 440},
@@ -1878,7 +2145,7 @@
{1343, 794}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType04_1[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType04_1[] =
{
{1343, 798},
{1343, 794},
@@ -1891,7 +2158,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType05_1[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType05_1[] =
{
{1343, 798},
{1343, 794},
@@ -1904,7 +2171,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType06_1[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType06_1[] =
{
{1343, 798},
{1343, 794},
@@ -1917,7 +2184,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType07_1[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType07_1[] =
{
{1343, 798},
{1343, 794},
@@ -1930,7 +2197,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType08_1[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType08_1[] =
{
{1059, 626},
{1059, 624},
@@ -1943,7 +2210,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType09_1[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType09_1[] =
{
{1343, 798},
{1343, 794},
@@ -1956,7 +2223,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType0a_1[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType0a_1[] =
{
{1059, 626},
{1059, 624},
@@ -1969,7 +2236,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType0b_1[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType0b_1[] =
{
{1343, 0},
{1343, 0},
@@ -1982,7 +2249,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType0c_1[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType0c_1[] =
{
{1343, 798},
{1343, 794},
@@ -1995,7 +2262,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType0d_1[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType0d_1[] =
{
{1343, 798},
{1343, 794},
@@ -2008,7 +2275,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType0e_1[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType0e_1[] =
{
{1343, 798},
{1343, 794},
@@ -2021,7 +2288,7 @@
{ 0, 0} /* 1280x960 - not applicable */
};
-static const SiS300_LVDSDesStruct SiS300_PanelType0f_1[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType0f_1[] =
{
{1343, 798},
{1343, 794},
@@ -2034,7 +2301,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType00_2[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType00_2[] =
{
{976, 527},
{976, 502},
@@ -2047,7 +2314,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType01_2[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType01_2[] =
{
{1152, 622},
{1152, 597},
@@ -2060,7 +2327,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType02_2[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType02_2[] =
{
{976, 527},
{976, 502},
@@ -2073,7 +2340,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType03_2[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType03_2[] =
{
{1152, 622},
{1152, 597},
@@ -2086,7 +2353,7 @@
{1152, 597}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType04_2[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType04_2[] =
{
{1152, 622},
{1152, 597},
@@ -2099,7 +2366,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType05_2[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType05_2[] =
{
{1152, 622},
{1152, 597},
@@ -2112,7 +2379,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType06_2[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType06_2[] =
{
{1152, 622},
{1152, 597},
@@ -2125,7 +2392,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType07_2[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType07_2[] =
{
{1152, 622},
{1152, 597},
@@ -2138,7 +2405,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType08_2[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType08_2[] =
{
{976, 527},
{976, 502},
@@ -2151,7 +2418,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType09_2[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType09_2[] =
{
{1152, 622},
{1152, 597},
@@ -2164,7 +2431,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType0a_2[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType0a_2[] =
{
{976, 527},
{976, 502},
@@ -2177,7 +2444,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType0b_2[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType0b_2[] =
{
{ 1152, 700},
{ 1152, 675},
@@ -2190,7 +2457,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType0c_2[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType0c_2[] =
{
{1152, 622},
{1152, 597},
@@ -2203,7 +2470,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType0d_2[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType0d_2[] =
{
{1152, 622},
{1152, 597},
@@ -2216,7 +2483,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType0e_2[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType0e_2[] =
{
{1152, 622},
{1152, 597},
@@ -2229,7 +2496,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType0f_2[]=
+static const SiS300_LVDSDesStruct SiS300_PanelType0f_2[] =
{
{1152, 622},
{1152, 597},
@@ -2242,7 +2509,35 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType1076_1[]= /* TW: New */
+static const SiS300_LVDSDesStruct SiS300_PanelTypeNS_1[]=
+{
+ { 8, 0},
+ { 8, 0},
+ { 8, 0},
+ { 8, 0},
+ { 8, 0},
+ { 0, 0},
+ { 0, 0},
+ { 0, 0},
+ { 0, 806},
+ { 0, 0 }
+};
+
+static const SiS300_LVDSDesStruct SiS300_PanelTypeNS_2[] =
+{
+ { 0 , 0},
+ { 0 , 0},
+ { 0 , 0},
+ { 0 , 0},
+ { 0 , 0},
+ { 0 , 0},
+ { 0 , 0},
+ { 0 , 0},
+ { 0 , 0},
+ { 0 , 0}
+};
+
+static const SiS300_LVDSDesStruct SiS300_PanelType1076_1[] = /* TW: New */
{
{ 0 , 0},
{ 0 , 0},
@@ -2255,7 +2550,7 @@
{ 0 , 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType1076_2[]= /* TW: New */
+static const SiS300_LVDSDesStruct SiS300_PanelType1076_2[] = /* TW: New */
{
{ 1152, 622 },
{ 1152, 597 },
@@ -2268,7 +2563,7 @@
{ 0, 0 }
};
-static const SiS300_LVDSDesStruct SiS300_PanelType1210_1[]= /* TW: New */
+static const SiS300_LVDSDesStruct SiS300_PanelType1210_1[] = /* TW: New */
{
{ 0 , 0},
{ 0 , 0},
@@ -2281,7 +2576,7 @@
{ 0 , 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType1210_2[]= /* TW: New */
+static const SiS300_LVDSDesStruct SiS300_PanelType1210_2[] = /* TW: New */
{
{ 0 , 0},
{ 0 , 0},
@@ -2294,7 +2589,7 @@
{ 0 , 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType1296_1[]= /* TW: New */
+static const SiS300_LVDSDesStruct SiS300_PanelType1296_1[] = /* TW: New */
{
{ 0 , 0},
{ 0 , 0},
@@ -2307,7 +2602,7 @@
{ 0 , 0}
};
-static const SiS300_LVDSDesStruct SiS300_PanelType1296_2[]= /* TW: New */
+static const SiS300_LVDSDesStruct SiS300_PanelType1296_2[] = /* TW: New */
{
{ 0 , 0},
{ 0 , 0},
@@ -2322,7 +2617,7 @@
/* TW: New */
-static const SiS300_LVDSDesStruct SiS300_CHTVUNTSCDesData[]=
+static const SiS300_LVDSDesStruct SiS300_CHTVUNTSCDesData[] =
{
{ 0, 0},
{ 0, 0},
@@ -2332,7 +2627,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_CHTVONTSCDesData[]=
+static const SiS300_LVDSDesStruct SiS300_CHTVONTSCDesData[] =
{
{ 0, 0},
{ 0, 0},
@@ -2342,7 +2637,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_CHTVUPALDesData[]=
+static const SiS300_LVDSDesStruct SiS300_CHTVUPALDesData[] =
{
{256, 0},
{256, 0},
@@ -2352,7 +2647,7 @@
{ 0, 0}
};
-static const SiS300_LVDSDesStruct SiS300_CHTVOPALDesData[]=
+static const SiS300_LVDSDesStruct SiS300_CHTVOPALDesData[] =
{
{256, 0},
{256, 0},
@@ -2363,12 +2658,90 @@
};
/* TW: New end */
+/* TW: New for SiS300+301LV */
+typedef struct _SiS300_Part2PortTblStruct
+{
+ UCHAR CR[12];
+} SiS300_Part2PortTblStruct;
+
+static const SiS300_Part2PortTblStruct SiS300_CRT2Part2_1024x768_1[] =
+{ /* VESA Timing */
+ {{0x21,0x12,0xbf,0xe4,0xc0,0x21,0x45,0x09,0x00,0xa9,0x09,0x04}},
+ {{0x2c,0x12,0x9a,0xae,0x88,0x21,0x45,0x09,0x00,0xa9,0x09,0x04}},
+ {{0x21,0x12,0xbf,0xe4,0xc0,0x21,0x45,0x09,0x00,0xa9,0x09,0x04}},
+ {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}},
+ {{0x22,0x13,0xfe,0x25,0xff,0x21,0x45,0x0a,0x00,0xa9,0x0d,0x04}},
+ {{0x22,0x13,0xfe,0x25,0xff,0x21,0x45,0x0a,0x00,0xa9,0x0d,0x04}},
+ {{0x22,0x13,0xfe,0x25,0xff,0x21,0x45,0x0a,0x00,0xa9,0x0d,0x04}}
+};
+
+static const SiS300_Part2PortTblStruct SiS300_CRT2Part2_1280x1024_1[] =
+{ /* TW: Temporary data, invalid */
+ {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}
+};
+
+static const SiS300_Part2PortTblStruct SiS300_CRT2Part2_1400x1050_1[] =
+{ /* TW: Temporary data, invalid */
+ {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}
+};
+
+static const SiS300_Part2PortTblStruct SiS300_CRT2Part2_1600x1200_1[] =
+{ /* TW: Temporary data, invalid */
+ {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}
+};
+
+static const SiS300_Part2PortTblStruct SiS300_CRT2Part2_1024x768_2[] =
+{ /* Non-VESA */
+ {{0x28,0x12,0xa3,0xd0,0xaa,0x5a,0x45,0x0a,0x07,0xfa,0x0a,0x24}},
+ {{0x2c,0x12,0x9a,0xae,0x88,0x5a,0x45,0x0a,0x07,0xfa,0x0a,0x24}},
+ {{0x28,0x12,0xa3,0xd0,0xaa,0x5a,0x45,0x0a,0x07,0xfa,0x0a,0x24}},
+ {{0x2c,0x12,0x9a,0xae,0x88,0x5a,0x45,0x0a,0x07,0xfa,0x0a,0x24}},
+ {{0x28,0x13,0xe7,0x0b,0xe8,0x5a,0x45,0x0a,0x07,0xfa,0x0a,0x24}},
+ {{0x38,0x18,0x16,0x00,0x00,0x5a,0x45,0x0a,0x07,0xfa,0x0a,0x24}},
+ {{0x36,0x13,0x13,0x25,0xff,0x5a,0x45,0x0a,0x07,0xfa,0x0a,0x24}}
+};
+
+static const SiS300_Part2PortTblStruct SiS300_CRT2Part2_1280x1024_2[] =
+{
+ {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}
+};
+
+static const SiS300_Part2PortTblStruct SiS300_CRT2Part2_1400x1050_2[] =
+{
+ {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}
+};
+
+static const SiS300_Part2PortTblStruct SiS300_CRT2Part2_1600x1200_2[] =
+{ /* TW: Temporary data, invalid */
+ {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}
+};
+
+static const SiS300_Part2PortTblStruct SiS300_CRT2Part2_1024x768_3[] =
+{ /* TW: Temporary data, invalid */
+ {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}
+};
+
+static const SiS300_Part2PortTblStruct SiS300_CRT2Part2_1280x1024_3[] =
+{ /* TW: Temporary data, invalid */
+ {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}
+};
+
+static const SiS300_Part2PortTblStruct SiS300_CRT2Part2_1400x1050_3[] =
+{ /* TW: Temporary data, invalid */
+ {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}
+};
+
+static const SiS300_Part2PortTblStruct SiS300_CRT2Part2_1600x1200_3[] =
+{ /* TW: Temporary data, invalid */
+ {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}
+};
+
typedef struct _SiS300_LVDSCRT1DataStruct
{
UCHAR CR[15];
} SiS300_LVDSCRT1DataStruct;
-static const SiS300_LVDSCRT1DataStruct SiS300_LVDSCRT1800x600_1[]=
+static const SiS300_LVDSCRT1DataStruct SiS300_LVDSCRT1800x600_1[] =
{
{{0x65,0x4f,0x89,0x56,0x83,0xaf,0x1f,
0x90,0x85,0x8f,0xab,0x30,0x00,0x05,
@@ -2390,7 +2763,29 @@
0x01 }}
};
-static const SiS300_LVDSCRT1DataStruct SiS300_LVDSCRT11024x768_1[]=
+static const SiS300_LVDSCRT1DataStruct SiS300_LVDSCRT1800x600_1_H[] =
+{
+ {{0x30,0x27,0x94,0x2c,0x92,0xaf,0x1f,
+ 0x90,0x85,0x8f,0xab,0x30,0x00,0x04,
+ 0x00 }},
+ {{0x30,0x27,0x94,0x2c,0x92,0x83,0x1f,
+ 0x5e,0x83,0x5d,0x79,0x10,0x00,0x04,
+ 0x00 }},
+ {{0x30,0x27,0x94,0x2c,0x92,0xaf,0x1f,
+ 0x90,0x85,0x8f,0xab,0x30,0x00,0x04,
+ 0x00 }},
+ {{0x30,0x27,0x94,0x2c,0x92,0x83,0x1f,
+ 0x5e,0x83,0x5d,0x79,0x10,0x00,0x04,
+ 0x00 }},
+ {{0x30,0x27,0x94,0x2c,0x92,0x04,0x3e,
+ 0xe0,0x85,0xdf,0xfb,0x10,0x00,0x04,
+ 0x00 }},
+ {{0x3d,0x31,0x81,0x37,0x1f,0x72,0xf0,
+ 0x58,0x8c,0x57,0x73,0x20,0x00,0x05,
+ 0x01 }}
+};
+
+static const SiS300_LVDSCRT1DataStruct SiS300_LVDSCRT11024x768_1[] =
{
{{0x64,0x4f,0x88,0x54,0x9f,0xc4,0x1f,
0x92,0x89,0x8f,0xb5,0x30,0x00,0x01,
@@ -2412,58 +2807,34 @@
0x01}},
{{0xa3,0x7f,0x87,0x86,0x97,0x24,0xf5,
0x02,0x88,0xff,0x25,0x10,0x00,0x02,
- 0x01} }
-};
-
-static const SiS300_LVDSCRT1DataStruct SiS300_LVDSCRT11280x1024_1[]=
-{
- {{0x63,0x4f,0x87,0x54,0x9f,0xb4,0x1f,
- 0x92,0x89,0x8f,0xb5,0x30,0x00,0x01,
- 0x00 }},
- {{0x63,0x4f,0x87,0x54,0x9f,0x82,0x1f,
- 0x60,0x87,0x5d,0x83,0x10,0x00,0x01,
- 0x00 }},
- {{0x63,0x4f,0x87,0x54,0x9f,0xb4,0x1f,
- 0x92,0x89,0x8f,0xb5,0x30,0x00,0x01,
- 0x00 }},
- {{0x63,0x4f,0x87,0x54,0x9f,0x82,0x1f,
- 0x60,0x87,0x5d,0x83,0x10,0x00,0x01,
- 0x00 }},
- {{0x63,0x4f,0x87,0x54,0x9f,0x04,0x3e,
- 0xe2,0x89,0xdf,0x05,0x00,0x00,0x01,
- 0x00 }},
- {{0x7e,0x63,0x82,0x68,0x15,0x7c,0xf0,
- 0x5a,0x8f,0x57,0x7d,0x20,0x00,0x26,
- 0x01 }},
- {{0xa3,0x7f,0x87,0x86,0x97,0x24,0xf5,
- 0x02,0x88,0xff,0x25,0x10,0x00,0x02,
- 0x01 }}
+ 0x01}}
};
-static const SiS300_LVDSCRT1DataStruct SiS300_LVDSCRT1800x600_1_H[]=
+static const SiS300_LVDSCRT1DataStruct SiS300_LVDSCRT11024x768_1_H[] =
{
- {{0x30,0x27,0x94,0x2c,0x92,0xaf,0x1f,
- 0x90,0x85,0x8f,0xab,0x30,0x00,0x04,
- 0x00 }},
- {{0x30,0x27,0x94,0x2c,0x92,0x83,0x1f,
- 0x5e,0x83,0x5d,0x79,0x10,0x00,0x04,
- 0x00 }},
- {{0x30,0x27,0x94,0x2c,0x92,0xaf,0x1f,
- 0x90,0x85,0x8f,0xab,0x30,0x00,0x04,
- 0x00 }},
- {{0x30,0x27,0x94,0x2c,0x92,0x83,0x1f,
- 0x5e,0x83,0x5d,0x79,0x10,0x00,0x04,
- 0x00 }},
- {{0x30,0x27,0x94,0x2c,0x92,0x04,0x3e,
- 0xe0,0x85,0xdf,0xfb,0x10,0x00,0x04,
+ {{0x2f,0x27,0x93,0x2b,0x90,0xc4,0x1f,
+ 0x92,0x89,0x8f,0xb5,0x30,0x00,0x44,
0x00 }},
- {{0x3d,0x31,0x81,0x37,0x1f,0x72,0xf0,
- 0x58,0x8c,0x57,0x73,0x20,0x00,0x05,
+ {{0x2f,0x27,0x93,0x2b,0x90,0x97,0x1f,
+ 0x60,0x87,0x5D,0x83,0x10,0x00,0x44,
+ 0x00}},
+ {{0x2f,0x27,0x93,0x2b,0x90,0xc4,0x1f,
+ 0x92,0x89,0x8f,0xb5,0x30,0x00,0x44,
+ 0x00}},
+ {{0x2f,0x27,0x93,0x2b,0x90,0x97,0x1f,
+ 0x60,0x87,0x5D,0x83,0x10,0x00,0x44,
+ 0x00}},
+ {{0x2f,0x27,0x93,0x2b,0x90,0x04,0x3e,
+ 0xE2,0x89,0xdf,0x05,0x00,0x00,0x44,
+ 0x00}},
+ {{0x3c,0x31,0x80,0x35,0x1c,0x7c,0xf0,
+ 0x5A,0x8F,0x57,0x7D,0x20,0x00,0x55,
+ 0x01}},
+ {{0x4f,0x3F,0x93,0x45,0x0D,0x24,0xf5,
+ 0x02,0x88,0xff,0x25,0x10,0x00,0x01,
0x01 }}
-};
-static const SiS300_LVDSCRT1DataStruct SiS300_LVDSCRT11024x768_1_H[]=
-{
+#if 0
{{0x37,0x27,0x9B,0x2b,0x94,0xc4,0x1f,
0x92,0x89,0x8f,0xb5,0x30,0x00,0x44,
0x00 }},
@@ -2485,9 +2856,35 @@
{{0x4f,0x3F,0x93,0x45,0x0D,0x24,0xf5,
0x02,0x88,0xFf,0x25,0x10,0x00,0x01,
0x01 }}
+#endif
+};
+
+static const SiS300_LVDSCRT1DataStruct SiS300_LVDSCRT11280x1024_1[] =
+{
+ {{0x63,0x4f,0x87,0x54,0x9f,0xb4,0x1f,
+ 0x92,0x89,0x8f,0xb5,0x30,0x00,0x01,
+ 0x00 }},
+ {{0x63,0x4f,0x87,0x54,0x9f,0x82,0x1f,
+ 0x60,0x87,0x5d,0x83,0x10,0x00,0x01,
+ 0x00 }},
+ {{0x63,0x4f,0x87,0x54,0x9f,0xb4,0x1f,
+ 0x92,0x89,0x8f,0xb5,0x30,0x00,0x01,
+ 0x00 }},
+ {{0x63,0x4f,0x87,0x54,0x9f,0x82,0x1f,
+ 0x60,0x87,0x5d,0x83,0x10,0x00,0x01,
+ 0x00 }},
+ {{0x63,0x4f,0x87,0x54,0x9f,0x04,0x3e,
+ 0xe2,0x89,0xdf,0x05,0x00,0x00,0x01,
+ 0x00 }},
+ {{0x7e,0x63,0x82,0x68,0x15,0x7c,0xf0,
+ 0x5a,0x8f,0x57,0x7d,0x20,0x00,0x26,
+ 0x01 }},
+ {{0xa3,0x7f,0x87,0x86,0x97,0x24,0xf5,
+ 0x02,0x88,0xff,0x25,0x10,0x00,0x02,
+ 0x01 }}
};
-static const SiS300_LVDSCRT1DataStruct SiS300_LVDSCRT11280x1024_1_H[]=
+static const SiS300_LVDSCRT1DataStruct SiS300_LVDSCRT11280x1024_1_H[] =
{
{{0x2f,0x27,0x93,0x2b,0x90,0xb4,0x1f,
0x92,0x89,0x8f,0xb5,0x30,0x00,0x04,
@@ -2512,7 +2909,7 @@
0x01 }}
};
-static const SiS300_LVDSCRT1DataStruct SiS300_LVDSCRT1800x600_2[]=
+static const SiS300_LVDSCRT1DataStruct SiS300_LVDSCRT1800x600_2[] =
{
{{0x7f,0x4f,0x83,0x62,0x12,0x72,0x3e,
0xf4,0x88,0x8f,0x73,0x20,0x00,0x06,
@@ -2534,32 +2931,29 @@
0x01 }}
};
-static const SiS300_LVDSCRT1DataStruct SiS300_LVDSCRT11024x768_2[]=
+static const SiS300_LVDSCRT1DataStruct SiS300_LVDSCRT1800x600_2_H[] =
{
- {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
- 0x4a,0x80,0x8f,0x25,0x30,0x00,0x06,
+ {{0x3d,0x27,0x81,0x32,0x1a,0x72,0x3e,
+ 0xf4,0x88,0x8f,0x73,0x20,0x00,0x05,
0x00 }},
- {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
- 0x31,0x87,0x5d,0x25,0x30,0x00,0x06,
+ {{0x3d,0x27,0x81,0x32,0x1a,0x72,0x3e,
+ 0xdb,0x8f,0x5d,0x73,0x20,0x00,0x05,
0x00 }},
- {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
- 0x4a,0x80,0x8f,0x25,0x30,0x00,0x06,
+ {{0x3d,0x27,0x81,0x32,0x1a,0x72,0x3e,
+ 0xf4,0x88,0x8f,0x73,0x20,0x00,0x05,
0x00 }},
- {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
- 0x31,0x87,0x5d,0x25,0x30,0x00,0x06,
+ {{0x3d,0x27,0x81,0x3a,0x1a,0x72,0x3e,
+ 0xdb,0x8f,0x5d,0x73,0x20,0x00,0x05,
0x00 }},
- {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
- 0x72,0x88,0xdf,0x25,0x30,0x00,0x06,
+ {{0x3d,0x27,0x81,0x32,0x1a,0x72,0xba,
+ 0x1c,0x80,0xdf,0x73,0x00,0x00,0x05,
0x00 }},
- {{0xa3,0x63,0x87,0x78,0x89,0x24,0xf1,
- 0xae,0x84,0x57,0x25,0x30,0x00,0x02,
- 0x01 }},
- {{0xa3,0x7f,0x87,0x86,0x97,0x24,0xf5,
- 0x02,0x88,0xff,0x25,0x10,0x00,0x02,
+ {{0x3d,0x31,0x81,0x37,0x1f,0x72,0xf0,
+ 0x58,0x8c,0x57,0x73,0x20,0x00,0x05,
0x01 }}
};
-static const SiS300_LVDSCRT1DataStruct SiS300_LVDSCRT11280x1024_2[]=
+static const SiS300_LVDSCRT1DataStruct SiS300_LVDSCRT11024x768_2[] =
{
{{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
0x4a,0x80,0x8f,0x25,0x30,0x00,0x06,
@@ -2584,29 +2978,7 @@
0x01 }}
};
-static const SiS300_LVDSCRT1DataStruct SiS300_LVDSCRT1800x600_2_H[]=
-{
- {{0x3d,0x27,0x81,0x32,0x1a,0x72,0x3e,
- 0xf4,0x88,0x8f,0x73,0x20,0x00,0x05,
- 0x00 }},
- {{0x3d,0x27,0x81,0x32,0x1a,0x72,0x3e,
- 0xdb,0x8f,0x5d,0x73,0x20,0x00,0x05,
- 0x00 }},
- {{0x3d,0x27,0x81,0x32,0x1a,0x72,0x3e,
- 0xf4,0x88,0x8f,0x73,0x20,0x00,0x05,
- 0x00 }},
- {{0x3d,0x27,0x81,0x3a,0x1a,0x72,0x3e,
- 0xdb,0x8f,0x5d,0x73,0x20,0x00,0x05,
- 0x00 }},
- {{0x3d,0x27,0x81,0x32,0x1a,0x72,0xba,
- 0x1c,0x80,0xdf,0x73,0x00,0x00,0x05,
- 0x00 }},
- {{0x3d,0x31,0x81,0x37,0x1f,0x72,0xf0,
- 0x58,0x8c,0x57,0x73,0x20,0x00,0x05,
- 0x01 }}
-};
-
-static const SiS300_LVDSCRT1DataStruct SiS300_LVDSCRT11024x768_2_H[]=
+static const SiS300_LVDSCRT1DataStruct SiS300_LVDSCRT11024x768_2_H[] =
{
{{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
0x4a,0x80,0x8f,0x25,0x30,0x00,0x01,
@@ -2631,7 +3003,32 @@
0x01 }}
};
-static const SiS300_LVDSCRT1DataStruct SiS300_LVDSCRT11280x1024_2_H[]=
+static const SiS300_LVDSCRT1DataStruct SiS300_LVDSCRT11280x1024_2[] =
+{
+ {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+ 0x4a,0x80,0x8f,0x25,0x30,0x00,0x06,
+ 0x00 }},
+ {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+ 0x31,0x87,0x5d,0x25,0x30,0x00,0x06,
+ 0x00 }},
+ {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+ 0x4a,0x80,0x8f,0x25,0x30,0x00,0x06,
+ 0x00 }},
+ {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+ 0x31,0x87,0x5d,0x25,0x30,0x00,0x06,
+ 0x00 }},
+ {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+ 0x72,0x88,0xdf,0x25,0x30,0x00,0x06,
+ 0x00 }},
+ {{0xa3,0x63,0x87,0x78,0x89,0x24,0xf1,
+ 0xae,0x84,0x57,0x25,0x30,0x00,0x02,
+ 0x01 }},
+ {{0xa3,0x7f,0x87,0x86,0x97,0x24,0xf5,
+ 0x02,0x88,0xff,0x25,0x10,0x00,0x02,
+ 0x01 }}
+};
+
+static const SiS300_LVDSCRT1DataStruct SiS300_LVDSCRT11280x1024_2_H[] =
{
{{0x4f,0x27,0x93,0x39,0x81,0x24,0xbb,
0x4a,0x80,0x8f,0x25,0x30,0x00,0x01,
@@ -2857,7 +3254,7 @@
};
/* TW: New */
-static const SiS300_LVDSCRT1DataStruct SiS300_CHTVCRT1UNTSC[]=
+static const SiS300_LVDSCRT1DataStruct SiS300_CHTVCRT1UNTSC[] =
{
{{0x64,0x4f,0x88,0x56,0x9f,0x56,0x3e,
0xe8,0x84,0x8f,0x57,0x20,0x00,0x01,
@@ -2879,7 +3276,7 @@
0x01 }}
};
-static const SiS300_LVDSCRT1DataStruct SiS300_CHTVCRT1ONTSC[]=
+static const SiS300_LVDSCRT1DataStruct SiS300_CHTVCRT1ONTSC[] =
{
{{0x64,0x4f,0x88,0x5a,0x9f,0x0b,0x3e,
0xc0,0x84,0x8f,0x0c,0x20,0x00,0x01,
@@ -2901,7 +3298,7 @@
0x01 }}
};
-static const SiS300_LVDSCRT1DataStruct SiS300_CHTVCRT1UPAL[]=
+static const SiS300_LVDSCRT1DataStruct SiS300_CHTVCRT1UPAL[] =
{
{{0x79,0x4f,0x9d,0x5a,0x90,0x6f,0x3e,
0xf8,0x83,0x8f,0x70,0x20,0x00,0x05,
@@ -2923,7 +3320,7 @@
0x01 }}
};
-static const SiS300_LVDSCRT1DataStruct SiS300_CHTVCRT1OPAL[]=
+static const SiS300_LVDSCRT1DataStruct SiS300_CHTVCRT1OPAL[] =
{
{{0x79,0x4f,0x9d,0x5a,0x90,0x6f,0x3e,
0xf0,0x83,0x8f,0x70,0x20,0x00,0x05,
@@ -2944,6 +3341,28 @@
0x90,0x8c,0x57,0xed,0x20,0x00,0x05,
0x01 }}
};
+
+static const SiS300_LVDSCRT1DataStruct SiS300_CHTVCRT1SOPAL[] =
+{
+ {{0x79,0x4f,0x9d,0x5a,0x90,0x6f,0x3e,
+ 0xf0,0x83,0x8f,0x70,0x20,0x00,0x05,
+ 0x00 }},
+ {{0x79,0x4f,0x9d,0x5a,0x90,0x6f,0x3e,
+ 0xde,0x81,0x5d,0x70,0x00,0x00,0x05,
+ 0x00 }},
+ {{0x79,0x4f,0x9d,0x5a,0x90,0x6f,0x3e,
+ 0xf0,0x83,0x8f,0x70,0x20,0x00,0x05,
+ 0x00 }},
+ {{0x79,0x4f,0x9d,0x5a,0x90,0x6f,0x3e,
+ 0xde,0x81,0x5d,0x70,0x00,0x00,0x05,
+ 0x00 }},
+ {{0x64,0x4f,0x88,0x55,0x80,0x6f,0xba, /* TODO */
+ 0x20,0x83,0xdf,0x70,0x00,0x00,0x05,
+ 0x00 }},
+ {{0x73,0x63,0x97,0x69,0x8e,0xec,0xf0, /* TODO */
+ 0x90,0x8c,0x57,0xed,0x20,0x00,0x05,
+ 0x01 }}
+};
/* TW: New end */
/* TW: New */
@@ -2952,7 +3371,8 @@
UCHAR Reg[16];
} SiS300_CHTVRegDataStruct;
-static const SiS300_CHTVRegDataStruct SiS300_CHTVReg_UNTSC[] = {
+static const SiS300_CHTVRegDataStruct SiS300_CHTVReg_UNTSC[] =
+{
{{0x4a,0x94,0x00,0x48,0xfe,0,0,0,0,0,0,0,0,0,0,0}},
{{0x4a,0x94,0x00,0x48,0xfe,0,0,0,0,0,0,0,0,0,0,0}},
{{0x4a,0x94,0x00,0x48,0xfe,0,0,0,0,0,0,0,0,0,0,0}},
@@ -2961,7 +3381,8 @@
{{0x8d,0xc4,0x00,0x3b,0xfb,0,0,0,0,0,0,0,0,0,0,0}} /* Mode 24: 800x600 NTSC 7/10 */
};
-static const SiS300_CHTVRegDataStruct SiS300_CHTVReg_ONTSC[] = {
+static const SiS300_CHTVRegDataStruct SiS300_CHTVReg_ONTSC[] =
+{
{{0x49,0x94,0x00,0x34,0xfe,0,0,0,0,0,0,0,0,0,0,0}},
{{0x49,0x94,0x00,0x34,0xfe,0,0,0,0,0,0,0,0,0,0,0}},
{{0x49,0x94,0x00,0x34,0xfe,0,0,0,0,0,0,0,0,0,0,0}},
@@ -2970,37 +3391,51 @@
{{0x8c,0xb4,0x00,0x32,0xf9,0,0,0,0,0,0,0,0,0,0,0}} /* Mode 23: 800x600 NTSC 3/4 */
};
-static const SiS300_CHTVRegDataStruct SiS300_CHTVReg_UPAL[] = {
+static const SiS300_CHTVRegDataStruct SiS300_CHTVReg_UPAL[] =
+{
{{0x41,0x12,0x01,0x50,0x34,0,0,0,0,0,0,0,0,0,0,0}},
{{0x41,0x12,0x00,0x50,0x00,0,0,0,0,0,0,0,0,0,0,0}},
{{0x41,0x12,0x01,0x50,0x34,0,0,0,0,0,0,0,0,0,0,0}},
{{0x41,0x12,0x00,0x50,0x00,0,0,0,0,0,0,0,0,0,0,0}},
{{0x63,0x94,0x01,0x50,0x30,0,0,0,0,0,0,0,0,0,0,0}}, /* Mode 15: 640x480 PAL 5/6 */
- /* TW: For 800x600, 3/4 is VERY underscan */
{{0x84,0x64,0x01,0x4e,0x2f,0,0,0,0,0,0,0,0,0,0,0}} /* Mode 21: 800x600 PAL 3/4 */
- /* TW: Mode 20 is still underscan, use it instead? */
- /* {{0x83,0x76,0x01,0x40,0x31}} */ /* Mode 20: 800x600 PAL 5/6 */
+
};
-static const SiS300_CHTVRegDataStruct SiS300_CHTVReg_OPAL[] = {
+static const SiS300_CHTVRegDataStruct SiS300_CHTVReg_OPAL[] =
+{
{{0x41,0x12,0x01,0x50,0x34,0,0,0,0,0,0,0,0,0,0,0}}, /* Mode 9: 640x400 PAL 1/1 */
{{0x41,0x12,0x00,0x50,0x00,0,0,0,0,0,0,0,0,0,0,0}},
{{0x41,0x12,0x01,0x50,0x34,0,0,0,0,0,0,0,0,0,0,0}},
{{0x41,0x12,0x00,0x50,0x00,0,0,0,0,0,0,0,0,0,0,0}},
{{0x61,0x94,0x01,0x36,0x30,0,0,0,0,0,0,0,0,0,0,0}}, /* Mode 14: 640x480 PAL 1/1 */
{{0x83,0x76,0x01,0x40,0x31,0,0,0,0,0,0,0,0,0,0,0}} /* Mode 20: 800x600 PAL 5/6 */
- /* {{0x81,0x12,0x01,0x50,0x34}} */ /* TW: (test) Mode 19: 800x600 PAL 1/1 */
+
+};
+
+static const SiS300_CHTVRegDataStruct SiS300_CHTVReg_SOPAL[] =
+{
+ {{0x41,0x12,0x01,0x50,0x34,0,0,0,0,0,0,0,0,0,0,0}}, /* Mode 9: 640x400 PAL 5/4 */
+ {{0x41,0x12,0x00,0x50,0x00,0,0,0,0,0,0,0,0,0,0,0}},
+ {{0x41,0x12,0x01,0x50,0x34,0,0,0,0,0,0,0,0,0,0,0}},
+ {{0x41,0x12,0x00,0x50,0x00,0,0,0,0,0,0,0,0,0,0,0}},
+ {{0x60,0x30,0x00,0x10,0x00,0,0,0,0,0,0,0,0,0,0,0}}, /* TW: Mode 13: 640x480 PAL 5/4 */
+ {{0x81,0x50,0x00,0x1b,0x00,0,0,0,0,0,0,0,0,0,0,0}} /* TW: Mode 19: 800x600 PAL 1/1 */
};
/* TW: New end */
/* TW: New */
-static const UCHAR SiS300_CHTVVCLKUNTSC[] = {0x29,0x29,0x29,0x29,0x2a,0x2e};
+static const UCHAR SiS300_CHTVVCLKUNTSC[] = {0x29,0x29,0x29,0x29,0x2a,0x2e};
+
+static const UCHAR SiS300_CHTVVCLKONTSC[] = {0x2c,0x2c,0x2c,0x2c,0x2d,0x2b};
+
+static const UCHAR SiS300_CHTVVCLKSONTSC[] = {0x2c,0x2c,0x2c,0x2c,0x2d,0x2b};
-static const UCHAR SiS300_CHTVVCLKONTSC[] = {0x2c,0x2c,0x2c,0x2c,0x2d,0x2b};
+static const UCHAR SiS300_CHTVVCLKUPAL[] = {0x2f,0x2f,0x2f,0x2f,0x2f,0x31};
-static const UCHAR SiS300_CHTVVCLKUPAL[] = {0x2f,0x2f,0x2f,0x2f,0x2f,0x31};
+static const UCHAR SiS300_CHTVVCLKOPAL[] = {0x2f,0x2f,0x2f,0x2f,0x30,0x32};
-static const UCHAR SiS300_CHTVVCLKOPAL[] = {0x2f,0x2f,0x2f,0x2f,0x30,0x32};
+static const UCHAR SiS300_CHTVVCLKSOPAL[] = {0x2f,0x2f,0x2f,0x2f,0x36,0x29};
/* TW: New end */
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)