patch-2.4.21 linux-2.4.21/drivers/video/sis/310vtbl.h

Next file: linux-2.4.21/drivers/video/sis/init.c
Previous file: linux-2.4.21/drivers/video/sis/300vtbl.h
Back to the patch index
Back to the overall index

diff -urN linux-2.4.20/drivers/video/sis/310vtbl.h linux-2.4.21/drivers/video/sis/310vtbl.h
@@ -1,6 +1,6 @@
 
 
-/* Register settings for SiS 310/325 series */
+/* Register settings for SiS 310/325/330 series */
 
 
 typedef struct _SiS310_StStruct
@@ -54,7 +54,7 @@
 
 static const SiS310_StandTableStruct SiS310_StandTable[]=
 {
-/* MD_0_200 */
+/* 0x00: MD_0_200 */
  {
   0x28,0x18,0x08,0x0800,
   {0x09,0x03,0x00,0x02},
@@ -69,7 +69,7 @@
   {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
    0xff}
  },
-/* MD_1_200 */
+/* 0x01: MD_1_200 */
  {
   0x28,0x18,0x08,0x0800,
   {0x09,0x03,0x00,0x02},
@@ -84,7 +84,7 @@
   {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
    0xff}
  },
-/* MD_2_200 */
+/* 0x02: MD_2_200 */
  {
   0x50,0x18,0x08,0x1000,
   {0x01,0x03,0x00,0x02},
@@ -99,7 +99,7 @@
   {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
    0xff}
  },
-/* MD_3_200 */
+/* 0x03: MD_3_200 - mode 0x03 - 0 */
  {
   0x50,0x18,0x08,0x1000,
   {0x01,0x03,0x00,0x02},
@@ -114,7 +114,7 @@
   {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
    0xff}
  },
-/* MD_4 */
+/* 0x04: MD_4 */
  {
   0x28,0x18,0x08,0x4000,
   {0x09,0x03,0x00,0x02},
@@ -129,7 +129,7 @@
   {0x00,0x00,0x00,0x00,0x00,0x30,0x0f,0x00,
    0xff}
  },
-/* MD_5 */
+/* 0x05: MD_5 */
  {
   0x28,0x18,0x08,0x4000,
   {0x09,0x03,0x00,0x02},
@@ -144,7 +144,7 @@
   {0x00,0x00,0x00,0x00,0x00,0x30,0x0f,0x00,
    0xff}
  },
-/* MD_6 */
+/* 0x06: MD_6 */
  {
   0x50,0x18,0x08,0x4000,
   {0x01,0x01,0x00,0x06},
@@ -159,7 +159,7 @@
   {0x00,0x00,0x00,0x00,0x00,0x00,0x0d,0x00,
    0xff}
  },
-/* MD_7 */
+/* 0x07: MD_7 */
  {
   0x50,0x18,0x0e,0x1000,
   {0x00,0x03,0x00,0x03},
@@ -174,7 +174,7 @@
   {0x00,0x00,0x00,0x00,0x00,0x10,0x0a,0x00,
    0xff}
  },
-/* MDA_DAC */
+/* 0x08: MDA_DAC */
  {
   0x00,0x00,0x00,0x0000,
   {0x00,0x00,0x00,0x15},
@@ -189,7 +189,7 @@
   {0x15,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,
    0x3f}
  },
-/* CGA_DAC */
+/* 0x09: CGA_DAC */
  {
   0x00,0x10,0x04,0x0114,
   {0x11,0x09,0x15,0x00},
@@ -204,7 +204,7 @@
   {0x3f,0x2a,0x3a,0x2e,0x3e,0x2b,0x3b,0x2f,
    0x3f}
  },
-/* EGA_DAC */
+/* 0x0a: EGA_DAC */
  {
   0x00,0x10,0x04,0x0114,
   {0x11,0x05,0x15,0x20},
@@ -219,7 +219,7 @@
   {0x1f,0x2a,0x3a,0x2e,0x3e,0x2b,0x3b,0x2f,
    0x3f}
  },
-/* VGA_DAC */
+/* 0x0b: VGA_DAC */
  {
   0x00,0x10,0x04,0x0114,
   {0x11,0x09,0x15,0x2a},
@@ -234,6 +234,7 @@
   {0x18,0x1c,0x14,0x16,0x18,0x1a,0x1c,0x00,
    0x04}
  },
+/* 0x0c */ 
  {
   0x08,0x0c,0x10,0x0a08,
   {0x0c,0x0e,0x10,0x0b},
@@ -248,7 +249,7 @@
   {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
    0x00}
  },
-/* MD_D */
+/* 0x0d: MD_D */
  {
   0x28,0x18,0x08,0x2000,
   {0x09,0x0f,0x00,0x06},
@@ -263,7 +264,7 @@
   {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x0f,
    0xff}
  },
-/* MD_E */
+/* 0x0e: MD_E */
  {
   0x50,0x18,0x08,0x4000,
   {0x01,0x0f,0x00,0x06},
@@ -278,7 +279,7 @@
   {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x0f,
    0xff}
  },
-/* ExtVGATable */
+/* 0x0f: ExtVGATable - modes > 0x13 */
  {
   0x00,0x00,0x00,0x0000,
   {0x01,0x0f,0x00,0x0e},
@@ -293,7 +294,7 @@
   {0x00,0x00,0x00,0x00,0x00,0x40,0x05,0x0f,
    0xff}
  },
-/* ROM_SAVEPTR */
+/* 0x10: ROM_SAVEPTR */
  {
   0x9f,0x3b,0x00,0x00c0,
   {0x00,0x00,0x00,0x00},
@@ -308,7 +309,7 @@
   {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
    0x00}
  },
-/* MD_F */
+/* 0x11: MD_F */
  {
   0x50,0x18,0x0e,0x8000,
   {0x01,0x0f,0x00,0x06},
@@ -323,7 +324,7 @@
   {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x05,
    0xff}
  },
-/* MD_10 */
+/* 0x12: MD_10 */
  {
   0x50,0x18,0x0e,0x8000,
   {0x01,0x0f,0x00,0x06},
@@ -338,7 +339,7 @@
   {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x0f,
    0xff}
  },
-/* MD_0_350 */
+/* 0x13: MD_0_350 */
  {
   0x28,0x18,0x0e,0x0800,
   {0x09,0x03,0x00,0x02},
@@ -353,7 +354,7 @@
   {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
    0xff}
  },
-/* MD_1_350 */
+/* 0x14: MD_1_350 */
  {
   0x28,0x18,0x0e,0x0800,
   {0x09,0x03,0x00,0x02},
@@ -368,7 +369,7 @@
   {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
    0xff}
  },
-/* MD_2_350 */
+/* 0x15: MD_2_350 */
  {
   0x50,0x18,0x0e,0x1000,
   {0x01,0x03,0x00,0x02},
@@ -383,7 +384,7 @@
   {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
    0xff}
  },
-/* MD_3_350 */
+/* 0x16: MD_3_350 - mode 0x03 - 1 */
  {
   0x50,0x18,0x0e,0x1000,
   {0x01,0x03,0x00,0x02},
@@ -398,7 +399,7 @@
   {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
    0xff}
  },
-/* MD_0_1_400 */
+/* 0x17: MD_0_1_400 */
  {
   0x28,0x18,0x10,0x0800,
   {0x08,0x03,0x00,0x02},
@@ -413,7 +414,7 @@
   {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
    0xff}
  },
-/* MD_2_3_400 */
+/* 0x18: MD_2_3_400 - mode 0x03 - 2 */
  {
   0x50,0x18,0x10,0x1000,
   {0x00,0x03,0x00,0x02},
@@ -428,7 +429,7 @@
   {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
    0xff}
  },
-/* MD_7_400 */
+/* 0x19: MD_7_400 */
  {
   0x50,0x18,0x10,0x1000,
   {0x00,0x03,0x00,0x02},
@@ -443,7 +444,7 @@
   {0x00,0x00,0x00,0x00,0x00,0x10,0x0a,0x00,
    0xff}
  },
-/* MD_11 */
+/* 0x1a: MD_11 */
  {
   0x50,0x1d,0x10,0xa000,
   {0x01,0x0f,0x00,0x06},
@@ -458,7 +459,7 @@
   {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x01,
    0xff}
  },
-/* ExtEGATable */
+/* 0x1b: ExtEGATable - Modes <= 0x02 */
  {
   0x50,0x1d,0x10,0xa000,
   {0x01,0x0f,0x00,0x06},
@@ -473,7 +474,7 @@
   {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x0f,
    0xff}
  },
-/* MD_13 */
+/* 0x1c: MD_13 */
  {
   0x28,0x18,0x08,0x2000,
   {0x01,0x0f,0x00,0x0e},
@@ -522,45 +523,38 @@
 	{0x34,0x2a1d,0x0a0e,0x3b8c,0x0000,0x08,0x0e,0x00,0x00,0x06,0x12},          /* 720x576x16 */
 	{0x35,0x0a1f,0x0a0d,0x3b85,0x0000,0x08,0x0d,0x00,0x00,0x06,0x11},          /* 720x480x32 */
 	{0x36,0x2a1f,0x0a0e,0x3b8c,0x0000,0x08,0x0e,0x00,0x00,0x06,0x12},          /* 720x576x32 */
-	{0x37,0x0212,0x0508,0x3aab,0x0104,0x08,0x08,0x00,0x00,0x00,0x13},          /* 1024x768x? */
-	{0x38,0x0a1b,0x0508,0x3aab,0x0105,0x08,0x08,0x00,0x00,0x00,0x13},          /* 1024x768x8 */
-/*	{0x38,0x021b,0x0508,0x3aab,0x0105,0x08,0x08,0x00,0x00,0x00,0x13},    */    /* 1024x768x8 - 650/LVDS BIOS (no CRt2Mode)  */
+	{0x37,0x0212,0x0508,0x3aab,0x0104,0x08,0x08,0x00,0x00,0x08,0x13},          /* 1024x768x? */
+	{0x38,0x0a1b,0x0508,0x3aab,0x0105,0x08,0x08,0x00,0x00,0x08,0x13},          /* 1024x768x8 */
 	{0x3a,0x0e3b,0x0609,0x3adc,0x0107,0x08,0x09,0x00,0x00,0x00,0x1a},          /* 1280x1024x8 */
-/*	{0x3a,0x063b,0x0609,0x3adc,0x0107,0x08,0x09,0x00,0x00,0x00,0x1a},    */    /* 1280x1024x8 - 650/LVDS BIOS*/
 	{0x3c,0x0e3b,0x070a,0x3af2,0x0130,0x08,0x0a,0x00,0x00,0x00,0x1e},          /* 1600x1200x8 */
-/*	{0x3c,0x063b,0x070a,0x3af2,0x0130,0x08,0x0a,0x00,0x00,0x00,0x1e},    */    /* 1600x1200x8 - 650/LVDS BIOS */
-	{0x3d,0x067d,0x070a,0x3af2,0x0131,0x08,0x0a,0x00,0x00,0x00,0x1e},          /* 1600x1200x16 - 650/301LVx - no CRT2Mode? */
-	{0x40,0x9a1c,0x0000,0x3a34,0x010d,0x08,0x00,0x00,0x00,0x04,0x25},
-	{0x41,0x9a1d,0x0000,0x3a34,0x010e,0x08,0x00,0x00,0x00,0x04,0x25},
+	{0x3d,0x0e7d,0x070a,0x3af2,0x0131,0x08,0x0a,0x00,0x00,0x00,0x1e},          /* 1600x1200x16 - 650/301LVx - no CRT2Mode? */
+	{0x40,0x9a1c,0x0000,0x3a34,0x010d,0x08,0x00,0x00,0x00,0x04,0x25},	   /* 320x200x15 */
+	{0x41,0x9a1d,0x0000,0x3a34,0x010e,0x08,0x00,0x00,0x00,0x04,0x25},	   /* 320x200x16 */
 	{0x43,0x0a1c,0x0306,0x3a57,0x0110,0x08,0x06,0x00,0x00,0x05,0x08},
 	{0x44,0x0a1d,0x0306,0x3a57,0x0111,0x08,0x06,0x00,0x00,0x05,0x08},          /* 640x480x16 */
 	{0x46,0x2a1c,0x0407,0x3a81,0x0113,0x08,0x07,0x00,0x00,0x07,0x00},
 	{0x47,0x2a1d,0x0407,0x3a81,0x0114,0x08,0x07,0x00,0x00,0x07,0x00},          /* 800x600x16 */
 	{0x49,0x0a3c,0x0508,0x3aab,0x0116,0x08,0x08,0x00,0x00,0x00,0x13},
-	{0x4a,0x0a3d,0x0508,0x3aab,0x0117,0x08,0x08,0x00,0x00,0x00,0x13},          /* 1024x768x16 */
+	{0x4a,0x0a3d,0x0508,0x3aab,0x0117,0x08,0x08,0x00,0x00,0x08,0x13},          /* 1024x768x16 */
 	{0x4c,0x0e7c,0x0609,0x3adc,0x0119,0x08,0x09,0x00,0x00,0x00,0x1a},
 	{0x4d,0x0e7d,0x0609,0x3adc,0x011a,0x08,0x09,0x00,0x00,0x00,0x1a},          /* 1280x1024x16 */
-	{0x50,0x9a1b,0x0001,0x3a3b,0x0132,0x08,0x01,0x00,0x00,0x04,0x26},
-/*	{0x50,0x921b,0x0001,0x3a3b,0x0132,0x08,0x01,0x00,0x00,0x04,0x26},     */   /* 650/LVDS BIOS */
-	{0x51,0xba1b,0x0103,0x3a42,0x0133,0x08,0x03,0x00,0x00,0x07,0x27},
-/*	{0x52,0x9a1b,0x0204,0x3a49,0x0134,0x08,0x04,0x00,0x00,0x00,0x28},  */
-  	{0x52,0xba1b,0x0204,0x3a49,0x0134,0x08,0x04,0x00,0x00,0x00,0x28},          /* 650/301 BIOS */
-/*	{0x52,0xb21b,0x0204,0x3a49,0x0134,0x08,0x04,0x00,0x00,0x00,0x28},     */   /* 650/LVDS BIOS (no CRT2Mode) */
-	{0x56,0x9a1d,0x0001,0x3a3b,0x0135,0x08,0x01,0x00,0x00,0x04,0x26},
-	{0x57,0xba1d,0x0103,0x3a42,0x0136,0x08,0x03,0x00,0x00,0x07,0x27},
-/*	{0x58,0x9a1d,0x0204,0x3a49,0x0137,0x08,0x04,0x00,0x00,0x00,0x28},  */
- 	{0x58,0xba1d,0x0204,0x3a49,0x0137,0x08,0x04,0x00,0x00,0x00,0x28},          /* BIOS (301+LVDS) */
-	{0x59,0x9a1b,0x0000,0x3a34,0x0138,0x08,0x00,0x00,0x00,0x04,0x25},
-/*	{0x59,0x921b,0x0000,0x3a34,0x0138,0x08,0x00,0x00,0x00,0x04,0x25},     */   /* 650/LVDS BIOS (no CRT2Mode) */
+	{0x50,0x9a1b,0x0001,0x3a3b,0x0132,0x08,0x01,0x00,0x00,0x04,0x26},	   /* 320x240x8  */
+	{0x51,0xba1b,0x0103,0x3a42,0x0133,0x08,0x03,0x00,0x00,0x07,0x27},	   /* 400x300x8  */
+  	{0x52,0xba1b,0x0204,0x3a49,0x0134,0x08,0x04,0x00,0x00,0x00,0x28},          /* 512x384x8  */
+	{0x56,0x9a1d,0x0001,0x3a3b,0x0135,0x08,0x01,0x00,0x00,0x04,0x26},	   /* 320x240x16 */
+	{0x57,0xba1d,0x0103,0x3a42,0x0136,0x08,0x03,0x00,0x00,0x07,0x27}, 	   /* 400x300x16 */
+ 	{0x58,0xba1d,0x0204,0x3a49,0x0137,0x08,0x04,0x00,0x00,0x00,0x28},          /* 512x384x16 */
+	{0x59,0x9a1b,0x0000,0x3a34,0x0138,0x08,0x00,0x00,0x00,0x04,0x25},	   /* 320x200x8  */
 	{0x5A,0x021b,0x0014,0x3b83,0x0138,0x08,0x01,0x00,0x00,0x04,0x3f},          /* 320x480x8 fstn add new mode*/
 	{0x5B,0x0a1d,0x0014,0x3b83,0x0135,0x08,0x01,0x00,0x00,0x04,0x3f},          /* 320x480x16 fstn add new mode*/
 	{0x5c,0xba1f,0x0204,0x3a49,0x0000,0x08,0x04,0x00,0x00,0x00,0x28},          /* TW: inserted 512x384x32 */
 	{0x5d,0x0a1d,0x0305,0x3a50,0x0139,0x08,0x05,0x00,0x00,0x07,0x10},
+	{0x5e,0x0a1f,0x0305,0x3a50,0x0000,0x08,0x05,0x00,0x00,0x07,0x10},          /* TW: Inserted 640x400x32 */
 	{0x62,0x0a3f,0x0306,0x3a57,0x013a,0x08,0x06,0x00,0x00,0x05,0x08},          /* 640x480x32 */
 	{0x63,0x2a3f,0x0407,0x3a81,0x013b,0x08,0x07,0x00,0x00,0x07,0x00},          /* 800x600x32 */
-	{0x64,0x0a7f,0x0508,0x3aab,0x013c,0x08,0x08,0x00,0x00,0x00,0x13},          /* 1024x768x32 */
+	{0x64,0x0a7f,0x0508,0x3aab,0x013c,0x08,0x08,0x00,0x00,0x08,0x13},          /* 1024x768x32 */
 	{0x65,0x0eff,0x0609,0x3adc,0x013d,0x08,0x09,0x00,0x00,0x00,0x1a},          /* 1280x1024x32 */
-	{0x66,0x06ff,0x070a,0x3af2,0x013e,0x08,0x0a,0x00,0x00,0x00,0x1e},          /* 1600x1200x32 */
+	{0x66,0x0eff,0x070a,0x3af2,0x013e,0x08,0x0a,0x00,0x00,0x00,0x1e},          /* 1600x1200x32 */
 	{0x68,0x067b,0x080b,0x3b17,0x013f,0x08,0x0b,0x00,0x00,0x00,0x29},          /* 1920x1440x8 */
 	{0x69,0x06fd,0x080b,0x3b17,0x0140,0x08,0x0b,0x00,0x00,0x00,0x29},          /* 1920x1440x16 */
 	{0x6b,0x07ff,0x080b,0x3b17,0x0141,0x10,0x0b,0x00,0x00,0x00,0x29},          /* 1920x1440x32 */
@@ -580,14 +574,27 @@
 	{0x7d,0x0e7d,0x060f,0x3ad0,0x0000,0x08,0x0f,0x00,0x00,0x00,0x3d},          /* 1280x960x16 - TW */
 	{0x7e,0x0eff,0x060f,0x3ad0,0x0000,0x08,0x0f,0x00,0x00,0x00,0x3d},          /* 1280x960x32 - TW */
         /* TW: 650/LVDS BIOS new modes */
-/*	{0x23,0x063b,0x0614,0x36f7,0x0000,0x08,0x14,0x00,0x00,0x00,0x40},  */      /* 1280x768x8 - 650/LVDS BIOS */
 	{0x23,0x0e3b,0x0614,0x36f7,0x0000,0x08,0x14,0x00,0x00,0x00,0x40},          /* 1280x768x8 */
 	{0x24,0x0e7d,0x0614,0x36f7,0x0000,0x08,0x14,0x00,0x00,0x00,0x40},          /* 1280x768x16 */
 	{0x25,0x0eff,0x0614,0x36f7,0x0000,0x08,0x14,0x00,0x00,0x00,0x40},          /* 1280x768x32 */
 	{0x26,0x0e3b,0x0c15,0x36fe,0x0000,0x08,0x15,0x00,0x00,0x00,0x41},          /* 1400x1050x8 */
-/*	{0x26,0x063b,0x0c15,0x36fe,0x0000,0x08,0x15,0x00,0x00,0x00,0x41},    */    /* 1400x1050x8 - 650/LVDS BIOS */
 	{0x27,0x0e7d,0x0c15,0x36fe,0x0000,0x08,0x15,0x00,0x00,0x00,0x41},          /* 1400x1050x16 */
 	{0x28,0x0eff,0x0c15,0x36fe,0x0000,0x08,0x15,0x00,0x00,0x00,0x41},          /* 1400x1050x32*/
+	{0x29,0x0e1b,0x0d16,0x0000,0x0000,0x08,0x16,0x00,0x00,0x00,0x43},    /* TW: NEW 1152x864 - not in BIOS */
+	{0x2a,0x0e3d,0x0d16,0x0000,0x0000,0x08,0x16,0x00,0x00,0x00,0x43},
+	{0x2b,0x0e7f,0x0d16,0x0000,0x0000,0x08,0x16,0x00,0x00,0x00,0x43},
+	{0x39,0x2a1b,0x0b17,0x0000,0x0000,0x08,0x17,0x00,0x00,0x00,0x45},    /* TW: NEW 848x480 - not in BIOS */
+	{0x3b,0x2a3d,0x0b17,0x0000,0x0000,0x08,0x17,0x00,0x00,0x00,0x45},
+	{0x3e,0x2a7f,0x0b17,0x0000,0x0000,0x08,0x17,0x00,0x00,0x00,0x45},
+	{0x3f,0x2a1b,0x0b13,0x0000,0x0000,0x08,0x13,0x00,0x00,0x00,0x47},    /* TW: NEW 856x480 - not in BIOS */
+	{0x42,0x2a3d,0x0b13,0x0000,0x0000,0x08,0x13,0x00,0x00,0x00,0x47},
+	{0x45,0x2a7f,0x0b13,0x0000,0x0000,0x08,0x13,0x00,0x00,0x00,0x47},
+	{0x48,0x2a1b,0x0e18,0x0000,0x0000,0x08,0x18,0x00,0x00,0x00,0x49},    /* TW: NEW 1360x768 - not in BIOS */
+	{0x4b,0x2a3d,0x0e18,0x0000,0x0000,0x08,0x18,0x00,0x00,0x00,0x49},
+	{0x4e,0x2a7f,0x0e18,0x0000,0x0000,0x08,0x18,0x00,0x00,0x00,0x49},
+	{0x4f,0x9a1f,0x0000,0x0000,0x0000,0x08,0x00,0x00,0x00,0x04,0x25},	   /* TW: New 320x200x32 */
+	{0x53,0x9a1f,0x0001,0x0000,0x0000,0x08,0x01,0x00,0x00,0x04,0x26},	   /* TW: New 320x240x32 */
+	{0x54,0xba1f,0x0103,0x0000,0x0000,0x08,0x03,0x00,0x00,0x07,0x27}, 	   /* TW: New 400x300x32 */
 	{0xff,0x0000,0x0000,0x0000,0x0000,0x00,0x00,0x00,0x00,0x00,0x00}
 };
 
@@ -611,33 +618,33 @@
 	{0x0067,0x0f,0x08,0x48,0x6a, 800, 600,0x3a8b}, /* 0x2 */
 	{0x0067,0x10,0x07,0x8b,0x6a, 800, 600,0x3a90}, /* 0x3 */
 	{0x0147,0x11,0x0a,0x00,0x6a, 800, 600,0x3a95}, /* 0x4 */
-	{0x4147,0x12,0x0d,0x00,0x6a, 800, 600,0x3a9a}, /* 0x5 */
-	{0x4047,0x13,0x13,0x00,0x6a, 800, 600,0x3a9f}, /* 0x6 */
-	{0x4047,0x14,0x1c,0x00,0x6a, 800, 600,0x3aa4}, /* 0x7 */
+	{0x0147,0x12,0x0d,0x00,0x6a, 800, 600,0x3a9a}, /* 0x5 - 4147 TW: Test sync change */
+	{0x0047,0x13,0x13,0x00,0x6a, 800, 600,0x3a9f}, /* 0x6 - 4047 */
+	{0x0047,0x14,0x1c,0x00,0x6a, 800, 600,0x3aa4}, /* 0x7 - 4047 */
 /*	{0xc05f,0x05,0x00,0x04,0x2e, 640, 480,0x3a57},    0x8 - TW: Patch for Chrontel 7019  */
 	{0xc85f,0x05,0x00,0x04,0x2e, 640, 480,0x3a57}, /* 0x8 */
 	{0xc067,0x06,0x02,0x04,0x2e, 640, 480,0x3a5c}, /* 0x9 */
 	{0xc067,0x07,0x02,0x47,0x2e, 640, 480,0x3a61}, /* 0xa */
 	{0xc067,0x08,0x03,0x8a,0x2e, 640, 480,0x3a66}, /* 0xb */
-	{0x4047,0x09,0x05,0x00,0x2e, 640, 480,0x3a6b}, /* 0xc */
-	{0x4047,0x0a,0x09,0x00,0x2e, 640, 480,0x3a70}, /* 0xd */
-	{0x4047,0x0b,0x0e,0x00,0x2e, 640, 480,0x3a75}, /* 0xe */
+	{0xc047,0x09,0x05,0x00,0x2e, 640, 480,0x3a6b}, /* 0xc - 4047 */
+	{0xc047,0x0a,0x09,0x00,0x2e, 640, 480,0x3a70}, /* 0xd - 4047 */
+	{0xc047,0x0b,0x0e,0x00,0x2e, 640, 480,0x3a75}, /* 0xe - 4047 */
 	{0xc047,0x0c,0x15,0x00,0x2e, 640, 480,0x3a7a}, /* 0xf */
 	{0x407f,0x04,0x00,0x00,0x2f, 640, 400,0x3a50}, /* 0x10 */
 	{0xc00f,0x3c,0x01,0x06,0x31, 720, 480,0x3b85}, /* 0x11 */
 	{0x000f,0x3d,0x03,0x06,0x32, 720, 576,0x3b8c}, /* 0x12 */
 	{0x0187,0x15,0x06,0x00,0x37,1024, 768,0x3aab}, /* 0x13 */
-	{0xc877,0x16,0x0b,0x06,0x37,1024, 768,0x3ab0}, /* 0x14 301b TV1024x768*/
+	{0xc877,0x16,0x0b,0x06,0x37,1024, 768,0x3ab0}, /* 0x14 */
 	{0xc067,0x17,0x0f,0x49,0x37,1024, 768,0x3ab5}, /* 0x15 */
 	{0x0267,0x18,0x11,0x00,0x37,1024, 768,0x3aba}, /* 0x16 */
 	{0x0047,0x19,0x16,0x8c,0x37,1024, 768,0x3abf}, /* 0x17 */
-	{0x4047,0x1a,0x1b,0x00,0x37,1024, 768,0x3ac4}, /* 0x18 */
-	{0x4047,0x1b,0x1f,0x00,0x37,1024, 768,0x3ac9}, /* 0x19 */
+	{0x0047,0x1a,0x1b,0x00,0x37,1024, 768,0x3ac4}, /* 0x18 - 4047 */
+	{0x0007,0x1b,0x1f,0x00,0x37,1024, 768,0x3ac9}, /* 0x19 - 4047 */
 	{0x0387,0x1c,0x11,0x00,0x3a,1280,1024,0x3adc}, /* 0x1a */
 	{0x0077,0x1d,0x19,0x07,0x3a,1280,1024,0x3ae1}, /* 0x1b */
 	{0x0047,0x1e,0x1e,0x00,0x3a,1280,1024,0x3ae6}, /* 0x1c */
 	{0x0007,0x1f,0x20,0x00,0x3a,1280,1024,0x3aeb}, /* 0x1d */
-	{0x0007,0x20,0x21,0x00,0x3c,1600,1200,0x3af2}, /* 0x1e */
+	{0x0027,0x20,0x21,0x09,0x3c,1600,1200,0x3af2}, /* 0x1e */
 	{0x0007,0x21,0x22,0x00,0x3c,1600,1200,0x3af7}, /* 0x1f */
 	{0x0007,0x22,0x23,0x00,0x3c,1600,1200,0x3afc}, /* 0x20 */
 	{0x0007,0x23,0x25,0x00,0x3c,1600,1200,0x3b01}, /* 0x21 */
@@ -667,14 +674,22 @@
 	{0x0047,0x37,0x16,0x09,0x71,1024, 576,0x3b6d}, /* 0x39 */
 	{0x0057,0x38,0x19,0x0a,0x75,1280, 720,0x3b74}, /* 0x3a */
 	{0x0047,0x39,0x1e,0x0a,0x75,1280, 720,0x3b79}, /* 0x3b */
-	{0x0047,0x3a,0x20,0x0a,0x75,1280, 720,0x3b7e}, /* 0x3c */
-	{0x0027,0x3b,0x19,0x08,0x7c,1280, 960,0x3ad0}, /* 0x3d */
-	{0x0027,0x3b,0x19,0x08,0x7c,1280, 960,0x3ad5}, /* 0x3e */
+	{0x0007,0x3a,0x20,0x0a,0x75,1280, 720,0x3b7e}, /* 0x3c */
+	{0x0067,0x3b,0x19,0x08,0x7c,1280, 960,0x3ad0}, /* 0x3d */
+	{0x0027,0x4c,0x59,0x08,0x7c,1280, 960,0x3ad0}, /* 0x3e */
 	{0xc07f,0x01,0x00,0x06,0x5a, 320, 480,0x3b83}, /* 0x3f */    /* FSTN mode */
-        {0x0077,0x42,0x12,0x07,0x23,1280, 768,0x0000}, /* 0x40 */    /* TW: 650/LVDS/301LVx new mode */
-	{0x0067,0x43,0x4d,0x08,0x26,1400,1050,0x0000}, /* 0x41 */    /* TW: 650/LVDS/301LVx new mode */
-	{0xffff,0x00,0x00,0x00,0x00,0000,0000,0x0000}
-};
+        {0x0077,0x42,0x5b,0x08,0x23,1280, 768,0x0000}, /* 0x40 */    /* TW: 0x5b was 0x12 */
+	{0x0067,0x43,0x4d,0x08,0x26,1400,1050,0x0000}, /* 0x41 */  
+	{0x0007,0x4b,0x5a,0x08,0x26,1400,1050,0x0000}, /* 0x42 */    /* TW: new, not in any BIOS */
+	{0x0047,0x44,0x19,0x00,0x29,1152, 864,0x0000}, /* 0x43 TW: Non-BIOS, new */
+	{0x0047,0x4a,0x1e,0x00,0x29,1152, 864,0x0000}, /* 0x44 TW: Non-BIOS, new */
+	{0x00c7,0x45,0x57,0x00,0x39, 848, 480,0x0000}, /* 0x45 TW: 848x480-38Hzi - Non-BIOS, new */
+	{0xc047,0x46,0x55,0x00,0x39, 848, 480,0x0000}, /* 0x46 TW: 848x480-60Hz  - Non-BIOS, new */
+	{0x00c7,0x47,0x57,0x00,0x3f, 856, 480,0x0000}, /* 0x47 TW: 856x480-38Hzi - Non-BIOS, new */
+	{0xc047,0x48,0x57,0x00,0x3f, 856, 480,0x0000}, /* 0x48 TW: 856x480-60Hz  - Non-BIOS, new */
+	{0x0047,0x49,0x58,0x00,0x48,1360, 768,0x0000}, /* 0x49 TW: 1360x768-60Hz - Non-BIOS, new */
+	{0xffff,0x00,0x00,0x00,0x00,   0,   0,0x0000}
+}; 
 
 typedef struct _SiS310_CRT1TableStruct
 {
@@ -698,12 +713,22 @@
  {{0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
    0x9c,0x8e,0x8f,0x96,0xb9,0x30,0x00,0x05,
    0x00}}, /* 0x4 */
+#if 0   
  {{0x5f,0x4f,0x50,0x82,0x55,0x81,0x0b,0x3e,
    0xe9,0x8b,0xdf,0xe7,0x04,0x00,0x00,0x05,
    0x00}}, /* 0x5 */
+#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,
    0xe8,0x8b,0xdf,0xe7,0xff,0x10,0x00,0x01,
    0x00}}, /* 0x6 */
