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

5 files changed, 10 insertions, 13 deletions

diff --git a/man/imstt.man b/man/imstt.man
index 22134b6..377d117 100644
--- a/man/imstt.man
+++ b/man/imstt.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.man,v 1.1 2001/01/24 00:06:20 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.man,v 1.2 2001/01/27 18:20:48 dawes Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH IMSTT __drivermansuffix__ __vendorversion__
@@ -14,17 +14,17 @@ imstt \- Integrated Micro Solutions Twin Turbo 128 driver
 .fi
 .SH DESCRIPTION
 .B imstt 
-is an __xservername__ driver for Integrated Micro Solutions Twin Turbo 128 video chips.
+is an XFree86 driver for Integrated Micro Solutions Twin Turbo 128 video chips.
 THIS MAN PAGE NEEDS TO BE FILLED IN.
 .SH SUPPORTED HARDWARE
 The
 .B imstt
 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/imstt.h b/src/imstt.h
index 624d416..b714aaf 100644
--- a/src/imstt.h
+++ b/src/imstt.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.h,v 1.4 2001/04/05 21:29:14 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.h,v 1.5 2001/05/16 06:48:09 keithp Exp $ */
 
 #ifndef _IMSTT_H
 #define _IMSTT_H
diff --git a/src/imstt_accel.c b/src/imstt_accel.c
index d52e03d..86dca58 100644
--- a/src/imstt_accel.c
+++ b/src/imstt_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_accel.c,v 1.5 2001/04/05 21:29:14 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_accel.c,v 1.6 2001/05/16 06:48:09 keithp Exp $ */
 
 /*
  *	Copyright 2000	Ani Joshi <ajoshi@unixbox.com>
diff --git a/src/imstt_driver.c b/src/imstt_driver.c
index bf7adad..be57c46 100644
--- a/src/imstt_driver.c
+++ b/src/imstt_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_driver.c,v 1.20 2002/09/24 15:23:55 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_driver.c,v 1.21 2003/08/23 15:03:02 dawes Exp $ */
 
 /*
  *	Copyright 2000	Ani Joshi <ajoshi@unixbox.com>
@@ -192,7 +192,7 @@ static XF86ModuleVersionInfo IMSTTVersRec = {
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XORG_VERSION_CURRENT,
+	XF86_VERSION_CURRENT,
 	VERSION_MAJOR, VERSION_MINOR, PATCHLEVEL,
 	ABI_CLASS_VIDEODRV,
 	ABI_VIDEODRV_VERSION,
@@ -441,9 +441,6 @@ static Bool IMSTTPreInit(ScrnInfoPtr pScrn, int flags)
 	xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr);
 	xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr);
 
-	pScrn->memPhysBase = iptr->PciInfo->memBase[0];
-	pScrn->fbOffset = 0;
-
 	if (pEnt->device->chipset && *pEnt->device->chipset) {
 		pScrn->chipset = pEnt->device->chipset;
 		iptr->Chipset = xf86StringToToken(IMSTTChipsets, pScrn->chipset);
diff --git a/src/imstt_reg.h b/src/imstt_reg.h
index 9870f49..343fb6c 100644
--- a/src/imstt_reg.h
+++ b/src/imstt_reg.h
@@ -9,7 +9,7 @@
 
 static __inline__ void regw(unsigned long base_addr, unsigned long regindex, unsigned long regdata)
 {
-	__asm__ __volatile__ ("stwbrx %1,%2,%3; eieio"
+	asm volatile ("stwbrx %1,%2,%3; eieio"
 		      : "=m" (*(volatile unsigned *)(base_addr+regindex))
 		      : "r" (regdata), "b" (regindex), "r" (base_addr));
 }
@@ -19,7 +19,7 @@ static __inline__ unsigned long regr(unsigned long base_addr, unsigned long regi
 {
 	register unsigned long val;
 
-	__asm__ __volatile__ ("lwbrx %0,%1,%2; eieio"
+	asm volatile ("lwbrx %0,%1,%2; eieio"
 		      : "=r" (val)
 		      : "b" (regindex), "r" (base_addr),
 		      "m" (*(volatile unsigned *)(base_addr+regindex)));