diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 19:45:40 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:45:40 +0000 |
| commit | 2a8d0bc1b050224139cf787946d2e433481b2e17 (patch) | |
| tree | d07f68083a5be7fe46d2cc68d474ac7984da2dcb /src/init301.h | |
| parent | 36986a29abd7777a7f5aed82c8a5a277c33c456e (diff) | |
Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE
Diffstat (limited to 'src/init301.h')
| -rw-r--r-- | src/init301.h | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/src/init301.h b/src/init301.h index 7766716..9e86ee1 100644 --- a/src/init301.h +++ b/src/init301.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/init301.h,v 1.45 2004/02/29 19:54:14 twini Exp $ */ +/* $XFree86$ */ /* * Data and prototypes for init301.c * @@ -88,41 +88,29 @@ const UCHAR SiS_YPbPrTable[3][64] = { 0x06,0x14,0x0d,0x04,0x0a,0x00,0x85,0x1b, 0x0c,0x50,0x00,0x97,0x00,0xda,0x4a,0x17, 0x7d,0x05,0x4b,0x00,0x00,0xe2,0x00,0x02, - 0x03,0x0a,0x65,0x8d /*0x9d*/,0x08,0x92,0x8f,0x40, - 0x60,0x80,0x14,0x90,0x8c,0x60,0x14,0x50 /*0x53*/, + 0x03,0x0a,0x65,0x9d,0x08,0x92,0x8f,0x40, + 0x60,0x80,0x14,0x90,0x8c,0x60,0x14,0x53, 0x00,0x40,0x44,0x00,0xdb,0x02,0x3b,0x00 }, { 0x1d,0x11,0x06,0x09,0x0b,0x0c,0x0c,0x0c, 0x98,0x0a,0x01,0x0d,0x06,0x0d,0x04,0x0a, 0x06,0x14,0x0d,0x04,0x0a,0x00,0x85,0x3f, - 0x0c,0x50,0xb2,0x9f,0x16,0x59,0x4c /*0x4f*/,0x13, + 0x0c,0x50,0xb2,0x9f,0x16,0x59,0x4f,0x13, 0xad,0x11,0xad,0x1d,0x40,0x8a,0x3d,0xb8, - 0x51,0x5e,0x60,0x57 /*0x49*/,0x7b /*0x7d*/,0x92,0x0f,0x40, + 0x51,0x5e,0x60,0x49,0x7d,0x92,0x0f,0x40, 0x60,0x80,0x14,0x90,0x8c,0x60,0x14,0x4b, 0x43,0x41,0x11,0x00,0xfc,0xff,0x32,0x00 }, { -#if 1 0x13,0x1d,0xe8,0x09,0x09,0xed,0x0c,0x0c, 0x98,0x0a,0x01,0x0c,0x06,0x0d,0x04,0x0a, 0x06,0x14,0x0d,0x04,0x0a,0x00,0x85,0x3f, - 0xed,0x50,0x70,0x9f,0x16,0x59,0x21 /*0x2b*/,0x13, + 0xed,0x50,0x70,0x9f,0x16,0x59,0x2b,0x13, 0x27,0x0b,0x27,0xfc,0x30,0x27,0x1c,0xb0, - 0x4b,0x4b,0x65 /*0x6f*/,0x2f,0x63,0x92,0x0f,0x40, + 0x4b,0x4b,0x6f,0x2f,0x63,0x92,0x0f,0x40, 0x60,0x80,0x14,0x90,0x8c,0x60,0x14,0x27, 0x00,0x40,0x11,0x00,0xfc,0xff,0x32,0x00 -#endif -#if 0 - 0x2a,0x14,0xe8,0x09,0x09,0xed,0x0c,0x0c, /* TEST (0.93) - BAD */ - 0x98,0x0a,0x01,0x0c,0x06,0x0d,0x04,0x0a, - 0x06,0x14,0x0d,0x04,0x0a,0x00,0x85,0x3f, - 0xed,0x50,0x70,0x9e,0x16,0x57,0x6c,0x13, - 0x27,0x0b,0x27,0xfb,0x30,0x27,0x15,0xb0, - 0x3b,0xdb,0x61,0x24,0x78,0x92,0x0f,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0x14,0x6f, - 0x00,0x52,0xbb,0x00,0xd5,0xf7,0xa2,0x00 -#endif } }; @@ -148,7 +136,7 @@ const UCHAR SiS_HiTVGroup3_2[] = { 0x18, 0x1d, 0x23, 0x28, 0x4c, 0xaa, 0x01 }; -/* 301C / 302ELV extended Part2 TV registers */ +/* 301C / 302ELV (?) extended Part2 TV registers */ static const UCHAR SiS_Part2CLVX_1[] = { 0x00,0x00, |