+#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}}, /* 0x7 */
@@ -711,16 +736,16 @@
    0xe0,0x83,0xdf,0xdf,0xfc,0x10,0x00,0x05,
    0x00}}, /* 0x8 */
  {{0x65,0x4f,0x4f,0x89,0x58,0x80,0xfb,0x1f,
-   0xe0,0x83,0xdf,0xdf,0xfc,0x00,0x00,0x05,
+   0xe0,0x83,0xdf,0xdf,0xfc,0x10,0x00,0x05,  /* TW: Corrected VBE */
    0x61}}, /* 0x9 */
  {{0x65,0x4f,0x4f,0x89,0x58,0x80,0x01,0x3e,
    0xe0,0x83,0xdf,0xdf,0x02,0x00,0x00,0x05,
    0x61}}, /* 0xa */
  {{0x67,0x4f,0x4f,0x8b,0x58,0x81,0x0d,0x3e,
-   0xe0,0x83,0xdf,0xdf,0x0e,0x10,0x00,0x05,
+   0xe0,0x83,0xdf,0xdf,0x0e,0x00,0x00,0x05,  /* TW: Corrected VBE */
    0x61}}, /* 0xb */
  {{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}}, /* 0xc */
  {{0x7b,0x63,0x63,0x9f,0x6a,0x93,0x6f,0xf0,
    0x58,0x8a,0x57,0x57,0x70,0x20,0x00,0x05,
@@ -848,7 +873,7 @@
  {{0x9f,0x7f,0x7f,0x83,0x85,0x91,0x1e,0xf1,
    0xad,0x81,0x3f,0x3f,0x1f,0x30,0x00,0x02,
    0x01}}, /* 0x36 */
- {{0xa7,0x7f,0x7f,0x88,0x89,0x15,0x26,0xf1,
+ {{0xa7,0x7f,0x7f,0x88,0x89,0x95,0x26,0xf1,   /* TW: 95 was 15 - illegal HBE! */
    0xb1,0x85,0x3f,0x3f,0x27,0x30,0x00,0x02,
    0x01}}, /* 0x37 */
  {{0xce,0x9f,0x9f,0x92,0xa9,0x17,0x28,0xc4,
@@ -860,9 +885,14 @@
  {{0xd3,0x9f,0x9f,0x97,0xab,0x1f,0x2e,0xd4,
    0x7d,0x81,0xcf,0xcf,0x2f,0x21,0x00,0x07,
    0x01}}, /* 0x3a */
- {{0xdc,0x9f,0x9f,0x00,0xab,0x19,0xe6,0xef,
+#if 0   
+ {{0xdc,0x9f,0x9f,0x00,0xab,0x19,0xe6,0xef,	/* 1280x960 - invalid */
    0xc0,0xc3,0xbf,0xbf,0xe7,0x10,0x00,0x07,
    0x01}}, /* 0x3b */
+#endif  
+ {{0xdc,0x9f,0x9f,0x80,0xaf,0x9d,0xe6,0xff,	/* 1280x960-60 - corrected */
+   0xc0,0x83,0xbf,0xbf,0xe7,0x10,0x00,0x07,
+   0x01}}, /* 0x3b */ 
  {{0x6b,0x59,0x59,0x8f,0x5e,0x8c,0x0b,0x3e,
    0xe9,0x8b,0xdf,0xe7,0x04,0x00,0x00,0x05,
    0x00}}, /* 0x3c */
@@ -875,8 +905,7 @@
  {{0x81,0x6a,0x6a,0x85,0x70,0x00,0x0f,0x3e,
    0xeb,0x8e,0xdf,0xdf,0x10,0x00,0x00,0x02,
    0x00}}, /* 0x3f */
- /* TW: New from 650/LVDS BIOS */
- {{0xa3,0x7f,0x7f,0x87,0x86,0x97,0x1e,0xf1,
+ {{0xa3,0x7f,0x7f,0x87,0x86,0x97,0x1e,0xf1,   /* TW: The following from 650/LVDS BIOS */
    0xae,0x85,0x57,0x57,0x1f,0x30,0x00,0x02,
    0x01}},  /* 0x40 */
  {{0xa3,0x7f,0x7f,0x87,0x86,0x97,0x24,0xf5,
@@ -887,9 +916,37 @@
    0x01}},  /* 0x42 */
  {{0xe6,0xae,0xae,0x8a,0xbd,0x90,0x3d,0x10,
    0x1a,0x8d,0x19,0x19,0x3e,0x2f,0x00,0x03,
-   0x00}}   /* 0x43 */
+   0x00}},  /* 0x43 */
+ {{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}},  /* 0x44 */
+ {{0x86,0x69,0x69,0x8A,0x74,0x06,0x8C,0x15, /* TW: New, 848x480-38i, not in BIOS */
+   0x4F,0x83,0xEF,0xEF,0x8D,0x30,0x00,0x02,
+   0x00}},  /* 0x45 */
+ {{0x83,0x69,0x69,0x87,0x6f,0x1d,0x03,0x3E, /* TW: New, 848x480-60, not in BIOS */
+   0xE5,0x8d,0xDF,0xe4,0x04,0x00,0x00,0x06,
+   0x00}},  /* 0x46 */
+ {{0x86,0x6A,0x6A,0x8A,0x74,0x06,0x8C,0x15, /* TW: New, 856x480-38i, not in BIOS */
+   0x4F,0x83,0xEF,0xEF,0x8D,0x30,0x00,0x02,
+   0x00}},  /* 0x47 */
+ {{0x81,0x6A,0x6A,0x85,0x70,0x00,0x0F,0x3E, /* TW: New, 856x480-60, not in BIOS */
+   0xEB,0x8E,0xDF,0xDF,0x10,0x00,0x00,0x02,
+   0x00}},  /* 0x48 */
+ {{0xdd,0xa9,0xa9,0x81,0xb4,0x97,0x26,0xfd, /* TW: New, 1360x768-60, not in BIOS */
+   0x01,0x8d,0xff,0x00,0x27,0x10,0x00,0x03,
+   0x01}},  /* 0x49 */
+ {{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}},  /* 0x4a */
+ {{0xea,0xae,0xae,0x8e,0xba,0x82,0x40,0x10, /* TW: New, 1400x1050-75, not in any BIOS  */
+   0x1b,0x87,0x19,0x1a,0x41,0x0f,0x00,0x03,
+   0x00}},  /* 0x4b */ 
+ {{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}}   /* 0x4c */
 };
 
+
 typedef struct _SiS310_MCLKDataStruct
 {
 	UCHAR SR28,SR29,SR2A;
@@ -920,6 +977,18 @@
 	{ 0x37,0x22,0x82,133}
 };
 
+static const SiS310_MCLKDataStruct SiS310_MCLKData_0_330[] =   /* @ 0x54 */
+{
+	{ 0x5c,0x23,0x01,166},
+	{ 0x5c,0x23,0x01,166},
+	{ 0x7c,0x08,0x01,200},
+	{ 0x79,0x06,0x01,250},
+	{ 0x7c,0x08,0x01,200},
+	{ 0x7c,0x08,0x01,200},
+	{ 0x7c,0x08,0x01,200},
+	{ 0x79,0x06,0x01,250}
+};
+
 static const SiS310_MCLKDataStruct SiS310_MCLKData_1[] =	/* @ 0x155 */
 {
         { 0x29,0x21,0x82,150},
@@ -1019,7 +1088,6 @@
 	{ 0xa8,0x4c, 30}, /* 0x3e */
 	{ 0x20,0x26, 33}, /* 0x3f */
 	{ 0x31,0xc2, 39}, /* 0x40 */
-	/* TW: 650/LVDS BIOS @ 0x574b new: */
 	{ 0x60,0x36, 30}, /* 0x41 */  /* Chrontel */
 	{ 0x40,0x4a, 28}, /* 0x42 */  /* Chrontel */
 	{ 0x9f,0x46, 44}, /* 0x43 */  /* Chrontel */
@@ -1039,7 +1107,14 @@
 	{ 0x54,0x46, 58}, /* 0x51 */  /* Chrontel */
 	{ 0x25,0x42, 61}, /* 0x52 */
 	{ 0x44,0x44, 66}, /* 0x53 */  /* Chrontel */
-	{ 0x3a,0x62, 70}  /* 0x54 */  /* Chrontel */
+	{ 0x3a,0x62, 70}, /* 0x54 */  /* Chrontel */
+	{ 0x62,0xc6, 34}, /* 0x55 - added for 848x480-60 (not in any BIOS) */
+	{ 0x6a,0xc6, 37}, /* 0x56 - added for 848x480-75 (not in any BIOS)    - TEMP */
+	{ 0xbf,0xc8, 35}, /* 0x57 - added for 856x480-38i,60 (not in any BIOS) */
+	{ 0x30,0x23, 88}, /* 0x58 - added for 1360x768-62 (is 60Hz!) (not in any BIOS) */
+	{ 0x52,0x07,149}, /* 0x59 - added for 1280x960-85 (Not in any BIOS) */
+	{ 0x56,0x07,156}, /* 0x5a - added for 1400x1050-75 */
+	{ 0x7a,0x2a, 81}  /* 0x5b */  /* For 1280x768 LCD mode */
 };
 
 typedef struct _SiS310_VBVCLKDataStruct
@@ -1050,7 +1125,7 @@
 
 static const SiS310_VBVCLKDataStruct SiS310_VBVCLKData[]=
 {
-	{ 0x1b,0xe1, 25}, /* 0x0 */   /* 650/LVDS BIOS: @ 0x579c */
+	{ 0x1b,0xe1, 25}, /* 0x0 */   
 	{ 0x4e,0xe4, 28}, /* 0x1 */
 	{ 0x57,0xe4, 31}, /* 0x2 */
 	{ 0xc3,0xc8, 36}, /* 0x3 */
@@ -1115,20 +1190,41 @@
 	{ 0xa8,0x4c, 30}, /* 0x3e */
 	{ 0x20,0x26, 33}, /* 0x3f */
 	{ 0x31,0xc2, 39}, /* 0x40 */
-	/* TW: 650/LVDS+301 BIOS (@ 0x58a0 in LVDS) new: */
 	{ 0x2e,0x48, 25}, /* 0x41 */
 	{ 0x24,0x46, 25}, /* 0x42 */
 	{ 0x26,0x64, 28}, /* 0x43 */
 	{ 0x37,0x64, 40}, /* 0x44 */
 	{ 0xa1,0x42,108}, /* 0x45 */
 	{ 0x37,0x61,100}, /* 0x46 */
-	{ 0x78,0x27,108}  /* 0x47 */
-	/* --- 0x58bc --- */
-};
-
-static const UCHAR SiS310_ScreenOffset[]=
-         { 0x14,0x19,0x20,0x28,0x32,0x40,
-           0x50,0x64,0x78,0x80,0x2d,0x35,0x57};  /* TW: Added 1400x1050 offset */
+	{ 0x78,0x27,108}, /* 0x47 */
+	{ 0x97,0x2c, 26}, /* 0x48 */  /* UNUSED - Entries from here new, not in any BIOS */
+	{ 0xce,0x3c, 39}, /* 0x49 */  /* UNUSED */
+	{ 0x52,0x4a, 36}, /* 0x4a */  /* UNUSED */
+	{ 0x34,0x61, 95}, /* 0x4b */  /* UNUSED */
+	{ 0x78,0x27,108}, /* 0x4c */  /* UNUSED */
+	{ 0x66,0x43,123}, /* 0x4d */  /* 1400x1050-60 */
+	{ 0x41,0x4e, 21}, /* 0x4e */  /* UNUSED */
+	{ 0xa1,0x4a, 29}, /* 0x4f */  /* UNUSED */
+	{ 0x19,0x42, 42}, /* 0x50 */  /* UNUSED */
+	{ 0x54,0x46, 58}, /* 0x51 */  /* UNUSED */
+	{ 0x25,0x42, 61}, /* 0x52 */  /* UNUSED */
+	{ 0x44,0x44, 66}, /* 0x53 */  /* UNUSED */
+	{ 0x3a,0x62, 70}, /* 0x54 */  /* UNUSED */
+	{ 0x62,0xc6, 34}, /* 0x55 */  /* 848x480-60 */
+	{ 0x6a,0xc6, 37}, /* 0x56 */  /* 848x480-75 - TEMP, UNUSED */
+	{ 0xbf,0xc8, 35}, /* 0x57 */  /* 856x480-38i,60  */
+	{ 0x30,0x23, 88}, /* 0x58 */  /* 1360x768-62 (is 60Hz!) TEMP, UNUSED */
+	{ 0x52,0x07,149}, /* 0x59 */  /* 1280x960-85  - UNUSED */
+	{ 0x56,0x07,156}, /* 0x5a */  /* 1400x1050-75 - UNUSED */
+	{ 0x7a,0x2a, 81}  /* 0x5b */  /* For 1280x768 LCD mode */
+};
+
+static const UCHAR SiS310_ScreenOffset[] = 
+{
+        0x14,0x19,0x20,0x28,0x32,0x40,0x50,0x64,
+	0x78,0x80,0x2d,0x35,0x57,0x48,0x55,
+	0xff
+};      /* TW: Added 1400x1050, 1152x864, 848/856x480, 1360x768 */
 
 typedef struct _SiS310_StResInfoStruct
 {
@@ -1153,7 +1249,7 @@
 	UCHAR  YChar;
 } SiS310_ModeResInfoStruct;
 
-static const SiS310_ModeResInfoStruct SiS310_ModeResInfo[]=
+static const SiS310_ModeResInfoStruct SiS310_ModeResInfo[] =
 {
 	{  320, 200, 8, 8},   /* 0x00 */
 	{  320, 240, 8, 8},   /* 0x01 */
@@ -1174,9 +1270,12 @@
 	{  800, 480, 8,16},   /* 0x10 */
 	{ 1024, 576, 8,16},   /* 0x11 */
 	{ 1280, 720, 8,16},   /* 0x12 */
-	{  856, 480, 8,16},   /* 0x13 19; TW: New */
+	{  856, 480, 8,16},   /* 0x13 - TW: New, not in any BIOS */
 	{ 1280, 768, 8,16},   /* 0x14 20; TW: New */
-	{ 1400,1050, 8,16}    /* 0x15 21; TW: New */
+	{ 1400,1050, 8,16},   /* 0x15 21; TW: New */
+	{ 1152, 864, 8,16},   /* 0x16 - TW: New, not in any BIOS */
+	{  848, 480, 8,16},   /* 0x17 - TW: New, not in any BIOS */
+	{ 1360, 768, 8,16}    /* 0x18 - TW: New, not in any BIOS */
 };
 
 static const UCHAR SiS310_OutputSelect = 0x40;
@@ -1223,7 +1322,7 @@
 static const USHORT SiS310_RGBSenseData    = 0xd1;
 static const USHORT SiS310_VideoSenseData  = 0xb9;
 static const USHORT SiS310_YCSenseData     = 0xb3;
-static const USHORT SiS310_RGBSenseData2   = 0x0190;     /*301b*/
+static const USHORT SiS310_RGBSenseData2   = 0x0190; 
 static const USHORT SiS310_VideoSenseData2 = 0x0174;
 static const USHORT SiS310_YCSenseData2    = 0x016b;
 #endif
@@ -1259,7 +1358,8 @@
 	{    1,   1,1344, 806,1344, 806}
 };
 
-static const SiS310_LCDDataStruct  SiS310_ExtLCD1024x768Data[] =   /* TW: Checked */
+#if 0   /* Seems out-dated, all BIOSes since 03/27/2002 have the other version */
+static const SiS310_LCDDataStruct  SiS310_ExtLCD1024x768Data[] = 
 {
 	{   12,   5, 896, 512,1344, 806},
 	{   12,   5, 896, 510,1344, 806},
@@ -1275,13 +1375,31 @@
 	{   42,  25,1024, 625,1344, 806},
 	{    1,   1,1344, 806,1344, 806}
 };
+#endif
+
+static const SiS310_LCDDataStruct  SiS310_ExtLCD1024x768Data[] =   
+{
+	{   42,  25,1536, 419,1344, 806},
+	{   48,  25,1536, 369,1344, 806},
+	{   42,  25,1536, 419,1344, 806},
+	{   48,  25,1536, 369,1344, 806},
+	{   12,   5, 896, 500,1344, 806},
+	{   42,  25,1024, 625,1344, 806},
+	{    1,   1,1344, 806,1344, 806},
+	{   12,   5, 896, 500,1344, 806},
+	{   42,  25,1024, 625,1344, 806},
+	{    1,   1,1344, 806,1344, 806},
+	{   12,   5, 896, 500,1344, 806},
+	{   42,  25,1024, 625,1344, 806},
+	{    1,   1,1344, 806,1344, 806}
+	 
+};
 
-static const SiS310_LCDDataStruct  SiS310_St2LCD1024x768Data[] =  /* TW: Checked */
+static const SiS310_LCDDataStruct  SiS310_St2LCD1024x768Data[] =  
 {
 	{   62,  25, 800, 546,1344, 806},
 	{   32,  15, 930, 546,1344, 806},
-/*	{   32,  15, 930, 546,1344, 806},   */
-        {   62,  25, 800, 546,1344, 806},    /* TW: Different in 650/301LV BIOS */
+        {   62,  25, 800, 546,1344, 806},    
 	{  104,  45, 945, 496,1344, 806},
 	{   62,  25, 800, 546,1344, 806},
 	{   31,  18,1008, 624,1344, 806},
@@ -1300,7 +1418,7 @@
 	{    1,   1,1688,1066,1688,1066}
 };
 
-static const SiS310_LCDDataStruct  SiS310_ExtLCD1280x1024Data[] =  /* TW: Checked */
+static const SiS310_LCDDataStruct  SiS310_ExtLCD1280x1024Data[] = 
 {
 	{  211,  60,1024, 501,1688,1066},
 	{  211,  60,1024, 508,1688,1066},
@@ -1309,7 +1427,8 @@
 	{  211,  60,1024, 500,1688,1066},
 	{  211,  75,1024, 625,1688,1066},
 	{  211, 120,1280, 798,1688,1066},
-	{    1,   1,1688,1066,1688,1066}
+	{    1,   1,1688,1066,1688,1066},
+	{    1,   1,1800,1000,1688,1066}  /* 1280x960 - does not work, use panel scaler instead */
 };
 
 static const SiS310_LCDDataStruct  SiS310_St2LCD1280x1024Data[] =
@@ -1324,29 +1443,19 @@
 	{    1,   1,1688,1066,1688,1066}
 };
 
-static const SiS310_LCDDataStruct  SiS310_NoScaleData1024x768[] =  /* TW: Checked */
+static const SiS310_LCDDataStruct  SiS310_NoScaleData1024x768[] =  
 {
         {    1,   1,1344, 806,1344, 806},
 	{    1,   1,1344, 806,1344, 806},
 	{    1,   1,1344, 806,1344, 806},
-	{    1,   1,1344, 806,1344, 806},
-	{    1,   1,1344, 806,1344, 806},
+	{    1,   1,1344, 806,1344, 806},  /* 640x400 - does not work */
+	{    1,   1,1344, 806,1344, 806},  /* 640x480 - does not work */
 	{    1,   1,1344, 806,1344, 806},
 	{    1,   1,1344, 806,1344, 806},
 	{    1,   1,1344, 806,1344, 806}
-#if 0
-	{    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}
-#endif
 };
 
-static const SiS310_LCDDataStruct  SiS310_NoScaleData1280x1024[] =  /* TW: New; Checked */
+static const SiS310_LCDDataStruct  SiS310_NoScaleData1280x1024[] =  
 {
         {    1,   1,1688,1066,1688,1066},
 	{    1,   1,1688,1066,1688,1066},
@@ -1355,6 +1464,7 @@
 	{    1,   1,1688,1066,1688,1066},
 	{    1,   1,1688,1066,1688,1066},
 	{    1,   1,1688,1066,1688,1066},
+	{    1,   1,1688,1066,1688,1066},
 	{    1,   1,1688,1066,1688,1066}
 };
 
@@ -1371,88 +1481,121 @@
 	{    1,   1,1800,1000,1800,1000}
 };
 
-static const SiS310_LCDDataStruct  SiS310_ExtLCD1400x1050Data[] =  /* TW: New */
-{  /* TODO */
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0}
-};
-
-static const SiS310_LCDDataStruct  SiS310_ExtLCD1600x1200Data[] =  /* TW: New */
-{  /* TODO */
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0}
-};
-
-static const SiS310_LCDDataStruct  SiS310_StLCD1400x1050Data[] =  /* TW: New */
-{  /* TODO */
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0}
+static const SiS310_LCDDataStruct  SiS310_StLCD1400x1050Data[] =
+{  /* TW: New from 1.11.6s */
+	{ 211,  100, 2100,  408, 1688, 1066 },
+	{ 211,   64, 1536,  358, 1688, 1066 },
+	{ 211,  100, 2100,  408, 1688, 1066 },
+	{ 211,   64, 1536,  358, 1688, 1066 },
+	{ 211,   48,  840,  488, 1688, 1066 },
+	{ 211,   72, 1008,  609, 1688, 1066 },
+	{ 211,  128, 1400,  776, 1688, 1066 },
+	{ 211,  205, 1680, 1041, 1688, 1066 },
+	{   1,    1, 1688, 1066, 1688, 1066 }
+};
+
+static const SiS310_LCDDataStruct  SiS310_ExtLCD1400x1050Data[] =
+{  /* TW: New from 1.11.6s */
+	{ 211,  100, 2100,  408, 1688, 1066 },
+	{ 211,   64, 1536,  358, 1688, 1066 },
+	{ 211,  100, 2100,  408, 1688, 1066 },
+	{ 211,   64, 1536,  358, 1688, 1066 },
+	{ 211,   48,  840,  488, 1688, 1066 },
+	{ 211,   72, 1008,  609, 1688, 1066 },
+	{ 211,  128, 1400,  776, 1688, 1066 },
+	{ 211,  205, 1680, 1041, 1688, 1066 },
+	{   1,    1, 1688, 1066, 1688, 1066 }
+};
+
+static const SiS310_LCDDataStruct  SiS310_NoScaleData1400x1050[] =
+{  /* TW: To be checked (BIOS uses 1280x1024 data, one line too short) */
+	{ 1, 1, 1688, 1066, 1688, 1066 },
+	{ 1, 1, 1688, 1066, 1688, 1066 },
+	{ 1, 1, 1688, 1066, 1688, 1066 },
+	{ 1, 1, 1688, 1066, 1688, 1066 },
+	{ 1, 1, 1688, 1066, 1688, 1066 },
+	{ 1, 1, 1688, 1066, 1688, 1066 },
+	{ 1, 1, 1688, 1066, 1688, 1066 },
+	{ 1, 1, 1688, 1066, 1688, 1066 },
+	{ 1, 1, 1688, 1066, 1688, 1066 }
 };
 
-static const SiS310_LCDDataStruct  SiS310_StLCD1600x1200Data[] =  /* TW: New */
+static const SiS310_LCDDataStruct  SiS310_StLCD1600x1200Data[] =
 {  /* TODO */
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
 	{    0,   0,   0,   0,   0,   0}
 };
 
-static const SiS310_LCDDataStruct  SiS310_NoScaleData1400x1050[] =  /* TW: New */
+static const SiS310_LCDDataStruct  SiS310_ExtLCD1600x1200Data[] = 
 {  /* TODO */
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
 	{    0,   0,   0,   0,   0,   0}
 };
 
-static const SiS310_LCDDataStruct  SiS310_NoScaleData1600x1200[] =  /* TW: New */
-{  /* TODO */
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0},
-	{    0,   0,   0,   0,   0,   0}
+static const SiS310_LCDDataStruct  SiS310_NoScaleData1600x1200[] = 
+{  /* TODO - values guessed */
+        {1,  1, 2048, 1250, 2048, 1250},
+	{1,  1, 2048, 1250, 2048, 1250},
+	{1,  1, 2048, 1250, 2048, 1250},
+	{1,  1, 2048, 1250, 2048, 1250},
+	{1,  1, 2048, 1250, 2048, 1250},
+	{1,  1, 2048, 1250, 2048, 1250},
+	{1,  1, 2048, 1250, 2048, 1250},
+	{1,  1, 2048, 1250, 2048, 1250},
+	{1,  1, 2048, 1250, 2048, 1250},
+	{1,  1, 2048, 1250, 2048, 1250}
+};
+
+static const SiS310_LCDDataStruct  SiS310_StLCD1280x768Data[] =
+{
+	{ 211,  100, 2100,  408, 1408,  806 }, /* These values are *wrong* */
+	{ 211,   64, 1536,  358, 1408,  806 },
+	{ 211,  100, 2100,  408, 1408,  806 },
+	{ 211,   64, 1536,  358, 1408,  806 },
+	{ 211,   48,  840,  488, 1408,  806 },
+	{ 211,   72, 1008,  609, 1408,  806 },
+	{ 211,  128, 1400,  776, 1408,  806 },
+	{ 211,  205, 1680, 1041, 1408,  806 },
+	{ 1,      1, 1408,  806, 1408,  806 }  /* That's the only one that *might* be correct */
+};
+
+static const SiS310_LCDDataStruct  SiS310_ExtLCD1280x768Data[] =
+{
+	{ 211,  100, 2100,  408, 1408,  806 }, /* These values are *wrong* */
+	{ 211,   64, 1536,  358, 1408,  806 },
+	{ 211,  100, 2100,  408, 1408,  806 },
+	{ 211,   64, 1536,  358, 1408,  806 },
+	{ 211,   48,  840,  488, 1408,  806 },
+	{ 211,   72, 1008,  609, 1408,  806 },
+	{ 211,  128, 1400,  776, 1408,  806 },
+	{ 211,  205, 1680, 1041, 1408,  806 },
+	{ 1,      1, 1408,  806, 1408,  806 }  /* That's the only one that *might* be correct */
+};
+
+static const SiS310_LCDDataStruct  SiS310_NoScaleData1280x768[] =
+{  /* All values guessed */
+        { 1, 1, 1408,  806, 1408,  806},
+	{ 1, 1, 1408,  806, 1408,  806},
+	{ 1, 1, 1408,  806, 1408,  806},
+	{ 1, 1, 1408,  806, 1408,  806},
+	{ 1, 1, 1408,  806, 1408,  806},
+	{ 1, 1, 1408,  806, 1408,  806},
+	{ 1, 1, 1408,  806, 1408,  806},
+	{ 1, 1, 1408,  806, 1408,  806},
+	{ 1, 1, 1408,  806, 1408,  806}
+};
+
+static const SiS310_LCDDataStruct  SiS310_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,1688, 791,1688, 791 },  /* 1280x768: 791 was 860 in both cases */
+        { 1, 1,2048,1250,2048,1250 },  /* 1600x1200 (guessed) */
+	{ 1, 1,1800,1000,1800,1000 }   /* 1280x960 */
 };
 
 typedef struct _SiS310_TVDataStruct
