DRI XFree86-4_3_99_12-merge importDRI-trunk-20040721DRI-trunk-20040613DRI-XFree86-4_3_99_12-merge

5 files changed, 11 insertions, 11 deletions

diff --git a/man/suntcx.man b/man/suntcx.man
index fd0f7dd..06bf55c 100644
--- a/man/suntcx.man
+++ b/man/suntcx.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suntcx/suntcx.man,v 1.1 2001/01/24 00:06:31 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suntcx/suntcx.man,v 1.2 2001/01/27 18:20:54 dawes Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH SUNTCX __drivermansuffix__ __vendorversion__
@@ -14,17 +14,17 @@ suntcx \- TCX video driver
 .fi
 .SH DESCRIPTION
 .B suntcx
-is an __xservername__ driver for Sun TCX video cards.
+is an XFree86 driver for Sun TCX video cards.
 THIS MAN PAGE NEEDS TO BE FILLED IN.
 .SH SUPPORTED HARDWARE
 The
 .B suntcx
 driver supports...
 .SH CONFIGURATION DETAILS
-Please refer to __xconfigfile__(__filemansuffix__) for general configuration
+Please refer to XF86Config(__filemansuffix__) for general configuration
 details.  This section only covers configuration details specific to this
 driver.
 .SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: Jakub Jelinek <jakub@redhat.com>
diff --git a/src/tcx.h b/src/tcx.h
index 6ef09d5..2528a71 100644
--- a/src/tcx.h
+++ b/src/tcx.h
@@ -20,7 +20,7 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx.h,v 1.1 2000/06/30 17:15:16 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx.h,v 1.2 2001/05/04 19:05:46 dawes Exp $ */
 
 #ifndef TCX_H
 #define TCX_H
diff --git a/src/tcx_cursor.c b/src/tcx_cursor.c
index e49b70d..61ec1d6 100644
--- a/src/tcx_cursor.c
+++ b/src/tcx_cursor.c
@@ -23,7 +23,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  */
-/* $XFree86:$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx_cursor.c,v 1.1 2000/06/30 17:15:16 dawes Exp $ */
 
 #include "tcx.h"
 
diff --git a/src/tcx_driver.c b/src/tcx_driver.c
index 86d1f38..83a1947 100644
--- a/src/tcx_driver.c
+++ b/src/tcx_driver.c
@@ -53,8 +53,8 @@ static void	TCXAdjustFrame(int scrnIndex, int x, int y, int flags);
 
 /* Optional functions */
 static void	TCXFreeScreen(int scrnIndex, int flags);
-static ModeStatus TCXValidMode(int scrnIndex, DisplayModePtr mode,
-			       Bool verbose, int flags);
+static int	TCXValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
+			     int flags);
 
 void TCXSync(ScrnInfoPtr pScrn);
 
@@ -104,7 +104,7 @@ static XF86ModuleVersionInfo suntcxVersRec =
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XORG_VERSION_CURRENT,
+	XF86_VERSION_CURRENT,
 	TCX_MAJOR_VERSION, TCX_MINOR_VERSION, TCX_PATCHLEVEL,
 	ABI_CLASS_VIDEODRV,
 	ABI_VIDEODRV_VERSION,
@@ -720,7 +720,7 @@ TCXFreeScreen(int scrnIndex, int flags)
 /* Checks if a mode is suitable for the selected chipset. */
 
 /* Optional */
-static ModeStatus
+static int
 TCXValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
 {
     if (mode->Flags & V_INTERLACE)
diff --git a/src/tcx_regs.h b/src/tcx_regs.h
index 9b9c00d..61e4b0a 100644
--- a/src/tcx_regs.h
+++ b/src/tcx_regs.h
@@ -20,7 +20,7 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* $XFree86:$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx_regs.h,v 1.1 2000/06/30 17:15:17 dawes Exp $ */
 
 #ifndef TCX_REGS_H
 #define TCX_REGS_H