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

15 files changed, 39 insertions, 43 deletions

diff --git a/man/tseng.man b/man/tseng.man
index e1354a7..e410207 100644
--- a/man/tseng.man
+++ b/man/tseng.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.man,v 1.1 2001/01/24 00:06:32 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.man,v 1.2 2001/01/27 18:20:55 dawes Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH TSENG __drivermansuffix__ __vendorversion__
@@ -14,17 +14,17 @@ tseng \- Tseng Labs video driver
 .fi
 .SH DESCRIPTION
 .B tseng 
-is an __xservername__ driver for Tseng Labs video cards.
+is an XFree86 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 __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: ...
diff --git a/src/README b/src/README
index 56ad83e..dca1c6b 100644
--- a/src/README
+++ b/src/README
@@ -261,4 +261,4 @@ the off-screen scanline buffers and calling the Subsequent() function.
 
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/README,v 1.7.2.1 1998/07/24 11:36:28 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/README,v 1.12 2000/08/08 08:58:06 eich Exp $
diff --git a/src/tseng.h b/src/tseng.h
index 1371baa..926f813 100644
--- a/src/tseng.h
+++ b/src/tseng.h
@@ -1,5 +1,5 @@
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.h,v 1.37tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.h,v 1.37 2002/04/04 14:05:49 eich Exp $ */
 
 
 