@@ -1482,16 +1625,16 @@
  {    1,   1, 864, 525,1270, 600,  50,   0,   0,0xf4,0xff,0x1c,0x22}
 };
 
-static const SiS310_TVDataStruct  SiS310_ExtPALData[]=
+static const SiS310_TVDataStruct  SiS310_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},
  {   12,   5, 954, 448,1270, 530,  50,   0,  50,0xf1,0x04,0x1f,0x18},
  {    9,   4, 960, 463,1644, 438,  50,   0,  50,0xf4,0x0b,0x1c,0x0a},
- {    9,   4, 848, 528,1270, 530,   0,   0,  50,0xf5,0xfb,0x1b,0x2a},
+ {    9,   4, 848, 528,1270, 530,   0,   0,  50,0xf5,0xfb,0x1b,0x2a},  /* 640x480 */
  {   36,  25,1060, 648,1316, 530, 438,   0, 438,0xeb,0x05,0x25,0x16},  /* 800x600 */
- {    3,   2,1080, 619,1270, 540, 438,   0, 438,0xf3,0x00,0x1d,0x20},
- {    1,   1,1170, 821,1270, 520, 686,   0, 686,0xF3,0x00,0x1D,0x20}     /*301b*/
+ {    3,   2,1080, 619,1270, 540, 438,   0, 438,0xf3,0x00,0x1d,0x20},  /* 720x480/576 */
+ {    1,   1,1170, 821,1270, 520, 686,   0, 686,0xF3,0x00,0x1D,0x20}   /* 1024x768 */
 };
 
 static const SiS310_TVDataStruct  SiS310_StNTSCData[]=
