summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/300vtbl.h2
-rw-r--r--src/310vtbl.h2
-rw-r--r--src/init.c8
-rw-r--r--src/init.h27
-rw-r--r--src/init301.c64
-rw-r--r--src/init301.h28
-rw-r--r--src/initdef.h2
-rw-r--r--src/oem300.h2
-rw-r--r--src/oem310.h2
-rw-r--r--src/osdef.h2
-rw-r--r--src/sis.h6
-rw-r--r--src/sis300_accel.c2
-rw-r--r--src/sis300_accel.h2
-rw-r--r--src/sis310_accel.c2
-rw-r--r--src/sis310_accel.h2
-rw-r--r--src/sis6326_video.c2
-rw-r--r--src/sis_accel.c2
-rw-r--r--src/sis_accel.h2
-rw-r--r--src/sis_common.h2
-rw-r--r--src/sis_cursor.c2
-rw-r--r--src/sis_cursor.h2
-rw-r--r--src/sis_dac.c2
-rw-r--r--src/sis_dac.h2
-rw-r--r--src/sis_dga.c2
-rw-r--r--src/sis_dri.c2
-rw-r--r--src/sis_dri.h2
-rw-r--r--src/sis_driver.c21
-rw-r--r--src/sis_driver.h2
-rw-r--r--src/sis_opt.c2
-rw-r--r--src/sis_regs.h2
-rw-r--r--src/sis_setup.c2
-rw-r--r--src/sis_shadow.c2
-rw-r--r--src/sis_vb.c2
-rw-r--r--src/sis_vga.c2
-rw-r--r--src/sis_video.c2
-rw-r--r--src/vgatypes.h2
-rw-r--r--src/vstruct.h2
37 files changed, 81 insertions, 135 deletions
diff --git a/src/300vtbl.h b/src/300vtbl.h
index 0bd1cd5..5c418bd 100644
--- a/src/300vtbl.h
+++ b/src/300vtbl.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/300vtbl.h,v 1.25 2004/02/26 09:16:17 twini Exp $ */
+/* $XFree86$ */
/*
* Register settings for SiS 300 series
*
diff --git a/src/310vtbl.h b/src/310vtbl.h
index 43425a1..764a5f6 100644
--- a/src/310vtbl.h
+++ b/src/310vtbl.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/310vtbl.h,v 1.26 2004/02/25 23:22:15 twini Exp $ */
+/* $XFree86$ */
/*
* Register settings for SiS 315/330 series
*
diff --git a/src/init.c b/src/init.c
index c6a175d..f94f89e 100644
--- a/src/init.c
+++ b/src/init.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/init.c,v 1.54 2004/02/29 19:54:12 twini Exp $ */
+/* $XFree86$ */
/*
* Mode initializing code (CRT1 section) for
* for SiS 300/305/540/630/730 and
@@ -995,16 +995,14 @@ SiS_GetModeID_TV(int VGAEngine, ULONG VBFlags, int HDisplay, int VDisplay, int D
if((VBFlags & TV_YPBPR) || (VBFlags & (TV_NTSC | TV_PALM)))
ModeIndex = ModeIndex_720x480[Depth];
} else if(VDisplay == 576) {
- if( ((VBFlags & TV_YPBPR) && (VBFlags & TV_YPBPR750P)) ||
- ((!(VBFlags & (TV_YPBPR | TV_PALM))) && (VBFlags & TV_PAL)) )
+ if((!(VBFlags & (TV_YPBPR | TV_PALM))) && (VBFlags & TV_PAL))
ModeIndex = ModeIndex_720x576[Depth];
}
}
break;
case 768:
if((!(VBFlags & TV_HIVISION)) && (!((VBFlags & TV_YPBPR) && (VBFlags & TV_YPBPR1080I)))) {
- if( ((VBFlags & TV_YPBPR) && (VBFlags & TV_YPBPR750P)) ||
- ((!(VBFlags & (TV_YPBPR | TV_PALM))) && (VBFlags & TV_PAL)) ) {
+ if((!(VBFlags & (TV_YPBPR | TV_PALM))) && (VBFlags & TV_PAL)) {
if(VDisplay == 576) ModeIndex = ModeIndex_768x576[Depth];
}
}
diff --git a/src/init.h b/src/init.h
index 32f2634..9684c68 100644
--- a/src/init.h
+++ b/src/init.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/init.h,v 1.49 2004/02/29 19:54:12 twini Exp $ */
+/* $XFree86$ */
/*
* Data and prototypes for init.c
*
@@ -922,19 +922,6 @@ static const SiS_TVDataStruct SiS_St750pData[] =
static const SiS_TVDataStruct SiS_Ext750pData[] =
{
-#if 1
- { 143, 65, 0x35a,0x1bb,0x4f6,0x1b8,0x0ab, 0, 0x0ab, 0x00,0x00,0x00,0x00},
- { 88, 35, 0x35a,0x189,0x4f6,0x1b8,0x0ab, 0, 0x0ab, 0x00,0x00,0x00,0x00},
- { 18, 5, 0x339,0x1ae,0x500,0x2d0,0x05c, 0, 0x05c, 0x00,0x00,0x00,0x00},
- { 143, 70, 0x39c,0x189,0x4f6,0x1b8,0x05c, 0, 0x05c, 0x00,0x00,0x00,0x00},
- { 99, 32, 0x320,0x1fe,0x500,0x2d0, 50, 0, 0, 0x00,0x00,0x00,0x00}, /* 640x480 */
- { 5, 4, 0x5d8,0x29e,0x500,0x2a8, 50, 0, 0, 0x00,0x00,0x00,0x00}, /* 800x600 */
- { 2, 1, 0x35a,0x1f7,0x4f6,0x1e0, 0,128, 0, 0x00,0x00,0x00,0x00}, /* 720x480 */
- { 68, 64, 0x55f,0x346,0x500,0x2a8,0x27e, 0, 0, 0x00,0x00,0x00,0x00}, /* 1024x768 */
- { 5, 2, 0x3a7,0x226,0x500,0x2a8, 0,128, 0, 0x00,0x00,0x00,0x00}, /* 720x576 */
- { 25, 24, 0x5d8,0x2f3,0x460,0x2a8, 50, 0, 0, 0x00,0x00,0x00,0x00} /* 1280x720 */
-#endif
-#if 0
{ 3, 1, 0x3a7,0x1d6,0x500,0x2a8, 50, 0, 0, 0x00,0x00,0x00,0x00},
{ 24, 7, 0x3a7,0x1a4,0x500,0x2a8, 50, 0, 0, 0x00,0x00,0x00,0x00},
{ 3, 1, 0x3a7,0x1d6,0x500,0x2a8, 50, 0, 0, 0x00,0x00,0x00,0x00},
@@ -944,18 +931,6 @@ static const SiS_TVDataStruct SiS_Ext750pData[] =
{ 2, 1, 0x35a,0x1f7,0x4f6,0x1e0, 0,128, 0, 0x00,0x00,0x00,0x00}, /* 720x480 */
{ 68, 64, 0x55f,0x346,0x500,0x2a8,0x27e, 0, 0, 0x00,0x00,0x00,0x00}, /* 1024x768 */
{ 25, 24, 0x5d8,0x2f3,0x460,0x2a8, 50, 0, 0, 0x00,0x00,0x00,0x00} /* 1280x720 */
-#endif
-#if 0
- { 136, 35, 0x339,0x181,0x460,0x2a8, 50, 0, 0, 0x00,0x00,0x00,0x00}, /* TEST (0.93) */
- { 17, 6, 0x339,0x203,0x460,0x2a8, 50, 0, 50, 0x00,0x00,0x00,0x00},
- { 136, 35, 0x339,0x181,0x460,0x2a8, 50, 0, 50, 0x00,0x00,0x00,0x00},
- { 17, 6, 0x339,0x203,0x460,0x2a8, 50, 0, 50, 0x00,0x00,0x00,0x00},
- { 85, 46, 0x3f4,0x27b,0x460,0x2a8, 50, 0, 0, 0x00,0x00,0x00,0x00}, /* 640x480 */
- { 17, 16, 0x55f,0x323,0x460,0x2a8,0x2b6, 0, 0, 0x00,0x00,0x00,0x00}, /* 800x600 */
- { 136, 35, 0x339,0x181,0x460,0x2a8, 50, 0, 0, 0x00,0x00,0x00,0x00}, /* 720x480 */
- { 187, 74, 0x39d,0x203,0x460,0x2a8, 50, 0, 0, 0x00,0x00,0x00,0x00}, /* 1024x768 */
- { 25, 24, 0x5d8,0x2f3,0x460,0x2a8, 50, 0, 50, 0x00,0x00,0x00,0x00} /* 1280x720 */
-#endif
};
static const SiS_LCDDataStruct SiS_LCD1280x720Data[] =
diff --git a/src/init301.c b/src/init301.c
index 7ddc801..ab20ab6 100644
--- a/src/init301.c
+++ b/src/init301.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/init301.c,v 1.76 2004/03/10 18:12:34 tsi Exp $ */
+/* $XFree86$ */
/*
* Mode initializing code (CRT2 section)
* for SiS 300/305/540/630/730 and
@@ -1569,7 +1569,7 @@ SiS_GetLCDResInfo(SiS_Private *SiS_Pr, USHORT ModeNo, USHORT ModeIdIndex,
case Panel_1024x600: SiS_Pr->PanelXRes = 1024; SiS_Pr->PanelYRes = 600;
SiS_Pr->PanelHT = 1344; SiS_Pr->PanelVT = 800;
SiS_Pr->PanelHRS = 24; SiS_Pr->PanelHRE = 136;
- SiS_Pr->PanelVRS = 2 /* 88 */ ; SiS_Pr->PanelVRE = 6;
+ SiS_Pr->PanelVRS = 88; SiS_Pr->PanelVRE = 6;
SiS_Pr->PanelVCLKIdx300 = VCLK65_300;
SiS_Pr->PanelVCLKIdx315 = VCLK65_315;
break;
@@ -1886,28 +1886,22 @@ SiS_GetLCDResInfo(SiS_Private *SiS_Pr, USHORT ModeNo, USHORT ModeIdIndex,
if(SiS_Pr->SiS_LCDInfo & LCDPass11) {
SiS_Pr->SiS_SetFlag |= EnableLVDSDDA;
}
- } else if(ModeNo > 0x13) {
- if(SiS_Pr->SiS_LCDResInfo == Panel_1024x600) {
- if(!(SiS_Pr->SiS_LCDInfo & DontExpandLCD)) {
- if((resinfo == SIS_RI_800x600) || (resinfo == SIS_RI_400x300)) {
- SiS_Pr->SiS_SetFlag |= EnableLVDSDDA;
- }
- }
- }
}
}
}
if(modeflag & HalfDCLK) {
- if(SiS_Pr->SiS_IF_DEF_TRUMPION == 1) {
- SiS_Pr->SiS_SetFlag |= EnableLVDSDDA;
- } else if(SiS_Pr->SiS_LCDInfo & DontExpandLCD) {
+ if(SiS_Pr->SiS_LCDInfo & DontExpandLCD) {
SiS_Pr->SiS_SetFlag |= EnableLVDSDDA;
} else if(SiS_Pr->SiS_LCDResInfo == Panel_640x480) {
SiS_Pr->SiS_SetFlag |= EnableLVDSDDA;
} else if(ModeNo > 0x13) {
if(SiS_Pr->SiS_LCDResInfo == Panel_1024x768) {
if(resinfo == SIS_RI_512x384) SiS_Pr->SiS_SetFlag |= EnableLVDSDDA;
+ } else if(SiS_Pr->SiS_LCDResInfo == Panel_1024x600) {
+ if((resinfo == SIS_RI_800x600) || (resinfo == SIS_RI_400x300)) {
+ SiS_Pr->SiS_SetFlag |= EnableLVDSDDA;
+ }
} else if(SiS_Pr->SiS_LCDResInfo == Panel_800x600) {
if(resinfo == SIS_RI_400x300) SiS_Pr->SiS_SetFlag |= EnableLVDSDDA;
}
@@ -2789,11 +2783,7 @@ SiS_GetCRT2Ptr(SiS_Private *SiS_Pr,USHORT ModeNo,USHORT ModeIdIndex,
if(resinfo == SIS_RI_1024x768) tempal = 8;
}
if(SiS_Pr->SiS_TVMode & TVSetYPbPr750p) {
- if((resinfo == SIS_RI_720x576) ||
- (resinfo == SIS_RI_768x576)) {
- tempal = 8;
- }
- if(resinfo == SIS_RI_1280x720) tempal = 9;
+ if(resinfo == SIS_RI_1280x720) tempal = 8;
}
}
}
@@ -5696,6 +5686,12 @@ SiS_SetGroup1_LVDS(SiS_Private *SiS_Pr, USHORT ModeNo, USHORT ModeIdIndex,
if(tempax >= SiS_Pr->SiS_HT) tempax -= SiS_Pr->SiS_HT;
temp = tempax;
+#if 0
+ /* TEST 2 */
+ if((HwInfo->jChipType >= SIS_315H) && (islvds) && (SiS_Pr->SiS_LCDResInfo == Panel_1400x1050)) {
+ } else
+ /* /TEST2 */
+#endif
if(temp & 0x07) temp += 8;
temp >>= 3;
SiS_SetReg(SiS_Pr->SiS_Part1Port,0x17,temp); /* BPLHDEE */
@@ -5741,6 +5737,13 @@ SiS_SetGroup1_LVDS(SiS_Private *SiS_Pr, USHORT ModeNo, USHORT ModeIdIndex,
temp += 2;
if(!(SiS_Pr->SiS_LCDInfo & LCDPass11)) {
temp += 8;
+#if 0
+ /* TEST 1 */
+ if((HwInfo->jChipType >= SIS_315H) && (islvds) && (SiS_Pr->SiS_LCDResInfo == Panel_1400x1050)) {
+ temp -= 16;
+ } else
+ /* /test1 */
+#endif
if(SiS_Pr->PanelHRE != 999) {
temp = tempcx + SiS_Pr->PanelHRE;
if(temp >= SiS_Pr->SiS_HT) temp -= SiS_Pr->SiS_HT;
@@ -7002,7 +7005,7 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHORT ModeNo, USHORT ModeIdIndex,USHORT Refr
if(SiS_Pr->SiS_VBInfo & SetCRT2ToHiVision) tempax = 950;
else if(SiS_Pr->SiS_TVMode & TVSetPAL) tempax = 520;
- else tempax = 440; /* NTSC, YPbPr 525, 750 */
+ else tempax = 440;
if( ( (!(SiS_Pr->SiS_VBInfo & SetCRT2ToTVNoHiVision)) && (SiS_Pr->SiS_VDE <= tempax) ) ||
( (SiS_Pr->SiS_VBInfo & SetCRT2ToTVNoHiVision) &&
@@ -7018,7 +7021,7 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHORT ModeNo, USHORT ModeIdIndex,USHORT Refr
temp = tempax + (USHORT)TimingPoint[1];
SiS_SetReg(SiS_Pr->SiS_Part2Port,0x02,temp);
- if((SiS_Pr->SiS_VBInfo & SetCRT2ToTVNoYPbPrHiVision) && (SiS_Pr->SiS_VGAHDE >= 1024)) {
+ if((SiS_Pr->SiS_VBInfo & SetCRT2ToTVNoHiVision) && (SiS_Pr->SiS_VGAHDE >= 1024)) {
if(SiS_Pr->SiS_TVMode & TVSetPAL) {
SiS_SetReg(SiS_Pr->SiS_Part2Port,0x01,0x1b); /* 19 */
SiS_SetReg(SiS_Pr->SiS_Part2Port,0x02,0x54); /* 52 */
@@ -7134,16 +7137,6 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHORT ModeNo, USHORT ModeIdIndex,USHORT Refr
}
SiS_SetReg(SiS_Pr->SiS_Part2Port,0x30,temp);
- /* TEST qqqq */
- if(SiS_Pr->SiS_VBInfo & SetCRT2ToYPbPr525750) {
- for(i=0x01, j=0; i<=0x2D; i++, j++) {
- SiS_SetReg(SiS_Pr->SiS_Part2Port,i,TimingPoint[j]);
- }
- for(i=0x39; i<=0x45; i++, j++) {
- SiS_SetReg(SiS_Pr->SiS_Part2Port,i,TimingPoint[j]);
- }
- }
-
if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
tempbx = SiS_Pr->SiS_VDE;
if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
@@ -7562,15 +7555,11 @@ static void
SiS_SetGroup3(SiS_Private *SiS_Pr, USHORT ModeNo, USHORT ModeIdIndex,
PSIS_HW_INFO HwInfo)
{
-#if 0
- USHORT modeflag;
-#endif
- USHORT i;
+ USHORT modeflag, i;
const UCHAR *tempdi;
if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCDA) return;
-#if 0
if(ModeNo<=0x13) {
modeflag = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ModeFlag;
} else if(SiS_Pr->UseCustomMode) {
@@ -7578,11 +7567,12 @@ SiS_SetGroup3(SiS_Private *SiS_Pr, USHORT ModeNo, USHORT ModeIdIndex,
} else {
modeflag = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
}
-#endif
#ifndef SIS_CP
SiS_SetReg(SiS_Pr->SiS_Part3Port,0x00,0x00);
-#else
+#endif
+
+#ifdef SIS_CP
SIS_CP_INIT301_CP
#endif
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,
diff --git a/src/initdef.h b/src/initdef.h
index a5c7382..869364c 100644
--- a/src/initdef.h
+++ b/src/initdef.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/initdef.h,v 1.34 2004/02/25 17:45:11 twini Exp $ */
+/* $XFree86$ */
/*
* Global definitions for init.c and init301.c
*
diff --git a/src/oem300.h b/src/oem300.h
index ba9b24d..7995893 100644
--- a/src/oem300.h
+++ b/src/oem300.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/oem300.h,v 1.16 2004/02/25 17:45:11 twini Exp $ */
+/* $XFree86$ */
/*
* OEM Data for 300 series
*
diff --git a/src/oem310.h b/src/oem310.h
index d5047c6..f76b136 100644
--- a/src/oem310.h
+++ b/src/oem310.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/oem310.h,v 1.26 2004/02/25 17:45:11 twini Exp $ */
+/* $XFree86$ */
/*
* OEM Data for 315/330 series
*
diff --git a/src/osdef.h b/src/osdef.h
index f922050..663b976 100644
--- a/src/osdef.h
+++ b/src/osdef.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/osdef.h,v 1.10 2004/02/25 17:45:11 twini Exp $ */
+/* $XFree86$ */
/*
* OS depending defines
*
diff --git a/src/sis.h b/src/sis.h
index 8b77601..6d719e8 100644
--- a/src/sis.h
+++ b/src/sis.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis.h,v 1.113 2004/03/06 13:21:24 twini Exp $ */
+/* $XFree86$ */
/*
* Main global data and definitions
*
@@ -38,8 +38,8 @@
#define UNLOCK_ALWAYS
#define SISDRIVERVERSIONYEAR 4
-#define SISDRIVERVERSIONMONTH 3
-#define SISDRIVERVERSIONDAY 6
+#define SISDRIVERVERSIONMONTH 2
+#define SISDRIVERVERSIONDAY 26
#define SISDRIVERREVISION 1
#define SISDRIVERIVERSION (SISDRIVERVERSIONYEAR << 16) | \
diff --git a/src/sis300_accel.c b/src/sis300_accel.c
index 01cba35..568fe63 100644
--- a/src/sis300_accel.c
+++ b/src/sis300_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis300_accel.c,v 1.29 2004/02/25 17:45:11 twini Exp $ */
+/* $XFree86$ */
/*
* 2D Acceleration for SiS 530, 620, 300, 540, 630, 730.
*
diff --git a/src/sis300_accel.h b/src/sis300_accel.h
index 546a100..e33fdbe 100644
--- a/src/sis300_accel.h
+++ b/src/sis300_accel.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis300_accel.h,v 1.21 2004/02/25 17:45:11 twini Exp $ */
+/* $XFree86$ */
/*
* 2D Acceleration for SiS 530, 620, 300, 540, 630, 730.
* Definitions for the SIS engine communication
diff --git a/src/sis310_accel.c b/src/sis310_accel.c
index fb4dc33..4f26e06 100644
--- a/src/sis310_accel.c
+++ b/src/sis310_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis310_accel.c,v 1.41 2004/02/25 17:45:11 twini Exp $ */
+/* $XFree86$ */
/*
* 2D Acceleration for SiS 315 and 330 series
*
diff --git a/src/sis310_accel.h b/src/sis310_accel.h
index bfb745f..d782cf5 100644
--- a/src/sis310_accel.h
+++ b/src/sis310_accel.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis310_accel.h,v 1.19 2004/02/25 17:45:11 twini Exp $ */
+/* $XFree86$ */
/*
* 2D Acceleration for SiS 315 and Xabre series
* Definitions for the SIS engine communication.
diff --git a/src/sis6326_video.c b/src/sis6326_video.c
index ec01166..fa3b556 100644
--- a/src/sis6326_video.c
+++ b/src/sis6326_video.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis6326_video.c,v 1.19 2004/02/25 17:45:12 twini Exp $ */
+/* $XFree86$ */
/*
* Xv driver for SiS 5597/5598, 6236 and 530/620.
*
diff --git a/src/sis_accel.c b/src/sis_accel.c
index ca23d8a..5a4488c 100644
--- a/src/sis_accel.c
+++ b/src/sis_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_accel.c,v 1.38 2004/02/25 17:45:12 twini Exp $ */
+/* $XFree86$ */
/*
* 2D acceleration for SiS5597/5598 and 6326
*
diff --git a/src/sis_accel.h b/src/sis_accel.h
index d1ef956..cf37d91 100644
--- a/src/sis_accel.h
+++ b/src/sis_accel.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_accel.h,v 1.12 2004/02/25 17:45:13 twini Exp $ */
+/* $XFree86$ */
/*
* 2D acceleration for 5597/5598 and 6326
* Definitions for the SIS engine communication
diff --git a/src/sis_common.h b/src/sis_common.h
index 0aa6599..dbca0fd 100644
--- a/src/sis_common.h
+++ b/src/sis_common.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_common.h,v 1.3 2004/01/03 20:08:02 twini Exp $ */
+/* $XFree86$ */
/*
* Common header definitions for SiS 2D/3D/DRM suite
*
diff --git a/src/sis_cursor.c b/src/sis_cursor.c
index 88b6748..0ebb44d 100644
--- a/src/sis_cursor.c
+++ b/src/sis_cursor.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_cursor.c,v 1.29 2004/02/25 17:45:13 twini Exp $ */
+/* $XFree86$ */
/*
* SiS hardware cursor handling
*
diff --git a/src/sis_cursor.h b/src/sis_cursor.h
index 34ab0e2..c38d038 100644
--- a/src/sis_cursor.h
+++ b/src/sis_cursor.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_cursor.h,v 1.17 2004/02/25 17:45:13 twini Exp $ */
+/* $XFree86$ */
/*
* SiS hardware cursor handling
* Definitions
diff --git a/src/sis_dac.c b/src/sis_dac.c
index 7a7cd46..296e808 100644
--- a/src/sis_dac.c
+++ b/src/sis_dac.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dac.c,v 1.61 2004/02/25 23:22:16 twini Exp $ */
+/* $XFree86$ */
/*
* DAC helper functions (Save/Restore, MemClk, etc)
*
diff --git a/src/sis_dac.h b/src/sis_dac.h
index bde7e76..cbce161 100644
--- a/src/sis_dac.h
+++ b/src/sis_dac.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dac.h,v 1.20 2004/02/25 17:45:13 twini Exp $ */
+/* $XFree86$ */
/*
* DAC helper functions (Save/Restore, MemClk, etc)
* Definitions and prototypes
diff --git a/src/sis_dga.c b/src/sis_dga.c
index ba65be4..a806cec 100644
--- a/src/sis_dga.c
+++ b/src/sis_dga.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dga.c,v 1.13 2004/01/04 18:08:00 twini Exp $ */
+/* $XFree86$ */
/*
* SiS DGA handling
*
diff --git a/src/sis_dri.c b/src/sis_dri.c
index 7eb8b17..c143d2f 100644
--- a/src/sis_dri.c
+++ b/src/sis_dri.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c,v 1.41 2004/01/04 18:08:00 twini Exp $ */
+/* $XFree86$ */
/*
* DRI wrapper for 300 and 315 series
*
diff --git a/src/sis_dri.h b/src/sis_dri.h
index f527392..29ce331 100644
--- a/src/sis_dri.h
+++ b/src/sis_dri.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dri.h,v 1.12 2004/01/04 18:08:00 twini Exp $ */
+/* $XFree86$ */
/*
* SiS DRI wrapper
*
diff --git a/src/sis_driver.c b/src/sis_driver.c
index b7e2823..3951f7c 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c,v 1.187 2004/03/06 16:29:05 twini Exp $ */
+/* $XFree86$ */
/*
* SiS driver main code
*
@@ -300,7 +300,7 @@ static XF86ModuleVersionInfo sisVersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
SIS_MAJOR_VERSION, SIS_MINOR_VERSION, SIS_PATCHLEVEL,
ABI_CLASS_VIDEODRV, /* This is a video driver */
ABI_VIDEODRV_VERSION,
@@ -2347,13 +2347,13 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Copyright (C) 2001-2004 Thomas Winischhofer <thomas@winischhofer.net> and others\n");
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Compiled for XFree86 %d.%d.%d.%d\n",
+ "Compiled for X.Org %d.%d.%d.%d\n",
XF86_VERSION_MAJOR, XF86_VERSION_MINOR,
XF86_VERSION_PATCH, XF86_VERSION_SNAP);
#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0,0)
if(xf86GetVersion() != XF86_VERSION_CURRENT) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- "This version of the driver is not compiled for this version of XFree86!\n");
+ "This version of the driver is not compiled for this version of X.Org!\n");
}
#endif
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
@@ -2835,8 +2835,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
/*
* The first thing we should figure out is the depth, bpp, etc.
- * Set SupportConvert... flags since we use the fb layer which
- * supports this conversion. (24to32 seems not implemented though)
* Additionally, determine the size of the HWCursor memory area.
*/
switch(pSiS->VGAEngine) {
@@ -2850,15 +2848,12 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
break;
case SIS_530_VGA:
pSiS->CursorSize = 2048;
- pix24flags = Support32bppFb |
- Support24bppFb |
- SupportConvert32to24;
+ pix24flags = Support32bppFb |
+ Support24bppFb;
break;
default:
pSiS->CursorSize = 2048;
- pix24flags = Support24bppFb |
- SupportConvert32to24 |
- PreferConvert32to24;
+ pix24flags = Support24bppFb;
break;
}
@@ -5001,7 +4996,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
#endif
} else {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- "Building list of built-in modes failed, using XFree86 defaults\n");
+ "Building list of built-in modes failed, using X.Org defaults\n");
}
} else {
pSiS->HaveCustomModes = TRUE;
diff --git a/src/sis_driver.h b/src/sis_driver.h
index 4b47c39..d76cde0 100644
--- a/src/sis_driver.h
+++ b/src/sis_driver.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.h,v 1.38 2004/02/25 17:45:13 twini Exp $ */
+/* $XFree86$ */
/*
* Global data and definitions
*
diff --git a/src/sis_opt.c b/src/sis_opt.c
index 4af0040..b3dc1e7 100644
--- a/src/sis_opt.c
+++ b/src/sis_opt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_opt.c,v 1.57 2004/02/25 17:45:13 twini Exp $ */
+/* $XFree86$ */
/*
* SiS driver option evaluation
*
diff --git a/src/sis_regs.h b/src/sis_regs.h
index 50ee4fd..b4f29fa 100644
--- a/src/sis_regs.h
+++ b/src/sis_regs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_regs.h,v 1.29 2004/02/25 17:45:13 twini Exp $ */
+/* $XFree86$ */
/*
* Register definitions for old and 300 series
*
diff --git a/src/sis_setup.c b/src/sis_setup.c
index 3b1093d..884e03a 100644
--- a/src/sis_setup.c
+++ b/src/sis_setup.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_setup.c,v 1.31 2004/02/25 17:45:13 twini Exp $ */
+/* $XFree86$ */
/*
* Basic hardware and memory detection
*
diff --git a/src/sis_shadow.c b/src/sis_shadow.c
index 29e4ede..e2c4a11 100644
--- a/src/sis_shadow.c
+++ b/src/sis_shadow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_shadow.c,v 1.10 2004/01/04 18:08:00 twini Exp $ */
+/* $XFree86$ */
/*
* Copyright (C) 1999-2004 by The XFree86 Project, Inc.
* based on code written by Mark Vojkovich
diff --git a/src/sis_vb.c b/src/sis_vb.c
index 29f8714..c2f578d 100644
--- a/src/sis_vb.c
+++ b/src/sis_vb.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_vb.c,v 1.45 2004/02/25 23:22:20 twini Exp $ */
+/* $XFree86$ */
/*
* Video bridge detection and configuration for 300, 315 and 330 series
*
diff --git a/src/sis_vga.c b/src/sis_vga.c
index 1cd7a78..9ce8b78 100644
--- a/src/sis_vga.c
+++ b/src/sis_vga.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_vga.c,v 1.46 2004/02/26 15:07:02 twini Exp $ */
+/* $XFree86$ */
/*
* Mode setup and basic video bridge detection
*
diff --git a/src/sis_video.c b/src/sis_video.c
index e835c0c..85d75b5 100644
--- a/src/sis_video.c
+++ b/src/sis_video.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_video.c,v 1.50 2004/02/25 17:45:14 twini Exp $ */
+/* $XFree86$ */
/*
* Xv driver for SiS 300, 315 and 330 series.
*
diff --git a/src/vgatypes.h b/src/vgatypes.h
index c9fc17f..634190b 100644
--- a/src/vgatypes.h
+++ b/src/vgatypes.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/vgatypes.h,v 1.23 2004/02/25 17:45:14 twini Exp $ */
+/* $XFree86$ */
/*
* General type definitions for universal mode switching modules
*
diff --git a/src/vstruct.h b/src/vstruct.h
index b9127ad..262ec3f 100644
--- a/src/vstruct.h
+++ b/src/vstruct.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/vstruct.h,v 1.35 2004/02/25 22:40:46 twini Exp $ */
+/* $XFree86$ */
/*
* General structure definitions for universal mode switching modules
*
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-21 20:12:50 +0000