[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/drivers/sis
sis.man, 1.1.4.2, 1.1.4.3 sis_driver.c, 1.1.4.7, 1.1.4.8
Egbert Eich
xorg-commit at pdx.freedesktop.org
Thu Apr 15 03:16:40 PDT 2004
Committed by: eich
Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/sis
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/hw/xfree86/drivers/sis
Modified Files:
Tag: XORG-CURRENT
sis.man sis_driver.c
Log Message:
2004-04-15 Egbert Eich <eich at freedesktop.org>
Merged changes from RELEASE-1 branch
Index: sis.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/sis/sis.man,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/sis.man 5 Mar 2004 13:40:33 -0000 1.1.4.2
+++ b/sis.man 15 Apr 2004 10:16:34 -0000 1.1.4.3
@@ -14,7 +14,7 @@
.fi
.SH DESCRIPTION
.B sis
-is an XFree86 driver for SiS (Silicon Integrated Systems) video chips. The
+is an __xservername__ driver for SiS (Silicon Integrated Systems) video chips. The
driver is accelerated, and provides support for colordepths of 8, 16 and 24 bpp.
XVideo, Render and other extensions are supported as well.
.SH SUPPORTED HARDWARE
@@ -47,7 +47,7 @@
.PP
Note: Support for 661FX, M661FX, M661MX, 741 and 760 is untested.
.SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
details. This section only covers configuration details specific to this
driver.
.PP
@@ -364,7 +364,7 @@
DRI is supported on the 300 series only. On Linux, DRI requires the
kernel's SiS framebuffer driver (
.B sisfb
-) and some other modules which come with either the kernel or XFree86.
+) and some other modules which come with either the kernel or __xservername__.
.PP
Sisfb takes care of memory management for texture data. In order to
prevent the X Server and sisfb from overwriting each other's data,
@@ -409,7 +409,7 @@
.SH "KNOWN BUGS"
none.
.SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
.PP
.B "http://www.winischhofer.net/linuxsisvga.shtml"
for more information and updates
Index: sis_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c,v
retrieving revision 1.1.4.7
retrieving revision 1.1.4.8
diff -u -d -r1.1.4.7 -r1.1.4.8
--- a/sis_driver.c 5 Mar 2004 13:40:33 -0000 1.1.4.7
+++ b/sis_driver.c 15 Apr 2004 10:16:34 -0000 1.1.4.8
@@ -99,7 +99,7 @@
#ifdef SISMERGED
#ifdef SISXINERAMA
-static Bool SiSnoXineramaExtension = TRUE;
+static Bool SiSnoPanoramiXExtension = TRUE;
int SiSXineramaPixWidth = 0;
int SiSXineramaPixHeight = 0;
int SiSXineramaNumScreens = 0;
@@ -300,7 +300,7 @@
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,
@@ -1571,7 +1571,7 @@
if(!pSiS->MergedFB) return;
- if(SiSnoXineramaExtension) return;
+ if(SiSnoPanoramiXExtension) return;
if(!SiSXineramadataPtr) return;
@@ -1770,7 +1770,7 @@
rep.type = X_Reply;
rep.length = 0;
rep.sequenceNumber = client->sequence;
- rep.state = !SiSnoXineramaExtension;
+ rep.state = !SiSnoPanoramiXExtension;
if(client->swapped) {
swaps (&rep.sequenceNumber, n);
swapl (&rep.length, n);
@@ -1842,7 +1842,7 @@
rep.type = X_Reply;
rep.length = 0;
rep.sequenceNumber = client->sequence;
- rep.state = !SiSnoXineramaExtension;
+ rep.state = !SiSnoPanoramiXExtension;
if(client->swapped) {
register int n;
swaps(&rep.sequenceNumber, n);
@@ -1862,7 +1862,7 @@
rep.type = X_Reply;
rep.sequenceNumber = client->sequence;
- rep.number = (SiSnoXineramaExtension) ? 0 : SiSXineramaNumScreens;
+ rep.number = (SiSnoPanoramiXExtension) ? 0 : SiSXineramaNumScreens;
rep.length = rep.number * sz_XineramaScreenInfo >> 2;
if(client->swapped) {
register int n;
@@ -1872,7 +1872,7 @@
}
WriteToClient(client, sizeof(xXineramaQueryScreensReply), (char *)&rep);
- if(!SiSnoXineramaExtension) {
+ if(!SiSnoPanoramiXExtension) {
xXineramaScreenInfo scratch;
int i;
@@ -2018,20 +2018,20 @@
if(!(SiSXineramadataPtr)) {
if(!pSiS->MergedFB) {
- SiSnoXineramaExtension = TRUE;
+ SiSnoPanoramiXExtension = TRUE;
return;
}
-#ifdef XINERAMA
+#ifdef PANORAMIX
if(!noPanoramiXExtension) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Xinerama active, not initializing SiS Pseudo-Xinerama\n");
- SiSnoXineramaExtension = TRUE;
+ SiSnoPanoramiXExtension = TRUE;
return;
}
#endif
- if(SiSnoXineramaExtension) {
+ if(SiSnoPanoramiXExtension) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"SiS Pseudo-Xinerama disabled\n");
return;
@@ -2040,14 +2040,14 @@
if(pSiS->CRT2Position == sisClone) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Running MergedFB in Clone mode, SiS Pseudo-Xinerama disabled\n");
- SiSnoXineramaExtension = TRUE;
+ SiSnoPanoramiXExtension = TRUE;
return;
}
if(!(pSiS->AtLeastOneNonClone)) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Only Clone modes defined, SiS Pseudo-Xinerama disabled\n");
- SiSnoXineramaExtension = TRUE;
+ SiSnoPanoramiXExtension = TRUE;
return;
}
@@ -2072,7 +2072,7 @@
if(!success) {
SISErrorLog(pScrn, "Failed to initialize SiS Pseudo-Xinerama extension\n");
- SiSnoXineramaExtension = TRUE;
+ SiSnoPanoramiXExtension = TRUE;
return;
}
@@ -2347,13 +2347,13 @@
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Copyright (C) 2001-2004 Thomas Winischhofer <thomas at 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,
@@ -4996,7 +4996,7 @@
#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;
@@ -5481,7 +5481,7 @@
pSiS->SiS_SD_Flags |= SiS_SD_ISDUALHEAD;
if(pSiS->SecondHead) pSiS->SiS_SD_Flags |= SiS_SD_ISDHSECONDHEAD;
else pSiS->SiS_SD_Flags &= ~(SiS_SD_SUPPORTXVGAMMA1);
-#ifdef XINERAMA
+#ifdef PANORAMIX
if(!noPanoramiXExtension) {
pSiS->SiS_SD_Flags |= SiS_SD_ISDHXINERAMA;
pSiS->SiS_SD_Flags &= ~(SiS_SD_SUPPORTXVGAMMA1);
@@ -7100,13 +7100,13 @@
pSiS->ShadowFB = FALSE;
#ifdef SISXINERAMA
if(pSiS->UseSiSXinerama) {
- SiSnoXineramaExtension = FALSE;
+ SiSnoPanoramiXExtension = FALSE;
SiSXineramaExtensionInit(pScrn);
- if(!SiSnoXineramaExtension) {
+ if(!SiSnoPanoramiXExtension) {
#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0)
- xf86DisableRandR();
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "SiS Pseudo-Xinerama enabled, RandR disabled\n");
+ xf86DisableRandR();
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "SiS Pseudo-Xinerama enabled, RandR disabled\n");
#endif
pSiS->SiS_SD_Flags |= SiS_SD_PSEUDOXINERAMA;
}
More information about the xorg-commit-diffs
mailing list