@@ -1509,29 +1652,45 @@
  {   88,  35, 858, 393,1270, 440, 171,   0, 171,0xf1,0x04,0x1f,0x18},
  {  143,  70, 924, 443,1270, 440,  92,   0,  92,0xf1,0x04,0x1f,0x18},
  {  143,  70, 924, 393,1270, 440,  92,   0,  92,0xf4,0x0b,0x1c,0x0a},
- {  143,  76, 836, 523,1270, 440, 224,   0,   0,0xf1,0x05,0x1f,0x16},
- {  143, 120,1056, 643,1270, 440,   0, 128,   0,0xf4,0x10,0x1c,0x00},  /* 800x600 */
- {    2,   1, 858, 503,1270, 480,   0, 128,   0,0xee,0x0c,0x22,0x08},
- {   65,  64,1056, 791,1270, 480, 638,   0,   0,0xEE,0x0C,0x22,0x08} /*301b*/     
+ {  143,  76, 836, 523,1270, 440, 224,   0,   0,0xf1,0x05,0x1f,0x16},  /* 640x480 */
+ {  143, 120,1056, 643,1270, 440,   0, 128,   0,0xf4,0x10,0x1c,0x00},  /* 800x600  */
+ {    2,   1, 858, 503,1270, 480,   0, 128,   0,0xee,0x0c,0x22,0x08},  /* 720x480/576 */
+ {   65,  64,1056, 791,1270, 480, 638,   0,   0,0xEE,0x0C,0x22,0x08}   /* 1024x768 */
 };
 
-/* TW: These tables will need data ! */
+#if 0
 static const SiS310_TVDataStruct  SiS310_St1HiTVData[]=
 {
-   	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}
+  
 };
