[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/drivers/tseng Imakefile, 1.1.4.1, 1.1.4.2 tseng.man, 1.1.4.1, 1.1.4.2 tseng_driver.c, 1.1.4.2, 1.1.4.3

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/tseng
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/hw/xfree86/drivers/tseng

Modified Files:
      Tag: XORG-CURRENT
	Imakefile tseng.man tseng_driver.c 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/tseng/Imakefile,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/Imakefile	5 Mar 2004 13:40:38 -0000	1.1.4.1
+++ b/Imakefile	15 Apr 2004 10:16:39 -0000	1.1.4.2
@@ -32,7 +32,7 @@
 	   -I$(EXTINCSRC) -I$(SERVERSRC)/render
 #endif
 
-DEFINES = -DPSZ=8
+DEFINES = -DPSZ=8 $(VENDORSUPPORTDEFS)
 
 #if MakeHasPosixVariableSubstitutions
 SubdirLibraryRule($(OBJS))

Index: tseng.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.man,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/tseng.man	5 Mar 2004 13:40:38 -0000	1.1.4.1
+++ b/tseng.man	15 Apr 2004 10:16:39 -0000	1.1.4.2
@@ -14,17 +14,17 @@
 .fi
 .SH DESCRIPTION
 .B tseng 
-is an XFree86 driver for Tseng Labs video cards.
+is an __xservername__ driver for Tseng Labs video cards.
 THIS MAN PAGE NEEDS TO BE FILLED IN.
 .SH SUPPORTED HARDWARE
 The
 .B tseng
 driver supports...
 .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.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: ...

Index: tseng_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_driver.c,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/tseng_driver.c	5 Mar 2004 13:40:39 -0000	1.1.4.2
+++ b/tseng_driver.c	15 Apr 2004 10:16:39 -0000	1.1.4.3
@@ -281,7 +281,7 @@
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     TSENG_MAJOR_VERSION, TSENG_MINOR_VERSION, TSENG_PATCHLEVEL,
     ABI_CLASS_VIDEODRV,		       /* This is a video driver */
     ABI_VIDEODRV_VERSION,
@@ -1237,7 +1237,7 @@
     if (xf86IsOptionSet(pTseng->Options, OPTION_HIBIT_HIGH)) {
 	if (xf86IsOptionSet(pTseng->Options, OPTION_HIBIT_LOW)) {
 	    xf86Msg(X_ERROR, "\nOptions \"hibit_high\" and \"hibit_low\" are incompatible;\n");
-	    xf86Msg(X_ERROR, "    specify only one (not both) in XFree86 configuration file\n");
+	    xf86Msg(X_ERROR, "    specify only one (not both) in X configuration file\n");
 	    return FALSE;
 	}
 	pTseng->save_divide = 0x40;
@@ -1253,7 +1253,7 @@
 	    xf86Msg(X_WARNING, "Non-standard VGA text or graphics mode while probing for hibit:\n");
 	    xf86Msg(X_WARNING, "    probed 'hibit' value may be wrong.\n");
 	    xf86Msg(X_WARNING, "    Preferably run probe from 80x25 textmode,\n");
-	    xf86Msg(X_WARNING, "    or specify correct value in XFree86 configuration file.\n");
+	    xf86Msg(X_WARNING, "    or specify correct value in X configuration file.\n");
 	}
 	/* Check for initial state of divide flag */
 	outb(0x3C4, 7);
@@ -1473,7 +1473,7 @@
 		break;
 	    default:
 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		    "TsengNonPciLinMem(): Internal error. This should not happen: please report to XFree86 at XFree86.Org\n");
+		    "TsengNonPciLinMem(): Internal error. This should not happen: Please check "__VENDORDWEBSUPPORT__"\n");
 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 		    "    Falling back to banked mode.\n");
 		pTseng->UseLinMem = FALSE;