@@ -112,7 +112,6 @@ typedef enum {
 } t_ramdactype;
 
 typedef enum {
-    CLOCKCHIP_DEFAULT = -1,
     CLOCKCHIP_ICD2061A,
     CLOCKCHIP_ET6000,
     CLOCKCHIP_ICS5341,
diff --git a/src/tseng_accel.c b/src/tseng_accel.c
index c3cd170..ace484c 100644
--- a/src/tseng_accel.c
+++ b/src/tseng_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_accel.c,v 1.29 1999/06/12 07:18:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_accel.c,v 1.33 2001/02/15 17:54:55 eich Exp $ */
 
 /*
  * ET4/6K acceleration interface.
diff --git a/src/tseng_acl.c b/src/tseng_acl.c
index 319fbfa..9a62e4e 100644
--- a/src/tseng_acl.c
+++ b/src/tseng_acl.c
@@ -1,5 +1,5 @@
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_acl.c,v 1.23 2000/08/08 08:58:06 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_acl.c,v 1.25 2000/12/14 16:33:10 eich Exp $ */
 
 
 
diff --git a/src/tseng_acl.h b/src/tseng_acl.h
index 9402d58..b7ca4b3 100644
--- a/src/tseng_acl.h
+++ b/src/tseng_acl.h
@@ -1,5 +1,5 @@
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_acl.h,v 1.16 1998/08/29 05:43:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_acl.h,v 1.20 2000/12/14 16:33:10 eich Exp $ */
 
 
 #ifndef _TSENG_ACL_H
diff --git a/src/tseng_bank.c b/src/tseng_bank.c
index c872e70..e0d6136 100644
--- a/src/tseng_bank.c
+++ b/src/tseng_bank.c
@@ -1,5 +1,5 @@
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_bank.c,v 1.2 1998/07/26 09:56:17 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_bank.c,v 1.4 2000/08/08 08:58:06 eich Exp $ */
 
 
 
diff --git a/src/tseng_clock.c b/src/tseng_clock.c
index 85c8544..5058ca1 100644
--- a/src/tseng_clock.c
+++ b/src/tseng_clock.c
@@ -1,5 +1,5 @@
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_clock.c,v 1.18 2003/11/03 05:11:44 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_clock.c,v 1.17 2001/02/15 17:54:55 eich Exp $ */
 
 
 
@@ -45,9 +45,8 @@ Tseng_check_clockchip(ScrnInfoPtr pScrn)
     if (pTseng->pEnt->device->clockchip && *pTseng->pEnt->device->clockchip) {
 	/* clockchip given as a string in the config file */
 	pScrn->clockchip = pTseng->pEnt->device->clockchip;
-	pTseng->ClockChip =
-	 (t_clockchip_type)xf86StringToToken(TsengClockChips, pScrn->clockchip);
-	if (pTseng->ClockChip == CLOCKCHIP_DEFAULT) {
+	pTseng->ClockChip = xf86StringToToken(TsengClockChips, pScrn->clockchip);
+	if (pTseng->ClockChip == -1) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Unknown clockchip: \"%s\"\n",
 		pScrn->clockchip);
 	    return FALSE;
diff --git a/src/tseng_colexp.c b/src/tseng_colexp.c
index c946e30..9c471a9 100644
--- a/src/tseng_colexp.c
+++ b/src/tseng_colexp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_colexp.c,v 1.12 2000/08/08 08:58:06 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_colexp.c,v 1.14 2001/02/15 17:54:55 eich Exp $ */
 
 
 
diff --git a/src/tseng_cursor.c b/src/tseng_cursor.c
index 25a9b25..199082b 100644
--- a/src/tseng_cursor.c
+++ b/src/tseng_cursor.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_cursor.c,v 1.16 2000/09/19 12:46:19 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_cursor.c,v 1.17 2001/05/07 21:59:07 tsi Exp $ */
 
 
 
diff --git a/src/tseng_dga.c b/src/tseng_dga.c
index b98887a..4623f08 100644
--- a/src/tseng_dga.c
+++ b/src/tseng_dga.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_dga.c,v 1.1 2000/12/06 15:35:24 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_dga.c,v 1.2 2001/10/01 13:44:11 eich Exp $ */
 /*
  * Copyright 2000 by Rainer Keller, <Rainer.Keller@studmail.uni-stuttgart.de>.
  *
diff --git a/src/tseng_dpms.c b/src/tseng_dpms.c
index 1361995..c1e2113 100644
--- a/src/tseng_dpms.c
+++ b/src/tseng_dpms.c
@@ -1,5 +1,5 @@
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_dpms.c,v 1.9 2000/08/08 08:58:06 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_dpms.c,v 1.10 2001/01/21 21:19:35 tsi Exp $ */
 
 
 
diff --git a/src/tseng_driver.c b/src/tseng_driver.c
index 998bb17..18d528b 100644
--- a/src/tseng_driver.c
+++ b/src/tseng_driver.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_driver.c,v 1.97tsi Exp $ 
+ * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_driver.c,v 1.94 2003/08/29 21:07:57 tsi Exp $ 
  *
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
  *
@@ -281,7 +281,7 @@ static XF86ModuleVersionInfo tsengVersRec =
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XORG_VERSION_CURRENT,
+    XF86_VERSION_CURRENT,
     TSENG_MAJOR_VERSION, TSENG_MINOR_VERSION, TSENG_PATCHLEVEL,
     ABI_CLASS_VIDEODRV,		       /* This is a video driver */
     ABI_VIDEODRV_VERSION,
@@ -358,7 +358,7 @@ TsengFreeRec(ScrnInfoPtr pScrn)
     pScrn->driverPrivate = NULL;
 }
 
-static Bool
+static t_tseng_type
 TsengPCI2Type(ScrnInfoPtr pScrn, int ChipID)
 {
     TsengPtr pTseng = TsengPTR(pScrn);
@@ -465,7 +465,7 @@ TsengLock(void)
 static Bool
 ET4000MinimalProbe(void)
 {
-    unsigned char origVal, newVal;
+    unsigned char temp, origVal, newVal;
     int iobase;
 
     PDEBUG("	ET4000MinimalProbe\n");
@@ -479,7 +479,7 @@ ET4000MinimalProbe(void)
      * Check first that there is a ATC[16] register and then look at
      * CRTC[33]. If both are R/W correctly it's a ET4000 !
      */
-    (void) inb(iobase + 0x0A);
+    temp = inb(iobase + 0x0A);
     TsengUnlock();		       /* only ATC 0x16 is protected by KEY */
     outb(0x3C0, 0x16 | 0x20);
     origVal = inb(0x3C1);
@@ -620,8 +620,7 @@ TsengPreInitPCI(ScrnInfoPtr pScrn)
     if (pTseng->pEnt->device->chipset && *pTseng->pEnt->device->chipset) {
 	/* chipset given as a string in the config file */
 	pScrn->chipset = pTseng->pEnt->device->chipset;
-	pTseng->ChipType =
-	    (t_tseng_type)xf86StringToToken(TsengChipsets, pScrn->chipset);
+	pTseng->ChipType = xf86StringToToken(TsengChipsets, pScrn->chipset);
 	/* FIXME: still need to probe for W32p revision here */
 	from = X_CONFIG;
     } else if (pTseng->pEnt->device->chipID >= 0) {
@@ -871,7 +870,7 @@ TsengFindNonPciBusType(ScrnInfoPtr pScrn)
 	    pTseng->LinFbAddressMask = 0x3FC00000;	/* A29..A22 */
 	    break;
 	}
-	if (Is_W32p_cd && (pTseng->LinFbAddressMask == 0x3FC00000))
+	if (Is_W32p_cd && (pTseng->LinFbAddressMask = 0x3FC00000))
 	    pTseng->LinFbAddressMask |= 0xC0000000;	/* A31,A30 decoded from PCI config space */
 	break;
     case TYPE_ET6000:
@@ -900,8 +899,7 @@ TsengPreInitNoPCI(ScrnInfoPtr pScrn)
     if (pTseng->pEnt->device->chipset && *pTseng->pEnt->device->chipset) {
 	/* chipset given as a string in the config file */
 	pScrn->chipset = pTseng->pEnt->device->chipset;
-	pTseng->ChipType =
-	    (t_tseng_type)xf86StringToToken(TsengChipsets, pScrn->chipset);
+	pTseng->ChipType = xf86StringToToken(TsengChipsets, pScrn->chipset);
 	from = X_CONFIG;
     } else if (pTseng->pEnt->device->chipID > 0) {
 	/* chipset given as a PCI ID in the config file */
@@ -1237,7 +1235,7 @@ TsengProcessHibit(ScrnInfoPtr pScrn)
     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 X configuration file\n");
+	    xf86Msg(X_ERROR, "    specify only one (not both) in XFree86 configuration file\n");
 	    return FALSE;
 	}
 	pTseng->save_divide = 0x40;
@@ -1253,7 +1251,7 @@ TsengProcessHibit(ScrnInfoPtr pScrn)
 	    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 X configuration file.\n");
+	    xf86Msg(X_WARNING, "    or specify correct value in XFree86 configuration file.\n");
 	}
 	/* Check for initial state of divide flag */
 	outb(0x3C4, 7);
@@ -1406,10 +1404,10 @@ TsengGetLinFbAddress(ScrnInfoPtr pScrn)
 	/* check for possible errors in given linear base address */
 	if ((pTseng->LinFbAddress & (~pTseng->LinFbAddressMask)) != 0) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		"MemBase out of range. Must be <= 0x%lx on 0x%lx boundary.\n",
+		"MemBase out of range. Must be <= 0x%x on 0x%x boundary.\n",
 		pTseng->LinFbAddressMask, ~(pTseng->LinFbAddressMask | 0xFF000000) + 1);
 	    pTseng->LinFbAddress &= ~pTseng->LinFbAddressMask;
-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "    Clipping MemBase to: 0x%lx.\n",
+	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "    Clipping MemBase to: 0x%x.\n",
 		pTseng->LinFbAddress);
 	    range[0].rBegin = pTseng->LinFbAddress;
 	    range[0].rEnd = pTseng->LinFbAddress + 16 * 1024 * 1024;