+#endif
 
 static const SiS310_TVDataStruct  SiS310_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 SiS310_TVDataStruct  SiS310_ExtHiTVData[]=
 {
-	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}
+ {    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 UCHAR SiS310_NTSCTiming[] = {   /* TW: New (checked 1.09, 1.10.6s) */
+static const UCHAR SiS310_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,
@@ -1542,7 +1701,7 @@
 	0x00,0x40,0x44,0x00,0xdb,0x02,0x3b,0x00
 };
 
-static const UCHAR SiS310_PALTiming[] = {   /* TW: New (checked 1.09, 1.10.6s) */
+static const UCHAR SiS310_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,
@@ -1553,8 +1712,7 @@
 	0x00,0x40,0x3e,0x00,0xe1,0x02,0x28,0x00
 };
 
-#ifdef oldHV
-static const UCHAR SiS310_HiTVExtTiming[] = {   /* TW: New */
+static const UCHAR SiS310_HiTVExtTiming[] = {  
         0x32,0x65,0x2c,0x5f,0x08,0x31,0x3a,0x64,
 	0x28,0x02,0x01,0x3d,0x06,0x3e,0x35,0x6d,
 	0x06,0x14,0x3e,0x35,0x6d,0x00,0xc5,0x3f,
@@ -1565,7 +1723,7 @@
 	0x63,0x4f,0x27,0x00,0xfc,0xff,0x6a,0x00
 };
 
-static const UCHAR SiS310_HiTVSt1Timing[] = {   /* TW: New */
+static const UCHAR SiS310_HiTVSt1Timing[] = {  
         0x32,0x65,0x2c,0x5f,0x08,0x31,0x3a,0x65,
 	0x28,0x02,0x01,0x3d,0x06,0x3e,0x35,0x6d,
 	0x06,0x14,0x3e,0x35,0x6d,0x00,0xc5,0x3f,
@@ -1576,7 +1734,7 @@
 	0xaf,0x5d,0x0e,0x00,0xfc,0xff,0x2d,0x00
 };
 
-static const UCHAR SiS310_HiTVSt2Timing[] = {   /* TW: New */
+static const UCHAR SiS310_HiTVSt2Timing[] = {  
         0x32,0x65,0x2c,0x5f,0x08,0x31,0x3a,0x64,
 	0x28,0x02,0x01,0x3d,0x06,0x3e,0x35,0x6d,
 	0x06,0x14,0x3e,0x35,0x6d,0x00,0xc5,0x3f,
@@ -1587,7 +1745,7 @@
 	0x63,0x4f,0x27,0x00,0xfc,0xff,0x6a,0x00
 };
 
-static const UCHAR SiS310_HiTVTextTiming[] = {   /* TW: New */
+static const UCHAR SiS310_HiTVTextTiming[] = {  
         0x32,0x65,0x2c,0x5f,0x08,0x31,0x3a,0x65,
 	0x28,0x02,0x01,0x3d,0x06,0x3e,0x35,0x6d,
 	0x06,0x14,0x3e,0x35,0x6d,0x00,0xc5,0x3f,
@@ -1598,7 +1756,7 @@
 	0x72,0x5c,0x11,0x00,0xfc,0xff,0x32,0x00
 };
 
-static const UCHAR SiS310_HiTVGroup3Data[] = {   /* TW: New */
+static const UCHAR SiS310_HiTVGroup3Data[] = {  
         0x00,0x1a,0x22,0x63,0x62,0x22,0x08,0x5f,
 	0x05,0x21,0xb2,0xb2,0x55,0x77,0x2a,0xa6,
 	0x25,0x2f,0x47,0xfa,0xc8,0xff,0x8e,0x20,
@@ -1609,7 +1767,7 @@
 	0x18,0x05,0x18,0x05,0x4c,0xa8,0x01
 };
 
-static const UCHAR SiS310_HiTVGroup3Simu[] = {   /* TW: New */
+static const UCHAR SiS310_HiTVGroup3Simu[] = {  
         0x00,0x1a,0x22,0x63,0x62,0x22,0x08,0x95,
 	0xdb,0x20,0xb8,0xb8,0x55,0x47,0x2a,0xa6,
 	0x25,0x2f,0x47,0xfa,0xc8,0xff,0x8e,0x20,
@@ -1620,7 +1778,7 @@
 	0x18,0x05,0x18,0x05,0x4c,0xa8,0x01
 };
 
-static const UCHAR SiS310_HiTVGroup3Text[] = {   /* TW: New */
+static const UCHAR SiS310_HiTVGroup3Text[] = {  
         0x00,0x1a,0x22,0x63,0x62,0x22,0x08,0xa7,
 	0xf5,0x20,0xce,0xce,0x55,0x47,0x2a,0xa6,
 	0x25,0x2f,0x47,0xfa,0xc8,0xff,0x8e,0x20,
@@ -1630,14 +1788,13 @@
 	0x01,0x05,0x03,0x7e,0x65,0x31,0x14,0x75,
 	0x18,0x05,0x18,0x05,0x4c,0xa8,0x01
 };
-#endif
 
 typedef struct _SiS310_PanelDelayTblStruct
 {
  	UCHAR timer[2];
 } SiS310_PanelDelayTblStruct;
 
-static const SiS310_PanelDelayTblStruct SiS310_PanelDelayTbl[]=  /* TW: New */
+static const SiS310_PanelDelayTblStruct SiS310_PanelDelayTbl[]=  
 {
         {{0x10,0x40}},		/* TW: from 650/301LVx 1.10.6s BIOS */
 	{{0x10,0x40}},
@@ -1705,31 +1862,31 @@
 
 static const SiS310_LVDSDataStruct  SiS310_LVDS320x480Data_1[]=
 {
-	{848, 433,400, 525},
-	{848, 389,400, 525},
-	{848, 433,400, 525},
-	{848, 389,400, 525},
-	{848, 518,400, 525},
-	{1056,628,400, 525},
-	{400, 525,400, 525},
-	{800, 449,1000, 644},
-	{800, 525,1000, 635}
-};
-
-static const SiS310_LVDSDataStruct  SiS310_LVDS800x600Data_1[]=   /* TW: New */
-{
-	{848, 433,1060, 629},
-	{848, 389,1060, 629},
-	{848, 433,1060, 629},
-	{848, 389,1060, 629},
-	{848, 518,1060, 629},
+	{ 848, 433, 400, 525},
+	{ 848, 389, 400, 525},
+	{ 848, 433, 400, 525},
+	{ 848, 389, 400, 525},
+	{ 848, 518, 400, 525},
+	{1056, 628, 400, 525},
+	{ 400, 525, 400, 525},
+	{ 800, 449,1000, 644},
+	{ 800, 525,1000, 635}
+};
+
+static const SiS310_LVDSDataStruct  SiS310_LVDS800x600Data_1[]= 
+{
+	{ 848, 433,1060, 629},
+	{ 848, 389,1060, 629},
+	{ 848, 433,1060, 629},
+	{ 848, 389,1060, 629},
+	{ 848, 518,1060, 629},
 	{1056, 628,1056, 628},
 	{1056, 628,1056, 628},
-	{800, 449,1000, 644},
-	{800, 525,1000, 635}
+	{ 800, 449,1000, 644},
+	{ 800, 525,1000, 635}
 };
 
-static const SiS310_LVDSDataStruct  SiS310_LVDS800x600Data_2[]=   /* TW: New */
+static const SiS310_LVDSDataStruct  SiS310_LVDS800x600Data_2[]=  
 {
 	{1056, 628,1056, 628},
 	{1056, 628,1056, 628},
@@ -1738,24 +1895,24 @@
 	{1056, 628,1056, 628},
 	{1056, 628,1056, 628},
 	{1056, 628,1056, 628},
-	{800, 449,1000, 644},
-	{800, 525,1000, 635}
+	{ 800, 449,1000, 644},
+	{ 800, 525,1000, 635}
 };
 
-static const SiS310_LVDSDataStruct  SiS310_LVDS1024x768Data_1[]=   /* TW: New */
+static const SiS310_LVDSDataStruct  SiS310_LVDS1024x768Data_1[]=  
 {
-	{840, 438,1344, 806},
-	{840, 409,1344, 806},
-	{840, 438,1344, 806},
-	{840, 409,1344, 806},
-	{840, 518,1344, 806},    /* 640x480 */
+	{ 840, 438,1344, 806},
+	{ 840, 409,1344, 806},
+	{ 840, 438,1344, 806},
+	{ 840, 409,1344, 806},
+	{ 840, 518,1344, 806},   /* 640x480 */
 	{1050, 638,1344, 806},   /* 800x600 */
 	{1344, 806,1344, 806},   /* 1024x768 */
-	{800, 449,1280, 801},
-	{800, 525,1280, 813}
+	{ 800, 449,1280, 801},
+	{ 800, 525,1280, 813}
 };
 
-static const SiS310_LVDSDataStruct  SiS310_LVDS1024x768Data_2[]=   /* TW: New */
+static const SiS310_LVDSDataStruct  SiS310_LVDS1024x768Data_2[]= 
 {
 	{1344, 806,1344, 806},
 	{1344, 806,1344, 806},
@@ -1764,50 +1921,48 @@
 	{1344, 806,1344, 806},
 	{1344, 806,1344, 806},
 	{1344, 806,1344, 806},
-	{800, 449,1280, 801},
-	{800, 525,1280, 813}
+	{ 800, 449,1280, 801},
+	{ 800, 525,1280, 813}
 };
 
-static const SiS310_LVDSDataStruct  SiS310_LVDS1280x1024Data_1[]=   /* TW: New */
-{
-	{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 SiS310_LVDSDataStruct  SiS310_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 SiS310_LVDSDataStruct  SiS310_LVDS1280x1024Data_2[]=   /* TW: New */
-{
-	{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 SiS310_LVDSDataStruct  SiS310_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 SiS310_LVDSDataStruct  SiS310_LVDS1400x1050Data_1[]=   /* TW: New */
+static const SiS310_LVDSDataStruct  SiS310_LVDS1400x1050Data_1[]=  
 {
-        {928, 416, 1688, 1066},
-	{928, 366, 1688, 1066},
-	{928, 416, 1688, 1066},
-	{928, 366, 1688, 1066},
-	{928, 496, 1688, 1066},
-	{1088, 616, 1688, 1066},
-	{1312, 784, 1688, 1066},
-	{1568, 1040, 1688, 1066},
-	{1688, 1066, 1688, 1066}
+        { 928, 416, 1688,1066},
+	{ 928, 366, 1688,1066},
+	{ 928, 416, 1688,1066},
+	{ 928, 366, 1688,1066},
+	{ 928, 496, 1688,1066},
+	{1088, 616, 1688,1066},
+	{1312, 784, 1688,1066},
+	{1568,1040, 1688,1066},
+	{1688,1066, 1688,1066}
 };
 
-static const SiS310_LVDSDataStruct  SiS310_LVDS1400x1050Data_2[]=   /* TW: New */
+static const SiS310_LVDSDataStruct  SiS310_LVDS1400x1050Data_2[]= 
 {
         {1688,1066, 1688,1066},
 	{1688,1066, 1688,1066},
@@ -1820,102 +1975,154 @@
 	{1688,1066, 1688,1066},
 };
 
-/* TW: New: - from 300 series */
+static const SiS310_LVDSDataStruct  SiS310_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 SiS310_LVDSDataStruct  SiS310_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 SiS310_LVDSDataStruct  SiS310_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 SiS310_LVDSDataStruct  SiS310_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 SiS310_LVDSDataStruct  SiS310_LVDS1024x600Data_1[]=
 {
-	{840, 604,1344, 800},
-	{840, 560,1344, 800},
-	{840, 604,1344, 800},
-	{840, 560,1344, 800},
-	{840, 689,1344, 800},
-	{1050, 800,1344, 800},
-	{1344, 800,1344, 800},
-	{800, 449,1280, 801},
-	{800, 525,1280, 813}
+	{ 840, 604, 1344, 800},
+	{ 840, 560, 1344, 800},
+	{ 840, 604, 1344, 800},
+	{ 840, 560, 1344, 800},
+	{ 840, 689, 1344, 800},
+	{1050, 800, 1344, 800},
+	{1344, 800, 1344, 800},
+	{ 800, 449, 1280, 801},
+	{ 800, 525, 1280, 813}
 };
 
-/* TW: New: - from 300 series */
 static const SiS310_LVDSDataStruct  SiS310_LVDS1024x600Data_2[]=
 {
-	{1344, 800,1344, 800},
-	{1344, 800,1344, 800},
-	{1344, 800,1344, 800},
-	{1344, 800,1344, 800},
-	{1344, 800,1344, 800},
-	{1344, 800,1344, 800},
-	{1344, 800,1344, 800},
-	{800, 449,1280, 801},
-	{800, 525,1280, 813}
+	{1344, 800, 1344, 800},
+	{1344, 800, 1344, 800},
+	{1344, 800, 1344, 800},
+	{1344, 800, 1344, 800},
+	{1344, 800, 1344, 800},
+	{1344, 800, 1344, 800},
+	{1344, 800, 1344, 800},
+	{ 800, 449, 1280, 801},
+	{ 800, 525, 1280, 813}
 };
 
-/* TW: New: - from 300 series */
 static const SiS310_LVDSDataStruct  SiS310_LVDS1152x768Data_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}
+	{ 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}
 };
 
-/* TW: New: - from 300 series */
 static const SiS310_LVDSDataStruct  SiS310_LVDS1152x768Data_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}
+	{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}
+};
+
+/* TW: Pass 1:1 data */
+static const SiS310_LVDSDataStruct  SiS310_LVDSXXXxXXXData_1[]=  
+{
+        { 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 ! */
 };
 
-/* TW: New in 650/LVDS BIOS - pass 1:1 data */
-static const SiS310_LVDSDataStruct  SiS310_LVDSXXXxXXXData_1[]=   /* TW: New */
+static const SiS310_LVDSDataStruct  SiS310_LVDS640x480Data_1[]=  
 {
-        { 800, 449, 800, 449},
 	{ 800, 449, 800, 449},
-	{ 900, 449, 900, 449},
-	{ 900, 449, 900, 449},
+	{ 800, 449, 800, 449},
+	{ 800, 449, 800, 449},
+	{ 800, 449, 800, 449},
 	{ 800, 525, 800, 525},
 	{1056, 628,1056, 628},
-	{1344, 806,1344, 806},
-	{1688, 806,1688, 806}
-};
-
-static const SiS310_LVDSDataStruct  SiS310_LVDS640x480Data_1[]=   /* TW: New */
-{
-	{800, 449, 800, 449},
-	{800, 449, 800, 449},
-	{800, 449, 800, 449},
-	{800, 449, 800, 449},
-	{800, 525, 800, 525},
-	{1056, 628,1056, 628},
 	{1056, 628,1056, 628},
 	{1056, 628,1056, 628},
 	{1056, 628,1056, 628}
 };
 
-static const SiS310_LVDSDataStruct  SiS310_LVDS1280x960Data_1[]=   /* TW: New */
+static const SiS310_LVDSDataStruct  SiS310_LVDS1280x960Data_1[]=   
 {
-	{840, 438,1344, 806},
-	{840, 409,1344, 806},
-	{840, 438,1344, 806},
-	{840, 409,1344, 806},
-	{840, 518,1344, 806},
+	{ 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}
+	{ 800, 449,1280, 801},
+	{ 800, 525,1280, 813}
 };
 
-static const SiS310_LVDSDataStruct  SiS310_LVDS1280x960Data_2[]=   /* TW: New */
+static const SiS310_LVDSDataStruct  SiS310_LVDS1280x960Data_2[]=  
 {
 	{1344, 806,1344, 806},
 	{1344, 806,1344, 806},
@@ -1924,24 +2131,26 @@
 	{1344, 806,1344, 806},
 	{1344, 806,1344, 806},
 	{1344, 806,1344, 806},
-	{800, 449,1280, 801},
-	{800, 525,1280, 813}
+	{ 800, 449,1280, 801},
+	{ 800, 525,1280, 813}
 };
 
-static const SiS310_LVDSDataStruct  SiS310_LCDA1400x1050Data_1[]=   /* TW: New */
+/* LCDA */
+
+static const SiS310_LVDSDataStruct  SiS310_LCDA1400x1050Data_1[]=   
 {	/* TW: Might be temporary (invalid) data */
-        {928, 416, 1688, 1066},
-	{928, 366, 1688, 1066},
-	{1008, 416, 1688, 1066},
-	{1008, 366, 1688, 1066},
-	{1200, 530, 1688, 1066},
-	{1088, 616, 1688, 1066},
-	{1312, 784, 1688, 1066},
-	{1568, 1040, 1688, 1066},
-	{1688, 1066, 1688, 1066}
+        { 928, 416, 1688,1066},
+	{ 928, 366, 1688,1066},
+	{1008, 416, 1688,1066},
+	{1008, 366, 1688,1066},
+	{1200, 530, 1688,1066},
+	{1088, 616, 1688,1066},
+	{1312, 784, 1688,1066},
+	{1568,1040, 1688,1066},
+	{1688,1066, 1688,1066}
 };
 
-static const SiS310_LVDSDataStruct  SiS310_LCDA1400x1050Data_2[]=   /* TW: New */
+static const SiS310_LVDSDataStruct  SiS310_LCDA1400x1050Data_2[]=   
 {	/* TW: Temporary data. Not valid */
 	{1344, 806,1344, 806},
 	{1344, 806,1344, 806},
@@ -1950,11 +2159,11 @@
 	{1344, 806,1344, 806},
 	{1344, 806,1344, 806},
 	{1344, 806,1344, 806},
-	{800, 449,1280, 801},
-	{800, 525,1280, 813}
+	{ 800, 449,1280, 801},
+	{ 800, 525,1280, 813}
 };
 
-static const SiS310_LVDSDataStruct  SiS310_LCDA1600x1200Data_1[]=   /* TW: New */
+static const SiS310_LVDSDataStruct  SiS310_LCDA1600x1200Data_1[]=  
 {	/* TW: Temporary data. Not valid */
 	{1344, 806,1344, 806},
 	{1344, 806,1344, 806},
@@ -1963,11 +2172,11 @@
 	{1344, 806,1344, 806},
 	{1344, 806,1344, 806},
 	{1344, 806,1344, 806},
-	{800, 449,1280, 801},
-	{800, 525,1280, 813}
+	{ 800, 449,1280, 801},
+	{ 800, 525,1280, 813}
 };
 
-static const SiS310_LVDSDataStruct  SiS310_LCDA1600x1200Data_2[]=   /* TW: New */
+static const SiS310_LVDSDataStruct  SiS310_LCDA1600x1200Data_2[]=  
 {	/* TW: Temporary data. Not valid */
 	{0, 0, 0, 0},
 	{0, 0, 0, 0},
@@ -1983,7 +2192,53 @@
 	{0, 0, 0, 0}
 };
 
-static const SiS310_LVDSDataStruct  SiS310_CHTVUNTSCData[]=   /* TW: New */
+/* Chrontel TV */
+
+static const SiS310_LVDSDataStruct  SiS310_CHTVUNTSCData[]=   
+{
+	{ 840, 600, 840, 600},
+	{ 840, 600, 840, 600},
+	{ 840, 600, 840, 600},
+	{ 840, 600, 840, 600},
+	{ 784, 600, 784, 600},
+	{1064, 750,1064, 750},
+        {1160, 945,1160, 945}           /* TW: For Ch7019 1024 */
+};
+
+static const SiS310_LVDSDataStruct  SiS310_CHTVONTSCData[]=   
+{
+	{ 840, 525, 840, 525},
+	{ 840, 525, 840, 525},
+	{ 840, 525, 840, 525},
+	{ 840, 525, 840, 525},
+	{ 784, 525, 784, 525},
+	{1040, 700,1040, 700},
+        {1160, 840,1160, 840}          	/* TW: For Ch7019 1024 */
+};
+
+static const SiS310_LVDSDataStruct  SiS310_CHTVUPALData[]=   
+{
+	{1008, 625,1008, 625},
+	{1008, 625,1008, 625},
+	{1008, 625,1008, 625},
+	{1008, 625,1008, 625},
+	{ 840, 625, 840, 625},
+	{ 960, 750, 960, 750},
+	{1400,1000,1400,1000}   	/*  TW: For Ch7019 1024 */
+};
+
+static const SiS310_LVDSDataStruct  SiS310_CHTVOPALData[]= 
+{
+	{1008, 625,1008, 625},
+	{1008, 625,1008, 625},
+	{1008, 625,1008, 625},
+	{1008, 625,1008, 625},
+	{ 840, 625, 840, 625},
+	{ 944, 625, 944, 625},
+        {1400, 875,1400, 875}       	/*  TW: For Ch7019 1024 */
+};
+
+static const SiS310_LVDSDataStruct  SiS310_CHTVUPALMData[]=  
 {
 	{ 840, 600, 840, 600},
 	{ 840, 600, 840, 600},
@@ -1994,7 +2249,7 @@
         {1160, 945,1160, 945}           /* TW: For Ch7019 1024 */
 };
 
-static const SiS310_LVDSDataStruct  SiS310_CHTVONTSCData[]=   /* TW: New */
+static const SiS310_LVDSDataStruct  SiS310_CHTVOPALMData[]=  
 {
 	{ 840, 525, 840, 525},
 	{ 840, 525, 840, 525},
@@ -2005,7 +2260,7 @@
         {1160, 840,1160, 840}          	/* TW: For Ch7019 1024 */
 };
 
-static const SiS310_LVDSDataStruct  SiS310_CHTVUPALData[]=   /* TW: New */
+static const SiS310_LVDSDataStruct  SiS310_CHTVUPALNData[]=  
 {
 	{1008, 625,1008, 625},
 	{1008, 625,1008, 625},
@@ -2016,7 +2271,7 @@
 	{1400,1000,1400,1000}   	/*  TW: For Ch7019 1024 */
 };
 
-static const SiS310_LVDSDataStruct  SiS310_CHTVOPALData[]=   /* TW: New */
+static const SiS310_LVDSDataStruct  SiS310_CHTVOPALNData[]= 
 {
 	{1008, 625,1008, 625},
 	{1008, 625,1008, 625},
@@ -2027,15 +2282,24 @@
         {1400, 875,1400, 875}       	/*  TW: For Ch7019 1024 */
 };
 
+static const SiS310_LVDSDataStruct  SiS310_CHTVSOPALData[]=   /* TW: (super overscan - no effect on 7019) */
+{
+	{1008, 625,1008, 625},
+	{1008, 625,1008, 625},
+	{1008, 625,1008, 625},
+	{1008, 625,1008, 625},
+	{ 840, 625, 840, 625},
+	{ 944, 625, 944, 625},
+        {1400, 875,1400, 875}       	
+};
+
 typedef struct _SiS310_LVDSDesStruct
 {
 	USHORT LCDHDES;
 	USHORT LCDVDES;
 } SiS310_LVDSDesStruct;
 
-/* TW: PanelType arrays taken from 650/LVDS BIOS 1.10.0 */
-
-static const SiS310_LVDSDesStruct  SiS310_PanelType00_1[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType00_1[]=  
 {
 	{ 0, 0},
 	{ 0, 0},
@@ -2048,7 +2312,7 @@
 	{ 0, 0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType01_1[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType01_1[]=   
 {
 	{ 0, 0},
 	{ 0, 0},
@@ -2061,7 +2325,7 @@
 	{ 0, 0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType02_1[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType02_1[]=  
 {
 	{ 0, 0},
 	{ 0, 0},
@@ -2076,7 +2340,7 @@
 };
 
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType03_1[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType03_1[]= 
 {
 	{ 0, 0},
 	{ 0, 0},
@@ -2089,7 +2353,7 @@
 	{ 0, 0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType04_1[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType04_1[]=  
 {
 	{1343, 798},
 	{1343, 794},
@@ -2102,7 +2366,7 @@
 	{ 0,   0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType05_1[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType05_1[]= 
 {
 	{1343, 798},
 	{1343, 794},
@@ -2115,7 +2379,7 @@
 	{ 0,   0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType06_1[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType06_1[]=  
 {
 	{1343, 798},
 	{1343, 794},
@@ -2128,7 +2392,7 @@
 	{ 0,   0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType07_1[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType07_1[]= 
 {
 	{1343, 798},
 	{1343, 794},
@@ -2141,7 +2405,7 @@
 	{ 0,   0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType08_1[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType08_1[]=   /* 1400x1050 */
 {
 	{ 0, 0},
 	{ 0, 0},
@@ -2156,32 +2420,37 @@
 	{ 0, 0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType09_1[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType09_1[]=   /* 1280x768 */
 {
-	{ 0, 448},
-	{ 0, 448},
-	{ 0, 448},
-	{ 0, 448},
-	{ 0, 524},
-	{ 0, 627},
-	{ 0, 805},
-	{ 0, 805},
+	{ 0, 0},
+	{ 0, 0},
+	{ 0, 0},
+	{ 0, 0},
+	{ 0, 0},
+	{ 0, 0},
+	{ 0, 0},
+	{ 0, 0},
+	{ 0, 0},
+	{ 0, 0},
+	{ 0, 0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType0a_1[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType0a_1[]=  /* 1600x1200 */
 {
-	{1059, 626},
-	{1059, 624},
-	{1059, 626},
-	{1059, 624},
-	{1059, 624},
-	{ 0, 627},
-	{ 0, 627},
-	{ 0,   0},
-	{ 0,   0}
+	{ 0, 0},
+	{ 0, 0},
+	{ 0, 0},
+	{ 0, 0},
+	{ 0, 0},
+	{ 0, 0},
+	{ 0, 0},
+	{ 0, 0},
+	{ 0, 0},
+	{ 0, 0},
+	{ 0, 0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType0b_1[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType0b_1[]= 
 {
 	{1343, 798},
 	{1343, 794},
@@ -2194,7 +2463,7 @@
 	{ 0,   0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType0c_1[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType0c_1[]=  
 {
 	{1343, 798},
 	{1343, 794},
@@ -2207,7 +2476,7 @@
 	{ 0,   0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType0d_1[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType0d_1[]= 
 {
 	{1343, 798},
 	{1343, 794},
@@ -2220,7 +2489,7 @@
 	{ 0,   0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType0e_1[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType0e_1[]=  
 {
 	{1343, 798},
 	{1343, 794},
@@ -2233,7 +2502,7 @@
 	{ 0,   0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType0f_1[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType0f_1[]=  
 {
 	{1343, 798},
 	{1343, 794},
@@ -2246,7 +2515,7 @@
 	{ 0,   0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType00_2[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType00_2[]=  
 {
 	{980, 528},
 	{980, 503},
@@ -2259,7 +2528,7 @@
 	{ 0,   0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType01_2[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType01_2[]= 
 {
 	{1152, 622},
 	{1152, 597},
@@ -2272,7 +2541,7 @@
 	{ 0,   0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType02_2[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType02_2[]= 
 {
 	{1368, 754},
 	{1368, 729},
@@ -2287,7 +2556,7 @@
 	{ 0,   0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType03_2[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType03_2[]=  
 {
 	{ 0,   0},
 	{ 0,   0},
@@ -2298,7 +2567,7 @@
 	{ 0,   0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType04_2[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType04_2[]=  
 {
 	{ 0,   0},
 	{ 0,   0},
@@ -2311,7 +2580,7 @@
 	{ 0,   0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType05_2[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType05_2[]=  
 {
 	{1152, 622},
 	{1152, 597},
@@ -2324,7 +2593,7 @@
 	{ 0,   0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType06_2[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType06_2[]=  
 {
 	{1152, 622},
 	{1152, 597},
@@ -2337,7 +2606,7 @@
 	{ 0,   0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType07_2[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType07_2[]=  
 {
 	{1152, 622},
 	{1152, 597},
@@ -2350,8 +2619,20 @@
 	{ 0,   0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType08_2[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType08_2[]=  /* 1400x1050 */
 {
+	{1308, 741},
+	{1308, 716},
+	{1308, 741},
+	{1308, 716},
+	{1308, 781},
+	{1388, 841},
+	{1500, 925},
+	{1628,1053},
+	{   0,1065},
+	{   0,   0},
+	{   0,   0}
+#if 0
 	{976, 527},
 	{976, 502},
 	{976, 527},
@@ -2361,34 +2642,37 @@
 	{ 0, 627},
 	{ 0,   0},
 	{ 0,   0}
+#endif	
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType09_2[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType09_2[]= /* 1280x768 */
 {
-	{ 0,   0},
-	{ 0,   0},
-	{ 0,   0},
-	{ 0,   0},
-	{ 0,   0},
-	{ 0,   0},
-	{ 0,   0},
-	{ 0,   0}
+	{1083, 622},
+	{1083, 597},
+	{1083, 622},
+	{1083, 597},
+	{1083, 662},
+	{1163, 722},
+	{1286, 805},
+	{   0, 794},
+	{   0,   0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType0a_2[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType0a_2[]=  /* 1600x1200 */
 {
-	{976, 527},
-	{976, 502},
-	{976, 527},
-	{976, 502},
-	{976, 567},
-	{ 0, 627},
-	{ 0, 627},
-	{ 0,   0},
-	{ 0,   0}
+	{1568, 850},
+	{1568, 825},
+	{1568, 850},
+	{1568, 825},
+	{1568, 890},
+	{1648, 950},
+	{1760,1034},
+	{1888,1162},
+	{1948,1175},
+	{   0,   0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType0b_2[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType0b_2[]=  
 {
 	{1152, 622},
 	{1152, 597},
@@ -2401,7 +2685,7 @@
 	{ 0,   0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType0c_2[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType0c_2[]= 
 {
 	{1152, 622},
 	{1152, 597},
@@ -2414,7 +2698,7 @@
 	{ 0,   0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType0d_2[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType0d_2[]=  
 {
 	{1152, 622},
 	{1152, 597},
@@ -2427,7 +2711,7 @@
 	{ 0,   0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType0e_2[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType0e_2[]= 
 {
 	{1152, 622},
 	{1152, 597},
@@ -2440,7 +2724,7 @@
 	{ 0,   0}
 };
 
-static const SiS310_LVDSDesStruct  SiS310_PanelType0f_2[] =   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelType0f_2[] = 
 {
 	{1152, 622},
 	{1152, 597},
@@ -2453,7 +2737,35 @@
 	{ 0,   0}
 };
 
-static const SiS310_LVDSDesStruct SiS310_PanelType1076_1[]=   /* TW: New */
+static const SiS310_LVDSDesStruct  SiS310_PanelTypeNS_1[]= 
+{
+	{ 8,   0},
+	{ 8,   0},
+	{ 8,   0},
+	{ 8,   0},
+	{ 8,   0},
+	{ 0,   0},
+	{ 0,   0},
+	{ 0,   0},
+	{ 0, 806},
+	{ 0, 0 }
+};
+
+static const SiS310_LVDSDesStruct  SiS310_PanelTypeNS_2[] = 
+{
+	{ 0 , 0},
+	{ 0 , 0},
+	{ 0 , 0},
+	{ 0 , 0},
+	{ 0 , 0},
+	{ 0 , 0},
+	{ 0 , 0},
+	{ 0 , 0},
+	{ 0 , 0},
+	{ 0 , 0}
+};
+
+static const SiS310_LVDSDesStruct SiS310_PanelType1076_1[]=  
 {  /* 1024x768 - Checked (1.10.6s) */
 	{ 0 , 0},
 	{ 0 , 0},
@@ -2466,7 +2778,7 @@
 	{ 0 , 0}
 };
 
-static const SiS310_LVDSDesStruct SiS310_PanelType1076_2[]=   /* TW: New */
+static const SiS310_LVDSDesStruct SiS310_PanelType1076_2[]=  
 {  /* 1024x768 - Checked (1.10.6s) */
 	{ 1184, 622 },
 	{ 1184, 597 },
@@ -2479,7 +2791,7 @@
 	{    0, 0   }
 };
 
-static const SiS310_LVDSDesStruct SiS310_PanelType1210_1[]=   /* TW: New */
+static const SiS310_LVDSDesStruct SiS310_PanelType1210_1[]=  
 {  /* 1280x1024 - Checked (1.10.6s) */
 	{ 0 , 0},
 	{ 0 , 0},
@@ -2492,7 +2804,7 @@
 	{ 0 , 0}
 };
 
-static const SiS310_LVDSDesStruct SiS310_PanelType1210_2[]=   /* TW: New */
+static const SiS310_LVDSDesStruct SiS310_PanelType1210_2[]=  
 {  /* 1280x1024 - Checked (1.10.6s) */
 	{ 0 , 0},
 	{ 0 , 0},
@@ -2505,7 +2817,7 @@
 	{ 0 , 0}
 };
 
-static const SiS310_LVDSDesStruct SiS310_PanelType1296_1[]=   /* TW: New */
+static const SiS310_LVDSDesStruct SiS310_PanelType1296_1[]=  
 {  /* 1400x1050 - Checked (1.10.6s) */
 	{ 0 , 0},
 	{ 0 , 0},
@@ -2518,7 +2830,7 @@
 	{ 0 , 0}
 };
 
-static const SiS310_LVDSDesStruct SiS310_PanelType1296_2[]=   /* TW: New */
+static const SiS310_LVDSDesStruct SiS310_PanelType1296_2[]=  
 {  /* 1400x1050 - Checked (1.10.6s) - looks heavily invalid */
 	{ 808 , 740},
 	{ 0   , 715},
@@ -2531,7 +2843,7 @@
 	{ 0 , 0}
 };
 
-static const SiS310_LVDSDesStruct SiS310_PanelType1600_1[]=   /* TW: New */
+static const SiS310_LVDSDesStruct SiS310_PanelType1600_1[]= 
 {  /* 1600x1200 - Checked (1.10.6s) */
 	{ 0 , 0},
 	{ 0 , 0},
@@ -2545,8 +2857,8 @@
 	{ 0 , 0}
 };
 
-static const SiS310_LVDSDesStruct SiS310_PanelType1600_2[]=   /* TW: New */
-{  /* 1600x1200 - Checked (1.10.6s) - looks heavily invalid */
+static const SiS310_LVDSDesStruct SiS310_PanelType1600_2[]= 
+{  /* 1600x1200 - Checked (1.10.6s) - looks heavily invalid, not copied */
 	{ 0 , 0},
 	{ 0 , 0},
 	{ 0 , 0},
@@ -2736,6 +3048,7 @@
 #endif
 };
 
+/*   1     2    4    5    6   1c   1d   1f   20   21   23   25   */
 static const SiS310_Part2PortTblStruct SiS310_CRT2Part2_1280x1024_3[] =
 {	/* TW: Temporary data, invalid */
   {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}},
@@ -2750,7 +3063,7 @@
 };
 
 static const SiS310_Part2PortTblStruct SiS310_CRT2Part2_1400x1050_3[] =
-{	/* TW: Temporary data, invalid */
+{	
   {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}},
   {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}},
   {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}},
@@ -3385,7 +3698,7 @@
    0x00 }}
 };
 
-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT1800x600_1[] =   /* TW: New */
+static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT1800x600_1[] =   
 {
  {{0x6b,0x4f,0x8f,0x55,0x85,0xaa,0x1f,
    0x90,0x85,0x8f,0xab,0x30,0x00,0x05,
@@ -3407,7 +3720,7 @@
    0x01 }}
 };
 
-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11024x768_1[] =    /* TW: New */
+static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11024x768_1[] =    
 {
  {{0x73,0x4f,0x97,0x53,0x84,0xb4,0x1f,
    0x92,0x89,0x8f,0xb5,0x30,0x00,0x05,
@@ -3432,35 +3745,35 @@
    0x01}}
 };
 
-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11280x1024_1[] =    /* TW: New */
+static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11280x1024_1[] =   
 {
- {{0x7e,0x4f,0x82,0x56,0x04,0xb8,0x1f,
+ {{0x7e,0x4f,0x82,0x58,0x04,0xb8,0x1f,
    0x90,0x84,0x8f,0xb9,0x30,0x00,0x06,
-   0x00 }},
- {{0x7e,0x4f,0x82,0x56,0x04,0x86,0x1f,
+   0x00}},
+ {{0x7e,0x4f,0x82,0x58,0x04,0x86,0x1f,
    0x5e,0x82,0x5d,0x87,0x10,0x00,0x06,
-   0x00 }},
- {{0x7e,0x4f,0x82,0x56,0x04,0xb8,0x1f,
+   0x00}},
+ {{0x7e,0x4f,0x82,0x58,0x04,0xb8,0x1f,
    0x90,0x84,0x8f,0xb9,0x30,0x00,0x06,
-   0x00 }},
- {{0x7e,0x4f,0x82,0x56,0x04,0x86,0x1f,
+   0x00}},
+ {{0x7e,0x4f,0x82,0x58,0x04,0x86,0x1f,
    0x5e,0x82,0x5d,0x87,0x10,0x00,0x06,
-   0x00 }},
- {{0x7e,0x4f,0x82,0x56,0x04,0x08,0x3e,
+   0x00}},
+ {{0x7e,0x4f,0x82,0x58,0x04,0x08,0x3e,
    0xe0,0x84,0xdf,0x09,0x00,0x00,0x06,
-   0x00 }},
- {{0x92,0x63,0x96,0x6a,0x18,0x80,0xf0,
+   0x00}},
+ {{0x92,0x63,0x96,0x6c,0x18,0x80,0xf0,
    0x58,0x8c,0x57,0x81,0x20,0x00,0x06,
-   0x01 }},
- {{0xae,0x7f,0x92,0x86,0x94,0x28,0xf5,
+   0x01}},
+ {{0xae,0x7f,0x92,0x88,0x94,0x28,0xf5,
    0x00,0x84,0xff,0x29,0x10,0x00,0x02,
-   0x01 }},
- {{0xce,0x9f,0x92,0xa6,0x14,0x28,0x5a,
+   0x01}},
+ {{0xce,0x9f,0x92,0xa8,0x14,0x28,0x5a,
    0x00,0x84,0xff,0x29,0x09,0x00,0x07,
    0x01}}
 };
 
-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT1800x600_1_H[] =    /* TW: New */
+static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT1800x600_1_H[] =   
 {
  {{0x43,0x27,0x87,0x2d,0x1d,0xaa,0x1f,
    0x90,0x85,0x8f,0xab,0x30,0x00,0x05,
@@ -3482,7 +3795,7 @@
    0x01 }}
 };
 
-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11024x768_1_H[] =    /* TW: New */
+static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11024x768_1_H[] = 
 {
  {{0x4b,0x27,0x8f,0x2b,0x1c,0xb4,0x1f,
    0x92,0x89,0x8f,0xb5,0x30,0x00,0x05,
@@ -3507,32 +3820,32 @@
    0x01 }}
 };
 
-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11280x1024_1_H[] =   /* TW: New */
+static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11280x1024_1_H[] =  
 {
- {{0x56,0x27,0x9a,0x2e,0x1c,0xb8,0x1f,
+ {{0x56,0x27,0x9a,0x31,0x1c,0xb8,0x1f,
    0x90,0x84,0x8f,0xb9,0x30,0x00,0x05,
-   0x00 }},
- {{0x56,0x27,0x9a,0x2e,0x1c,0x86,0x1f,
+   0x00}},
+ {{0x56,0x27,0x9a,0x31,0x1c,0x86,0x1f,
    0x5e,0x82,0x5d,0x87,0x10,0x00,0x05,
-   0x00 }},
- {{0x56,0x27,0x9a,0x2e,0x1c,0xb8,0x1f,
+   0x00}},
+ {{0x56,0x27,0x9a,0x31,0x1c,0xb8,0x1f,
    0x90,0x84,0x8f,0xb9,0x30,0x00,0x05,
-   0x00 }},
- {{0x56,0x27,0x9a,0x2e,0x1c,0x86,0x1f,
+   0x00}},
+ {{0x56,0x27,0x9a,0x31,0x1c,0x86,0x1f,
    0x5e,0x82,0x5d,0x87,0x10,0x00,0x05,
-   0x01 }},
- {{0x56,0x27,0x9a,0x2e,0x1c,0x08,0x3e,
+   0x01}},
+ {{0x56,0x27,0x9a,0x31,0x1c,0x08,0x3e,
    0xe0,0x84,0xdf,0x09,0x00,0x00,0x05,
-   0x00 }},
- {{0x60,0x31,0x84,0x38,0x86,0x80,0xf0,
+   0x00}},
+ {{0x60,0x31,0x84,0x3a,0x86,0x80,0xf0,
    0x58,0x8c,0x57,0x81,0x20,0x00,0x01,
-   0x01 }},
- {{0x6e,0x3f,0x92,0x46,0x94,0x28,0xf5,
+   0x01}},
+ {{0x6e,0x3f,0x92,0x48,0x94,0x28,0xf5,
    0x00,0x84,0xff,0x29,0x10,0x00,0x01,
-   0x01 }}
+   0x01}}
 };
 
-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT1800x600_2[]=   /* TW: New */
+static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT1800x600_2[]=  
 {
  {{0x7f,0x4f,0x83,0x62,0x12,0x72,0x3e,
    0xff,0x84,0x8f,0x73,0x00,0x00,0x06,
@@ -3554,7 +3867,7 @@
    0x01 }}
 };
 
-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11024x768_2[] =   /* TW: New */
+static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11024x768_2[] = 
 { 
  {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
    0x57,0x8e,0x8f,0x25,0x30,0x00,0x06,
@@ -3579,36 +3892,36 @@
    0x01 }}
 };
 
-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11280x1024_2[] =  /* TW: New */
+static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11280x1024_2[] =  
 {
- {{0xce,0x4f,0x92,0x81,0x0f,0x28,0x9a,
-   0xdb,0x8f,0x8f,0x29,0x21,0x00,0x03,
-   0x00 }},
- {{0xce,0x4f,0x92,0x81,0x0f,0x28,0x9a,
-   0xc2,0x86,0x5d,0x29,0x01,0x00,0x03,
-   0x00 }},
- {{0xce,0x4f,0x92,0x81,0x0f,0x28,0x9a,
-   0xdb,0x8f,0x8f,0x29,0x21,0x00,0x03,
-   0x00 }},
- {{0xce,0x4f,0x92,0x81,0x0f,0x28,0x9a,
-   0xc2,0x86,0x5d,0x29,0x01,0x00,0x03,
-   0x00 }},
- {{0xce,0x4f,0x92,0x81,0x0f,0x28,0x9e,
-   0x03,0x87,0xdf,0x29,0x01,0x00,0x03,
-   0x00 }},
+ {{0xce,0x72,0x91,0x81,0x8f,0x28,0x92,
+   0xc8,0x8c,0x5d,0x5c,0x01,0x00,0x02,
+   0x01}},
+ {{0xce,0x72,0x91,0x81,0x8f,0x28,0x92,
+   0xaf,0x83,0x44,0x43,0x21,0x00,0x02,
+   0x01}},
+ {{0xce,0x72,0x91,0x81,0x8f,0x28,0x92,
+   0xc8,0x8c,0x5d,0x5c,0x01,0x00,0x02,
+   0x01}},
+ {{0xce,0x72,0x91,0x81,0x8f,0x28,0x92,
+   0xaf,0x83,0x44,0x43,0x21,0x00,0x02,
+   0x01}},
+ {{0xce,0x72,0x91,0x81,0x8f,0x28,0x92,
+   0xf0,0x84,0x85,0x84,0x11,0x00,0x02,
+   0x01}},
  {{0xce,0x63,0x92,0x8b,0x19,0x28,0xd4,
    0x3f,0x83,0x57,0x29,0x01,0x00,0x03,
-   0x01 }},
+   0x01}},
  {{0xce,0x7f,0x92,0x99,0x07,0x28,0xd4,
    0x93,0x87,0xff,0x29,0x21,0x00,0x07,
-   0x01 }},
- {{0xce,0x9f,0x92,0xa6,0x14,0x28,0x5a,
+   0x01}},
+ {{0xce,0x9f,0x92,0xa8,0x14,0x28,0x5a,
    0x00,0x84,0xff,0x29,0x09,0x00,0x07,
    0x01}}
 };
 
-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT1800x600_2_H[] =   /* TW: New */
-{ 
+static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT1800x600_2_H[] =  
+{
  {{0x57,0x27,0x9b,0x3a,0x0a,0x72,0x3e,
    0xff,0x84,0x8f,0x73,0x00,0x00,0x01,
    0x00 }},
@@ -3629,7 +3942,7 @@
    0x01 }}
 };
 
-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11024x768_2_H[] =   /* TW: New */
+static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11024x768_2_H[] =  
 { 
  {{0x7b,0x27,0x9f,0x46,0x97,0x24,0xbb,
    0x57,0x8e,0x8f,0x25,0x30,0x00,0x01,
@@ -3654,32 +3967,32 @@
    0x01 }}
 };
 
-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11280x1024_2_H[] =   /* TW: New */
+static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11280x1024_2_H[] = 
 {
- {{0xa6,0x27,0x8a,0x59,0x87,0x28,0x9a,
-   0xdb,0x8f,0x8f,0x29,0x21,0x00,0x06,
-   0x00 }},
- {{0xa6,0x27,0x8a,0x59,0x87,0x28,0x9a,
-   0xc2,0x86,0x5d,0x29,0x01,0x00,0x06,
-   0x00 }},
- {{0xa6,0x27,0x8a,0x59,0x87,0x28,0x9a,
-   0xdb,0x8f,0x8f,0x29,0x21,0x00,0x06,
-   0x00 }},
- {{0xa6,0x27,0x8a,0x59,0x87,0x28,0x9a,
-   0xc2,0x86,0x5d,0x29,0x01,0x00,0x06,
-   0x00 }},
- {{0xa6,0x27,0x8a,0x59,0x87,0x28,0x9e,
-   0x03,0x87,0xdf,0x29,0x01,0x00,0x06,
-   0x00 }},
+ {{0xa6,0x4a,0x89,0x59,0x07,0x28,0x92,
+   0xc8,0x8c,0x5d,0x5c,0x01,0x00,0x06,
+   0x01}},
+ {{0xa6,0x4a,0x89,0x59,0x07,0x28,0x92,
+   0xaf,0x83,0x44,0x43,0x21,0x00,0x06,
+   0x01}},
+ {{0xa6,0x4a,0x89,0x59,0x07,0x28,0x92,
+   0xc8,0x8c,0x5d,0x5c,0x01,0x00,0x06,
+   0x01}},
+ {{0xa6,0x4a,0x89,0x59,0x07,0x28,0x92,
+   0xfa,0x83,0x44,0x43,0x31,0x00,0x06,
+   0x01}},
+ {{0xa6,0x4a,0x89,0x59,0x07,0x28,0x92,
+   0xf0,0x84,0x85,0x84,0x11,0x00,0x06,
+   0x01}},
  {{0x9c,0x31,0x80,0x59,0x87,0x28,0xd4,
    0x3f,0x83,0x57,0x29,0x01,0x00,0x06,
-   0x01 }},
- {{0x8e,0x3f,0x92,0x79,0x07,0x28,0xd4,
+   0x01}},
+ {{0x8e,0x3f,0x92,0x59,0x07,0x28,0xd4,
    0x93,0x87,0xff,0x29,0x21,0x00,0x06,
    0x01}}
 };
 
-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT1XXXxXXX_1[] =   /* TW: New */
+static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT1XXXxXXX_1[] =  
 {
  {{0x5f,0x4f,0x82,0x55,0x81,0xbf,0x1f,
    0x9c,0x8e,0x96,0xb9,0x30,0x00,0x05,
@@ -3702,12 +4015,15 @@
  {{0xa3,0x7f,0x87,0x86,0x97,0x24,0xf5,
    0x02,0x88,0xff,0x25,0x10,0x00,0x02,
    0x01}},
+ {{0xce,0x9f,0x92,0xa8,0x14,0x28,0x5a,
+   0x00,0x84,0xff,0x29,0x09,0x00,0x07,
+   0x01}},
  {{0xce,0x9f,0x92,0xa9,0x17,0x24,0xf5,
    0x02,0x88,0xff,0x25,0x10,0x00,0x07,
    0x01}}
 };
 
-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT1XXXxXXX_1_H[] =   /* TW: New */
+static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT1XXXxXXX_1_H[] = 
 {
  {{0x38,0x27,0x9c,0x2c,0x80,0xbf,0x1f,
    0x9c,0x8e,0x96,0xb9,0x30,0x00,0x00,
@@ -3732,8 +4048,36 @@
    0x01}}
 };
 
-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11400x1050_1[] =   /* TW: New */
+static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11400x1050_1[] =  
 {
+  {{0x6f,0x4f,0x93,0x54,0x82,0x9e,0x1f,
+    0x8f,0x81,0x8f,0x9f,0x30,0x00,0x05,
+    0x00}},
+  {{0x6f,0x4f,0x93,0x54,0x82,0x6c,0x1f,
+    0x5e,0x81,0x5d,0x6d,0x10,0x00,0x05,
+    0x00}},
+  {{0x6f,0x4f,0x93,0x54,0x82,0x9e,0x1f,
+    0x90,0x83,0x8f,0x9f,0x30,0x00,0x05,
+    0x00}},
+  {{0x6f,0x4f,0x93,0x54,0x82,0x6c,0x1f,
+    0x60,0x84,0x5d,0x6d,0x10,0x00,0x05,
+    0x00}},
+  {{0x6f,0x4f,0x93,0x54,0x82,0xee,0x1f,
+    0xdf,0x82,0xdf,0xef,0x10,0x00,0x05,
+    0x00}},
+  {{0x83,0x63,0x87,0x68,0x16,0x66,0xf0,
+    0x57,0x8e,0x57,0x67,0x20,0x00,0x06,
+    0x01}},
+  {{0x9f,0x7f,0x83,0x84,0x92,0x0e,0xf1,
+    0xff,0x86,0xff,0x0f,0x10,0x00,0x02,
+    0x01,}},
+  {{0xbf,0x9f,0x83,0xa4,0x12,0x0e,0xde,
+    0xff,0x86,0xff,0x0f,0x01,0x00,0x07,
+    0x01}},
+  {{0xce,0xae,0x92,0xb3,0x01,0x28,0x10,
+    0x19,0x80,0x19,0x29,0x0f,0x00,0x03,
+    0x00}}
+#if 0
  {{0x6f,0x4f,0x93,0x54,0x82,0x9e,0x1f,
    0x93,0x86,0x8f,0x9f,0x30,0x00,0x05,
    0x00}},
@@ -3761,11 +4105,40 @@
  {{0xce,0xae,0x92,0xb3,0x01,0x28,0x10,
    0x1a,0x80,0x19,0x29,0x0f,0x00,0x03,
    0x00}}
+#endif   
 };
 
-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11400x1050_1_H[] =   /* TW: New */
+static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11400x1050_1_H[] = 
 {
  {{0x47,0x27,0x8b,0x2c,0x1a,0x9e,0x1f,
+   0x8f,0x81,0x8f,0x9f,0x30,0x00,0x05,
+  0x00}},
+ {{0x47,0x27,0x8b,0x2c,0x1a,0x6c,0x1f,
+   0x60,0x84,0x5d,0x6d,0x10,0x00,0x05,
+   0x00}},
+ {{0x47,0x27,0x8b,0x30,0x1e,0x9e,0x1f,
+   0x90,0x83,0x8f,0x9f,0x30,0x00,0x05,
+   0x00}},
+ {{0x47,0x27,0x8b,0x2c,0x1a,0x6c,0x1f,
+   0x60,0x84,0x5d,0x6d,0x10,0x00,0x05,
+   0x00}},
+ {{0x47,0x27,0x8b,0x2c,0x1a,0xee,0x1f,
+   0xdf,0x86,0xdf,0xef,0x10,0x00,0x05,
+   0x00}},
+ {{0x51,0x31,0x95,0x36,0x04,0x66,0xf0,
+   0x57,0x8e,0x57,0x67,0x20,0x00,0x01,
+   0x01}},
+ {{0x5f,0x3f,0x83,0x44,0x92,0x0e,0xf1,
+   0xff,0x86,0xff,0x0f,0x10,0x00,0x01,
+   0x01}},
+ {{0x6f,0x4f,0x93,0x54,0x82,0x0e,0x5a,
+   0x02,0x86,0xff,0x0f,0x09,0x00,0x05,
+   0x01}},
+ {{0x76,0x56,0x9a,0x5b,0x89,0x28,0x10,
+   0x1c,0x80,0x19,0x29,0x0b,0x00,0x05,
+   0x00}}
+#if 0
+ {{0x47,0x27,0x8b,0x2c,0x1a,0x9e,0x1f,
    0x93,0x86,0x8f,0x9f,0x30,0x00,0x05,
    0x00}},
  {{0x47,0x27,0x8b,0x2c,0x1a,0x6c,0x1f,
@@ -3792,10 +4165,39 @@
  {{0x76,0x56,0x9a,0x5b,0x89,0x28,0x10,
    0x1c,0x80,0x19,0x29,0x0b,0x00,0x05,
    0x00}}
+#endif   
 };
 
-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11400x1050_2[] =    /* TW: New */
+static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11400x1050_2[] =  
 {
+ {{0xce,0x72,0x91,0x84,0x92,0x28,0x92,
+   0xd7,0x8b,0x5d,0x5c,0x21,0x00,0x02,
+   0x01}},
+ {{0xce,0x72,0x91,0x84,0x92,0x28,0x92,
+   0xbe,0x82,0x44,0x43,0x01,0x00,0x02,
+   0x01}},
+ {{0xce,0x72,0x91,0x84,0x92,0x28,0x92,
+   0xd7,0x8b,0x5d,0x5c,0x21,0x00,0x02,
+   0x01}},
+ {{0xce,0x72,0x91,0x84,0x92,0x28,0x92,
+   0xbe,0x82,0x44,0x43,0x01,0x00,0x02,
+   0x01}},
+ {{0xce,0x72,0x91,0x84,0x92,0x28,0x92,
+   0xff,0x83,0x85,0x84,0x11,0x00,0x02,
+   0x01}},
+ {{0xce,0x63,0x92,0x8e,0x1c,0x28,0xd4,
+   0x3f,0x83,0x57,0x29,0x01,0x00,0x03,
+   0x01}},
+ {{0xce,0x7f,0x92,0x9c,0x0a,0x28,0xd4,
+   0x93,0x87,0xff,0x29,0x21,0x00,0x07,
+   0x01}},
+ {{0xce,0x9f,0x92,0xac,0x1a,0x28,0x5a,
+   0x13,0x87,0xff,0x29,0x29,0x00,0x07,
+   0x01}},
+ {{0xce,0xae,0x92,0xbc,0x0a,0x28,0x10,
+   0x20,0x84,0x19,0x29,0x0f,0x00,0x03,
+   0x00}}
+#if 0
  {{0xce,0x4f,0x92,0x8c,0x1a,0x28,0x9a,
    0xdb,0x8f,0x8f,0x29,0x21,0x00,0x03,
    0x00}},
@@ -3823,10 +4225,39 @@
  {{0xce,0xae,0x92,0xbc,0x0a,0x28,0x10,
    0x20,0x84,0x19,0x29,0x0f,0x00,0x03,
    0x00}}
+#endif   
 };
 
-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11400x1050_2_H[] =    /* TW: New */
+static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11400x1050_2_H[] =  
 {
+ {{0xa6,0x4a,0x89,0x5c,0x0a,0x28,0x92,
+   0xd7,0x8b,0x5d,0x5c,0x21,0x00,0x06,
+   0x01}},
+ {{0xa6,0x4a,0x89,0x5c,0x0a,0x28,0x92,
+   0xbe,0x82,0x44,0x43,0x01,0x00,0x06,
+   0x01}},
+ {{0xa6,0x4a,0x89,0x5c,0x0a,0x28,0x92,
+   0xd7,0x8b,0x5d,0x5c,0x21,0x00,0x06,
+   0x01}},
+ {{0xa6,0x4a,0x89,0x5c,0x0a,0x28,0x92,
+   0xbe,0x82,0x44,0x43,0x01,0x00,0x06,
+   0x01}},
+ {{0xa6,0x4a,0x89,0x5c,0x0a,0x28,0x92,
+   0xff,0x83,0x85,0x84,0x11,0x00,0x06,
+   0x01}},
+ {{0x9c,0x31,0x80,0x5c,0x8a,0x28,0xd4,
+   0x3f,0x83,0x57,0x29,0x01,0x00,0x06,
+   0x01}},
+ {{0x8e,0x3f,0x92,0x5c,0x0a,0x28,0xd4,
+   0x93,0x87,0xff,0x29,0x21,0x00,0x06,
+   0x01}},
+ {{0x7e,0x4f,0x82,0x5c,0x0a,0x28,0x5a,
+   0x13,0x87,0xff,0x29,0x29,0x00,0x06,
+   0x01}},
+ {{0x76,0x56,0x9a,0x64,0x92,0x28,0x10,
+   0x20,0x84,0x19,0x29,0x0f,0x00,0x05,
+   0x00}}
+#if 0
  {{0xa6,0x27,0x8a,0x64,0x92,0x28,0x9a,
    0xdb,0x8f,0x8f,0x29,0x21,0x00,0x06,
    0x00}},
@@ -3854,6 +4285,131 @@
  {{0x76,0x56,0x9a,0x64,0x92,0x28,0x10,
    0x20,0x84,0x19,0x29,0x0f,0x00,0x05,
    0x00}}
+#endif   
+};
+
+static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11280x768_1[] =  
+{	
+ {{0x5b,0x4f,0x9f,0x55,0x19,0xb4,0x1f,
+   0x9c,0x8e,0x8f,0xb5,0x10,0x00,0x01,
+   0x00}},
+ {{0x5b,0x4f,0x9f,0x55,0x19,0x82,0x1f,
+   0x6a,0x8c,0x5d,0x83,0x30,0x00,0x01,
+   0x00}},
+ {{0x5b,0x4f,0x9f,0x55,0x19,0xb4,0x1f,
+   0x9c,0x8e,0x8f,0xb5,0x10,0x00,0x01,
+   0x00}},
+ {{0x5b,0x4f,0x9f,0x55,0x19,0x82,0x1f,
+   0x6a,0x8c,0x5d,0x83,0x30,0x00,0x01,
+   0x00}},
+ {{0x5b,0x4f,0x9f,0x55,0x19,0x04,0x3e,
+   0xec,0x8e,0xdf,0x05,0x20,0x00,0x01,
+   0x00}},
+ {{0x6f,0x63,0x93,0x69,0x8d,0x7c,0xf0,
+   0x64,0x86,0x57,0x7d,0x20,0x00,0x05,
+   0x01}},
+ {{0x8b,0x7f,0x8f,0x85,0x09,0x24,0xf5,
+   0x0c,0x8e,0xff,0x25,0x30,0x00,0x02,
+   0x01}},
+ {{0xab,0x9f,0x8f,0xa5,0x89,0x24,0xf5,
+   0x0c,0x8e,0xff,0x25,0x30,0x00,0x06,
+   0x01}},
+ {{0xab,0x9f,0x8f,0xa5,0x89,0x24,0xf5,
+   0x0c,0x8e,0xff,0x25,0x30,0x00,0x06,
+   0x01}}
+};
+
+static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11280x768_1_H[] = 
+{
+ {{0x47,0x27,0x8b,0x2c,0x1a,0x9e,0x1f,
+   0x93,0x86,0x8f,0x9f,0x30,0x00,0x05,
+   0x00}},
+ {{0x47,0x27,0x8b,0x2c,0x1a,0x6c,0x1f,
+   0x60,0x84,0x5d,0x6d,0x10,0x00,0x05,
+   0x00}},
+ {{0x47,0x27,0x8b,0x30,0x1e,0x9e,0x1f,
+   0x92,0x86,0x8f,0x9f,0x30,0x00,0x05,
+   0x00}},
+ {{0x47,0x27,0x8b,0x2c,0x1a,0x6c,0x1f,
+   0x60,0x84,0x5d,0x6d,0x10,0x00,0x05,
+   0x00}},
+ {{0x47,0x27,0x8b,0x2c,0x1a,0xee,0x1f,
+   0xe2,0x86,0xdf,0xef,0x10,0x00,0x05,
+   0x00}},
+ {{0x51,0x31,0x95,0x36,0x04,0x66,0xf0,
+   0x5a,0x8e,0x57,0x67,0x20,0x00,0x01,
+   0x01}},
+ {{0x5f,0x3f,0x83,0x44,0x92,0x0e,0xf5,
+   0x02,0x86,0xff,0x0f,0x10,0x00,0x01,
+   0x01}},
+ {{0x6f,0x4f,0x93,0x54,0x82,0x0e,0x5a,
+   0x02,0x86,0xff,0x0f,0x09,0x00,0x05,
+   0x01}},
+ {{0x6f,0x4f,0x93,0x54,0x82,0x0e,0x5a,
+   0x02,0x86,0xff,0x0f,0x09,0x00,0x05,
+   0x01}}
+};
+
+static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11280x768_2[] = 
+{
+ {{0xab,0x60,0x9f,0x80,0x04,0x24,0xbb,
+   0x54,0x86,0xdb,0xda,0x00,0x00,0x02,
+   0x00}},
+ {{0xab,0x60,0x9f,0x80,0x04,0x24,0xbb,
+   0x3b,0x8d,0xc2,0xc1,0x00,0x00,0x02,
+   0x00}},
+ {{0xab,0x60,0x9f,0x80,0x04,0x24,0xbb,
+   0x54,0x86,0xdb,0xda,0x00,0x00,0x02,
+   0x00}},
+ {{0xab,0x60,0x9f,0x80,0x04,0x24,0xbb,
+   0x3b,0x8d,0xc2,0xc1,0x00,0x00,0x02,
+   0x00}},
+ {{0xab,0x60,0x9f,0x80,0x04,0x24,0xb3,
+   0x7c,0x8e,0x03,0x02,0x10,0x00,0x02,
+   0x01}},
+ {{0xab,0x63,0x8f,0x8a,0x8e,0x24,0xf1,
+   0xb6,0x88,0x57,0x25,0x10,0x00,0x02,
+   0x01}},
+ {{0xab,0x7f,0x8f,0x98,0x9c,0x24,0xf5,
+   0x0a,0x8c,0xff,0x25,0x30,0x00,0x02,
+   0x01}},
+ {{0xab,0x9f,0x8f,0xa8,0x8c,0x24,0xf5,
+   0x0a,0x8c,0xff,0x25,0x30,0x00,0x06,
+   0x01}},
+ {{0xab,0x9f,0x8f,0xa8,0x8c,0x24,0xf5,
+   0x0a,0x8c,0xff,0x25,0x30,0x00,0x06,
+   0x01}}
+};
+
+static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11280x768_2_H[] =
+{
+ {{0x83,0x38,0x97,0x58,0x9c,0x24,0xbb,
+   0x54,0x86,0xdb,0xda,0x00,0x00,0x01,
+   0x00}},
+ {{0x83,0x38,0x97,0x58,0x9c,0x24,0xbb,
+   0x3b,0x8d,0xc2,0xc1,0x00,0x00,0x01,
+   0x00}},
+ {{0x83,0x38,0x97,0x58,0x9c,0x24,0xbb,
+   0x54,0x86,0xdb,0xda,0x00,0x00,0x01,
+   0x00}},
+ {{0x83,0x38,0x97,0x58,0x9c,0x24,0xbb,
+   0x3b,0x8d,0xc2,0xc1,0x00,0x00,0x01,
+   0x00}},
+ {{0x83,0x38,0x97,0x58,0x9c,0x24,0xb3,
+   0x7c,0x8e,0x03,0x02,0x10,0x00,0x01,
+   0x01}},
+ {{0x79,0x31,0x9d,0x58,0x9c,0x24,0xf1,
+   0xb6,0x88,0x57,0x25,0x10,0x00,0x01,
+   0x01}},
+ {{0x6b,0x3f,0x8f,0x58,0x9c,0x24,0xf5,
+   0x0a,0x8c,0xff,0x25,0x30,0x00,0x01,
+   0x01}},
+ {{0xab,0x9f,0x8f,0xa8,0x8c,0x24,0xf5,
+   0x0a,0x8c,0xff,0x25,0x30,0x00,0x06,
+   0x01}},
+ {{0xab,0x9f,0x8f,0xa8,0x8c,0x24,0xf5,
+   0x0a,0x8c,0xff,0x25,0x30,0x00,0x06,
+   0x01}}
 };
 
 static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11024x600_1[] =
@@ -4057,131 +4613,143 @@
 };
 
 static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11600x1200_1[] =  
-{    /* TW: Temporary data - invalid */
- {{0x6f,0x4f,0x93,0x54,0x82,0x9e,0x1f,
-   0x93,0x86,0x8f,0x9f,0x30,0x00,0x05,
+{    
+ {{0x83,0x4f,0x87,0x51,0x09,0xc0,0x1f,
+   0x90,0x84,0x8f,0xc1,0x30,0x00,0x06,
    0x00}},
- {{0x6f,0x4f,0x93,0x54,0x82,0x6c,0x1f,
-   0x60,0x84,0x5d,0x6d,0x10,0x00,0x05,
+ {{0x83,0x4f,0x87,0x51,0x09,0x8e,0x1f,
+   0x5e,0x82,0x5d,0x8f,0x10,0x00,0x06,
    0x00}},
- {{0x6f,0x4f,0x93,0x54,0x82,0x9e,0x1f,
-   0x93,0x86,0x8f,0x9f,0x30,0x00,0x05,
+ {{0x83,0x4f,0x87,0x51,0x09,0xc0,0x1f,
+   0x90,0x84,0x8f,0xc1,0x30,0x00,0x06,
    0x00}},
- {{0x6f,0x4f,0x93,0x54,0x82,0x6c,0x1f,
-   0x60,0x84,0x5d,0x6d,0x10,0x00,0x05,
+ {{0x83,0x4f,0x87,0x51,0x09,0x8e,0x1f,
+   0x5e,0x82,0x5d,0x8f,0x10,0x00,0x06,
    0x00}},
- {{0x6f,0x4f,0x93,0x54,0x82,0xee,0x1f,
-   0xe2,0x86,0xdf,0xef,0x10,0x00,0x05,
+ {{0x83,0x4f,0x87,0x51,0x09,0x10,0x3e,
+   0xe0,0x84,0xdf,0x11,0x00,0x00,0x06,
    0x00}},
- {{0x83,0x63,0x87,0x68,0x16,0x66,0xf0,
-   0x5a,0x8e,0x57,0x67,0x20,0x00,0x06,
+ {{0x97,0x63,0x9b,0x65,0x1d,0x88,0xf0,
+   0x58,0x8c,0x57,0x89,0x20,0x00,0x06,
    0x01}},
- {{0x9f,0x7f,0x83,0x84,0x92,0x0e,0xf5,
-   0x02,0x86,0xff,0x0f,0x10,0x00,0x02,
+ {{0xb3,0x7f,0x97,0x81,0x99,0x30,0xf5,
+   0x00,0x84,0xff,0x31,0x10,0x00,0x02,
    0x01}},
- {{0xbf,0x9f,0x83,0xa4,0x12,0x0e,0x5a,
-   0x02,0x86,0xff,0x0f,0x09,0x00,0x07,
+ {{0xd3,0x9f,0x97,0xa1,0x19,0x30,0x5a,
+   0x00,0x84,0xff,0x31,0x09,0x00,0x07,
    0x01}},
- {{0xce,0xae,0x92,0xb3,0x01,0x28,0x10,
-   0x1a,0x80,0x19,0x29,0x0f,0x00,0x03,
+ {{0xe2,0xae,0x86,0xb0,0x88,0x4a,0x10,
+   0x1a,0x8e,0x19,0x4b,0x2f,0x00,0x03,
+   0x00}},
+ {{0xfb,0xc7,0x9f,0xc9,0x81,0xe0,0x10,
+   0xb0,0x84,0xaf,0xe1,0x2f,0x00,0x07,
    0x00}}
 };
 
 static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11600x1200_1_H[] =
-{    /* TW: Temporary data - invalid */
- {{0x47,0x27,0x8b,0x2c,0x1a,0x9e,0x1f,
-   0x93,0x86,0x8f,0x9f,0x30,0x00,0x05,
+{ 
+ {{0x5b,0x27,0x9f,0x29,0x01,0xc0,0x1f,
+   0x90,0x84,0x8f,0xc1,0x30,0x00,0x01,
    0x00}},
- {{0x47,0x27,0x8b,0x2c,0x1a,0x6c,0x1f,
-   0x60,0x84,0x5d,0x6d,0x10,0x00,0x05,
+ {{0x5b,0x27,0x9f,0x29,0x01,0x8e,0x1f,
+   0x5e,0x82,0x5d,0x8f,0x10,0x00,0x01,
    0x00}},
- {{0x47,0x27,0x8b,0x30,0x1e,0x9e,0x1f,
-   0x92,0x86,0x8f,0x9f,0x30,0x00,0x05,
+ {{0x5b,0x27,0x9f,0x29,0x01,0xc0,0x1f,
+   0x90,0x84,0x8f,0xc1,0x30,0x00,0x01,
    0x00}},
- {{0x47,0x27,0x8b,0x2c,0x1a,0x6c,0x1f,
-   0x60,0x84,0x5d,0x6d,0x10,0x00,0x05,
+ {{0x5b,0x27,0x9f,0x29,0x01,0x8e,0x1f,
+   0x5e,0x82,0x5d,0x8f,0x10,0x00,0x01,
    0x00}},
- {{0x47,0x27,0x8b,0x2c,0x1a,0xee,0x1f,
-   0xe2,0x86,0xdf,0xef,0x10,0x00,0x05,
+ {{0x5b,0x27,0x9f,0x29,0x01,0x10,0x3e,
+   0xe0,0x84,0xdf,0x11,0x00,0x00,0x01,
    0x00}},
- {{0x51,0x31,0x95,0x36,0x04,0x66,0xf0,
-   0x5a,0x8e,0x57,0x67,0x20,0x00,0x01,
+ {{0x65,0x31,0x89,0x33,0x8b,0x88,0xf0,
+   0x58,0x8c,0x57,0x89,0x20,0x00,0x01,
    0x01}},
- {{0x5f,0x3f,0x83,0x44,0x92,0x0e,0xf5,
-   0x02,0x86,0xff,0x0f,0x10,0x00,0x01,
+ {{0x73,0x3f,0x97,0x41,0x99,0x30,0xf5,
+   0x00,0x84,0xff,0x31,0x10,0x00,0x01,
    0x01}},
- {{0x6f,0x4f,0x93,0x54,0x82,0x0e,0x5a,
-   0x02,0x86,0xff,0x0f,0x09,0x00,0x05,
+ {{0x83,0x4f,0x87,0x51,0x09,0x30,0x5a,
+   0x00,0x84,0xff,0x31,0x09,0x00,0x06,
    0x01}},
- {{0x76,0x56,0x9a,0x5b,0x89,0x28,0x10,
-   0x1c,0x80,0x19,0x29,0x0b,0x00,0x05,
+ {{0x8a,0x56,0x8e,0x58,0x10,0x4a,0x10,
+   0x1a,0x8e,0x19,0x4b,0x2f,0x00,0x06,
+   0x00}},
+ {{0x97,0x63,0x9b,0x65,0x1d,0xe0,0x10,
+   0xb0,0x84,0xaf,0xe1,0x2f,0x00,0x06,
    0x00}}
 };
 
 static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11600x1200_2[] =
-{    /* TW: Temporary data - invalid */
- {{0xce,0x4f,0x92,0x8c,0x1a,0x28,0x9a,
-   0xdb,0x8f,0x8f,0x29,0x21,0x00,0x03,
-   0x00}},
- {{0xce,0x4f,0x92,0x8c,0x1a,0x28,0x9a,
-   0xc2,0x86,0x5d,0x29,0x01,0x00,0x03,
+{    
+ {{0xfb,0x88,0x87,0x90,0x08,0xe0,0x96,
+   0x20,0x84,0xb9,0xb8,0x01,0x00,0x07,
    0x01}},
- {{0xce,0x4f,0x92,0x8c,0x1a,0x28,0x9a,
-   0xdb,0x8f,0x8f,0x29,0x21,0x00,0x03,
-   0x00}},
- {{0xce,0x4f,0x92,0x8c,0x1a,0x28,0x9a,
-   0xc2,0x86,0x5d,0x29,0x01,0x00,0x03,
-   0x00}},
- {{0xce,0x4f,0x92,0x8c,0x1a,0x28,0x9e,
-   0x03,0x87,0xdf,0x29,0x01,0x00,0x03,
-   0x00}},
- {{0xce,0x63,0x92,0x96,0x04,0x28,0xd4,
-   0x3f,0x83,0x57,0x29,0x01,0x00,0x07,
+ {{0xfb,0x88,0x87,0x90,0x08,0xe0,0x96,
+   0x07,0x8b,0xa0,0x9f,0x01,0x00,0x07,
    0x01}},
- {{0xce,0x7f,0x92,0xa4,0x12,0x28,0xd4,
-   0x93,0x87,0xff,0x29,0x21,0x00,0x07,
+ {{0xfb,0x88,0x87,0x90,0x08,0xe0,0x96,
+   0x20,0x84,0xb9,0xb8,0x01,0x00,0x07,
    0x01}},
- {{0xce,0x9f,0x92,0xb4,0x02,0x28,0x5a,
-   0x13,0x87,0xff,0x29,0x29,0x00,0x03,
+ {{0xfb,0x88,0x87,0x90,0x08,0xe0,0x96,
+   0x07,0x8b,0xa0,0x9f,0x01,0x00,0x07,
    0x01}},
- {{0xce,0xae,0x92,0xbc,0x0a,0x28,0x10,
-   0x20,0x84,0x19,0x29,0x0f,0x00,0x03,
+ {{0xfb,0x88,0x87,0x90,0x08,0xe0,0x96,
+   0x48,0x8c,0xe1,0xe0,0x11,0x00,0x07,
+   0x01}},
+ {{0xfb,0x63,0x9f,0x9a,0x92,0xe0,0xd4,
+   0x9b,0x8f,0x9d,0x9c,0x21,0x00,0x07,
+   0x01}},
+ {{0xfb,0x7f,0x9f,0xa8,0x80,0xe0,0xd4,
+   0xef,0x83,0xff,0xe1,0x21,0x00,0x03,
+   0x01}},
+ {{0xfb,0x9f,0x9f,0xb8,0x90,0xe0,0x5a,
+   0x6f,0x83,0xff,0xe1,0x29,0x00,0x03,
+   0x01}},
+ {{0xfb,0xae,0x9f,0xbf,0x97,0xe0,0x10,
+   0x7c,0x80,0x19,0xe1,0x0f,0x00,0x03,
+   0x00}},
+ {{0xfb,0xc7,0x9f,0xc9,0x84,0xe0,0x10,
+   0xc7,0x8b,0xaf,0xe1,0x0f,0x00,0x07,
    0x00}}
 };
 
-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11600x1200_2_H[] =    /* TW: New */
-{    /* TW: Temporary data - invalid */
- {{0xa6,0x27,0x8a,0x64,0x92,0x28,0x9a,
-   0xdb,0x8f,0x8f,0x29,0x21,0x00,0x06,
-   0x00}},
- {{0xa6,0x27,0x8a,0x64,0x92,0x28,0x9a,
-   0xc2,0x86,0x5d,0x29,0x01,0x00,0x06,
-   0x00}},
- {{0xa6,0x27,0x8a,0x64,0x92,0x28,0x9a,
-   0xdb,0x8f,0x8f,0x29,0x21,0x00,0x06,
-   0x00}},
- {{0xa6,0x27,0x8a,0x64,0x92,0x28,0x9a,
-   0xc2,0x86,0x5d,0x29,0x01,0x00,0x06,
-   0x00}},
- {{0xa6,0x27,0x8a,0x64,0x92,0x28,0x9e,
-   0x03,0x87,0xdf,0x29,0x01,0x00,0x06,
-   0x00}},
- {{0x9c,0x31,0x80,0x64,0x92,0x28,0xd4,
-   0x3f,0x83,0x57,0x29,0x01,0x00,0x06,
+static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11600x1200_2_H[] = 
+{    
+ {{0xd3,0x60,0x9f,0x68,0x00,0xe0,0x96,
+   0x20,0x84,0xb9,0xb8,0x01,0x00,0x02,
    0x01}},
- {{0x8e,0x3f,0x92,0x64,0x12,0x28,0xd4,
-   0x93,0x87,0xff,0x29,0x21,0x00,0x06,
+ {{0xd3,0x60,0x9f,0x68,0x00,0xe0,0x96,
+   0x07,0x8b,0xa0,0x9f,0x01,0x00,0x02,
    0x01}},
- {{0x7e,0x4f,0x82,0x64,0x12,0x28,0x5a,
-   0x13,0x87,0xff,0x29,0x29,0x00,0x06,
+ {{0xd3,0x60,0x9f,0x68,0x00,0xe0,0x96,
+   0x20,0x84,0xb9,0xb8,0x01,0x00,0x02,
    0x01}},
- {{0x76,0x56,0x9a,0x64,0x92,0x28,0x10,
-   0x20,0x84,0x19,0x29,0x0f,0x00,0x05,
+ {{0xd3,0x60,0x9f,0x68,0x00,0xe0,0x96,
+   0x07,0x8b,0xa0,0x9f,0x01,0x00,0x02,
+   0x01}},
+ {{0xd3,0x60,0x9f,0x68,0x00,0xe0,0x96,
+   0x48,0x8c,0xe1,0xe0,0x11,0x00,0x02,
+   0x01}},
+ {{0xc9,0x31,0x8d,0x68,0x00,0xe0,0xd4,
+   0x9b,0x8f,0x9d,0x9c,0x21,0x00,0x03,
+   0x01}},
+ {{0xbb,0x3f,0x9f,0x68,0x80,0xe0,0xd4,
+   0xef,0x83,0xff,0xe1,0x21,0x00,0x02,
+   0x01}},
+ {{0xab,0x4f,0x8f,0x68,0x80,0xe0,0x5a,
+   0x6f,0x83,0xff,0xe1,0x29,0x00,0x02,
+   0x01}},
+ {{0xa3,0x56,0x87,0x67,0x9f,0xe0,0x10,
+   0x7c,0x80,0x19,0xe1,0x0f,0x00,0x06,
+   0x00}},
+ {{0x97,0x63,0x9b,0x68,0x00,0xe0,0x10,
+   0xc7,0x8b,0xaf,0xe1,0x0f,0x00,0x02,
    0x00}}
 };
 
 
-static const SiS310_LVDSCRT1DataStruct  SiS310_CHTVCRT1UNTSC[] =    /* TW: New */
+static const SiS310_LVDSCRT1DataStruct  SiS310_CHTVCRT1UNTSC[] =  
 { 
 	{{0x64,0x4f,0x88,0x56,0x9f,0x56,0x3e,
 	  0xe8,0x84,0x8f,0x57,0x20,0x00,0x01,
@@ -4206,7 +4774,7 @@
 	  0x01}}
 };
 
-static const SiS310_LVDSCRT1DataStruct  SiS310_CHTVCRT1ONTSC[] =    /* TW: New */
+static const SiS310_LVDSCRT1DataStruct  SiS310_CHTVCRT1ONTSC[] =   
 { 
 	{{0x63,0x4f,0x87,0x5a,0x9f,0x0b,0x3e,
 	  0xc0,0x84,0x8f,0x0c,0x20,0x00,0x01,
@@ -4231,7 +4799,7 @@
 	  0x01 }}
 };
 
-static const SiS310_LVDSCRT1DataStruct  SiS310_CHTVCRT1UPAL[] =    /* TW: New */
+static const SiS310_LVDSCRT1DataStruct  SiS310_CHTVCRT1UPAL[] =    
 { 
 	{{0x79,0x4f,0x9d,0x5a,0x90,0x6f,0x3e,
 	  0xf8,0x83,0x8f,0x70,0x20,0x00,0x05,
@@ -4256,8 +4824,8 @@
 	  0x01}}
 };
 
-static const SiS310_LVDSCRT1DataStruct  SiS310_CHTVCRT1OPAL[] =    /* TW: New */
-{ 
+static const SiS310_LVDSCRT1DataStruct  SiS310_CHTVCRT1OPAL[] = 
+{
 	{{0x79,0x4f,0x9d,0x5a,0x90,0x6f,0x3e,
 	  0xf0,0x83,0x8f,0x70,0x20,0x00,0x05,
 	  0x00 }},
@@ -4281,13 +4849,39 @@
 	  0x01 }}
 };
 
-/* TW: New data for Chrontel 7019 (From 650/LVDS BIOS 1.10.0) */
+static const SiS310_LVDSCRT1DataStruct  SiS310_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,0x58,0x9d,0x6f,0xba,
+	  0x15,0x83,0xdf,0x70,0x00,0x00,0x01,
+	  0x00 }},
+	{{0x71,0x63,0x95,0x69,0x8c,0x6f,0xf0,
+	  0x5a,0x8b,0x57,0x70,0x20,0x00,0x05,
+	  0x01 }},
+	{{0xaa,0x7f,0x8e,0x8f,0x96,0x69,0xf5,   /* TW:  1024x768 */
+	  0x28,0x88,0xff,0x6a,0x10,0x00,0x02,
+	  0x01 }}
+};
+
+/* TW: Data for Chrontel 7019  */
 typedef struct _SiS310_CHTVRegDataStruct
 {
  	UCHAR Reg[16];
 } SiS310_CHTVRegDataStruct;
 
-static const SiS310_CHTVRegDataStruct SiS310_CHTVReg_UNTSC[] = {
+static const SiS310_CHTVRegDataStruct SiS310_CHTVReg_UNTSC[] =
+{
 	{{0x4a,0x77,0xbb,0x94,0x84,0x48,0xfe,0x50,0x04,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
 	{{0x4a,0x77,0xbb,0x94,0x84,0x48,0xfe,0x50,0x04,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
 	{{0x4a,0x77,0xbb,0x94,0x84,0x48,0xfe,0x50,0x04,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
@@ -4297,7 +4891,8 @@
 	{{0xee,0x77,0xbb,0x66,0x87,0x32,0x01,0x5a,0x04,0x00,0x80,0x1b,0xd3,0xf2,0x36,0x00}}
 };
 
-static const SiS310_CHTVRegDataStruct SiS310_CHTVReg_ONTSC[] = {
+static const SiS310_CHTVRegDataStruct SiS310_CHTVReg_ONTSC[] =
+{
 	{{0x49,0x77,0xbb,0x7b,0x84,0x34,0x00,0x50,0x04,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
 	{{0x49,0x77,0xbb,0x7b,0x84,0x34,0x00,0x50,0x04,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
 	{{0x49,0x77,0xbb,0x7b,0x84,0x34,0x00,0x50,0x04,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
@@ -4307,7 +4902,8 @@
 	{{0xed,0x77,0xbb,0x66,0x8c,0x21,0x02,0x5a,0x04,0x00,0x80,0x1f,0x9f,0xc1,0x0c,0x00}}
 };
 
-static const SiS310_CHTVRegDataStruct SiS310_CHTVReg_UPAL[] = {
+static const SiS310_CHTVRegDataStruct SiS310_CHTVReg_UPAL[] =
+{
 	{{0x41,0x7f,0xb7,0x34,0xad,0x50,0x34,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
 	{{0x41,0x7f,0xb7,0x80,0x85,0x50,0x00,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
 	{{0x41,0x7f,0xb7,0x34,0xad,0x50,0x34,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
@@ -4317,7 +4913,8 @@
 	{{0xe5,0x7f,0xb7,0x1d,0xa7,0x3e,0x04,0x5a,0x05,0x00,0x80,0x20,0x3e,0xe4,0x22,0x00}}
 };
 
-static const SiS310_CHTVRegDataStruct SiS310_CHTVReg_OPAL[] = {
+static const SiS310_CHTVRegDataStruct SiS310_CHTVReg_OPAL[] =
+{
 	{{0x41,0x7f,0xb7,0x36,0xad,0x50,0x34,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
 	{{0x41,0x7f,0xb7,0x86,0x85,0x50,0x00,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
 	{{0x41,0x7f,0xb7,0x36,0xad,0x50,0x34,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
@@ -4327,6 +4924,61 @@
 	{{0xe4,0x7f,0xb7,0x1e,0xaf,0x29,0x37,0x5a,0x05,0x00,0x80,0x25,0x8c,0xb2,0x2a,0x00}}
 };
 
+static const SiS310_CHTVRegDataStruct SiS310_CHTVReg_SOPAL[] =
+{
+	{{0x41,0x7f,0xb7,0x36,0xad,0x50,0x34,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
+	{{0x41,0x7f,0xb7,0x86,0x85,0x50,0x00,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
+	{{0x41,0x7f,0xb7,0x36,0xad,0x50,0x34,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
+	{{0x41,0x7f,0xb7,0x86,0x85,0x50,0x00,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
+	{{0x61,0x7f,0xb7,0x99,0x84,0x35,0x04,0x5a,0x05,0x00,0x80,0x26,0x2a,0x55,0x5d,0x00}},
+	{{0xc1,0x7f,0xb7,0x4d,0x8c,0x1e,0x31,0x5a,0x05,0x00,0x80,0x26,0x78,0x19,0x34,0x00}},
+	{{0xe4,0x7f,0xb7,0x1e,0xaf,0x29,0x37,0x5a,0x05,0x00,0x80,0x25,0x8c,0xb2,0x2a,0x00}}
+};
+
+static const SiS310_CHTVRegDataStruct SiS310_CHTVReg_UPALM[] =
+{
+	{{0x52,0x77,0xbb,0x94,0x84,0x48,0xfe,0x50,0x04,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
+	{{0x52,0x77,0xbb,0x94,0x84,0x48,0xfe,0x50,0x04,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
+	{{0x52,0x77,0xbb,0x94,0x84,0x48,0xfe,0x50,0x04,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
+	{{0x52,0x77,0xbb,0x94,0x84,0x48,0xfe,0x50,0x04,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
+	{{0x72,0x77,0xbb,0x6e,0x84,0x2e,0x02,0x5a,0x04,0x00,0x80,0x20,0x76,0xdb,0x6e,0x00}},
+	{{0xd7,0x77,0xb7,0xc8,0x84,0x3b,0x02,0x5a,0x04,0x00,0x80,0x19,0x84,0x0a,0xc7,0x00}},
+	{{0xf6,0x77,0xbb,0x66,0x87,0x32,0x01,0x5a,0x04,0x00,0x80,0x1b,0xdc,0xb0,0x8d,0x00}}
+};
+
+static const SiS310_CHTVRegDataStruct SiS310_CHTVReg_OPALM[] =
+{
+	{{0x51,0x77,0xbb,0x7b,0x84,0x34,0x00,0x50,0x04,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
+	{{0x51,0x77,0xbb,0x7b,0x84,0x34,0x00,0x50,0x04,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
+	{{0x51,0x77,0xbb,0x7b,0x84,0x34,0x00,0x50,0x04,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
+	{{0x51,0x77,0xbb,0x7b,0x84,0x34,0x00,0x50,0x04,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
+	{{0x71,0x77,0xbb,0x6e,0x84,0x1e,0x00,0x5a,0x04,0x00,0x80,0x25,0x1a,0x1f,0x59,0x00}},
+	{{0xd6,0x77,0xb7,0xb6,0x83,0x2c,0x02,0x5a,0x04,0x00,0x80,0x1b,0xf8,0x1f,0x82,0x00}},
+	{{0xf5,0x77,0xbb,0x66,0x8c,0x21,0x02,0x5a,0x04,0x00,0x80,0x1f,0x58,0x46,0x9f,0x00}}
+};
+
+static const SiS310_CHTVRegDataStruct SiS310_CHTVReg_UPALN[] =
+{
+	{{0x41,0x7f,0xb7,0x34,0xad,0x50,0x34,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
+	{{0x41,0x7f,0xb7,0x80,0x85,0x50,0x00,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
+	{{0x41,0x7f,0xb7,0x34,0xad,0x50,0x34,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
+	{{0x41,0x7f,0xb7,0x12,0x85,0x50,0x00,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
+	{{0x61,0x7f,0xb7,0x99,0x84,0x35,0x04,0x5a,0x05,0x00,0x80,0x1f,0x0d,0x54,0x5e,0x00}},
+	{{0xc3,0x7f,0xb7,0x7a,0x84,0x40,0x02,0x5a,0x05,0x00,0x80,0x19,0x78,0xef,0x35,0x00}},
+	{{0xe5,0x7f,0xb7,0x1d,0xa7,0x3e,0x04,0x5a,0x05,0x00,0x80,0x1a,0x33,0x3f,0x2f,0x00}}
+};
+
+static const SiS310_CHTVRegDataStruct SiS310_CHTVReg_OPALN[] =
+{
+	{{0x41,0x7f,0xb7,0x36,0xad,0x50,0x34,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
+	{{0x41,0x7f,0xb7,0x86,0x85,0x50,0x00,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
+	{{0x41,0x7f,0xb7,0x36,0xad,0x50,0x34,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
+	{{0x41,0x7f,0xb7,0x86,0x85,0x50,0x00,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01}},
+	{{0x61,0x7f,0xb7,0x99,0x84,0x35,0x04,0x5a,0x05,0x00,0x80,0x1f,0x0d,0x54,0x5e,0x00}},
+	{{0xc1,0x7f,0xb7,0x4d,0x8c,0x1e,0x31,0x5a,0x05,0x00,0x80,0x1f,0x15,0xc0,0x1e,0x00}},
+	{{0xe4,0x7f,0xb7,0x1e,0xaf,0x29,0x37,0x5a,0x05,0x00,0x80,0x1d,0xf1,0x6c,0xcb,0x00}}
+};
+
 static const UCHAR SiS310_CHTVVCLKUNTSC[] = {0x41,0x41,0x41,0x41,0x42,0x46,0x53};
 
 static const UCHAR SiS310_CHTVVCLKONTSC[] = {0x48,0x48,0x48,0x48,0x45,0x43,0x51};
@@ -4334,4 +4986,14 @@
 static const UCHAR SiS310_CHTVVCLKUPAL[]  = {0x47,0x47,0x47,0x47,0x48,0x4a,0x54};
 
 static const UCHAR SiS310_CHTVVCLKOPAL[]  = {0x47,0x47,0x47,0x47,0x48,0x4f,0x52};
-/* TW: New end */
+
+static const UCHAR SiS310_CHTVVCLKSOPAL[] = {0x47,0x47,0x47,0x47,0x48,0x4f,0x52};
+
+static const UCHAR SiS310_CHTVVCLKUPALM[] = {0x41,0x41,0x41,0x41,0x42,0x46,0x53};
+
+static const UCHAR SiS310_CHTVVCLKOPALM[] = {0x48,0x48,0x48,0x48,0x45,0x43,0x51};
+
+static const UCHAR SiS310_CHTVVCLKUPALN[] = {0x47,0x47,0x47,0x47,0x48,0x4a,0x54};
+
+static const UCHAR SiS310_CHTVVCLKOPALN[] = {0x47,0x47,0x47,0x47,0x48,0x4f,0x52};
+

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)