@@ -1473,7 +1471,7 @@ TsengGetLinFbAddress(ScrnInfoPtr pScrn)
 		break;
 	    default:
 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		    "TsengNonPciLinMem(): Internal error. This should not happen: Please check "__VENDORDWEBSUPPORT__"\n");
+		    "TsengNonPciLinMem(): Internal error. This should not happen: please report to XFree86@XFree86.Org\n");
 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 		    "    Falling back to banked mode.\n");
 		pTseng->UseLinMem = FALSE;
@@ -1765,8 +1763,6 @@ TsengPreInit(ScrnInfoPtr pScrn, int flags)
 	if (!TsengGetLinFbAddress(pScrn))
 	    return FALSE;
     }
-    pScrn->memPhysBase = pTseng->LinFbAddress;
-    pScrn->fbOffset = 0;
 
     if (pTseng->UseAccel)
 	VGAHWPTR(pScrn)->MapSize = 0x20000;  /* accelerator apertures and MMIO */
@@ -2769,7 +2765,7 @@ TsengAdjustFrame(int scrnIndex, int x, int y, int flags)
 
 }
 
-static ModeStatus
+ModeStatus
 TsengValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
 {
 
@@ -2979,12 +2975,14 @@ static void
 TsengRestore(ScrnInfoPtr pScrn, vgaRegPtr vgaReg, TsengRegPtr tsengReg,
 	     int flags)
 {
+    vgaHWPtr hwp;
     TsengPtr pTseng;
     unsigned char tmp;
     int iobase = VGAHWPTR(pScrn)->IOBase;
 
     PDEBUG("	TsengRestore\n");
 
+    hwp = VGAHWPTR(pScrn);
     pTseng = TsengPTR(pScrn);
 
     TsengProtect(pScrn, TRUE);
diff --git a/src/tseng_inline.h b/src/tseng_inline.h
index 5f6055d..bc2ba77 100644
--- a/src/tseng_inline.h
+++ b/src/tseng_inline.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_inline.h,v 1.5 1998/07/25 16:56:03 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_inline.h,v 1.8 2000/08/08 08:58:07 eich Exp $ */
 
 #include "tseng.h"
 
diff --git a/src/tseng_ramdac.c b/src/tseng_ramdac.c
index 9ba06c6..ed4e667 100644
--- a/src/tseng_ramdac.c
+++ b/src/tseng_ramdac.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_ramdac.c,v 1.27 2003/11/03 05:11:45 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_ramdac.c,v 1.26 2001/10/28 03:33:53 tsi Exp $ */
 
 
 
@@ -333,6 +333,7 @@ Check_Tseng_Ramdac(ScrnInfoPtr pScrn)
     unsigned char cmap[3], save_cmap[3];
     BOOL cr_saved;
     int mclk;
+    int temp;
     int dbyte;
     TsengPtr pTseng = TsengPTR(pScrn);
     rgb zeros = {0, 0, 0};
@@ -347,8 +348,7 @@ Check_Tseng_Ramdac(ScrnInfoPtr pScrn)
      * correct, and don't probe for it.
      */
     if (pScrn->ramdac) {
-	pTseng->DacInfo.DacType =
-	    (t_ramdactype)xf86StringToToken(TsengDacTable, pScrn->ramdac);
+	pTseng->DacInfo.DacType = xf86StringToToken(TsengDacTable, pScrn->ramdac);
 	if (pTseng->DacInfo.DacType < 0) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Unknown RAMDAC type \"%s\" specified\n", pScrn->ramdac);
 	    return FALSE;
@@ -356,7 +356,7 @@ Check_Tseng_Ramdac(ScrnInfoPtr pScrn)
     } else {			       /* autoprobe for the RAMDAC */
 	if (Is_ET6K) {
 	    pTseng->DacInfo.DacType = ET6000_DAC;
-	    (void) inb(pTseng->IOAddress + 0x67);
+	    temp = inb(pTseng->IOAddress + 0x67);
 	    outb(pTseng->IOAddress + 0x67, 10);
 	    mclk = (inb(pTseng->IOAddress + 0x69) + 2) * 14318;
 	    dbyte = inb(pTseng->IOAddress + 0x69);
@@ -428,7 +428,7 @@ Check_Tseng_Ramdac(ScrnInfoPtr pScrn)
     pTseng->DacInfo.NotAttCompat = FALSE;	/* default: treat as ATT compatible DAC */
     pTseng->DacInfo.rgb24packed = zeros;
     pScrn->progClock = FALSE;
-    pTseng->ClockChip = CLOCKCHIP_DEFAULT;
+    pTseng->ClockChip = -1;
     pTseng->MClkInfo.Programmable = FALSE;
 
     /* now override defaults with appropriate values for each RAMDAC */