merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE

3 files changed, 12 insertions, 18 deletions

diff --git a/src/IBM561ramdac.c b/src/IBM561ramdac.c
index 2ddfb08..c67850a 100644
--- a/src/IBM561ramdac.c
+++ b/src/IBM561ramdac.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/IBM561ramdac.c,v 1.3 2001/02/15 11:03:58 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/IBM561ramdac.c,v 1.4 2003/09/24 02:43:28 dawes Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -111,8 +111,8 @@ IBM561ReadReg(ScrnInfoPtr pScrn, CARD32 reg)
   ret = TGA2_READ_RAMDAC_REG(REGS_ADDR);
 
 #if 1
-  xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "IBM561ReadReg: reg 0x%x data 0x%x\n",
-             reg, ret);
+  xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "IBM561ReadReg: reg 0x%lx data 0x%x\n",
+             (unsigned long)reg, ret);
 #endif
   return (ret);
 }
@@ -139,8 +139,8 @@ IBM561WriteReg(ScrnInfoPtr pScrn, CARD32 reg,
 #endif
 
 #if 1
-  xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "IBM561WriteReg: reg 0x%x data 0x%x\n",
-             reg, tmp | data);
+  xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "IBM561WriteReg: reg 0x%lx data 0x%x\n",
+             (unsigned long)reg, tmp | data);
 #endif
 
   TGA2_WRITE_RAMDAC_REG(reg, LO_ADDR);
diff --git a/src/tga_accel.c b/src/tga_accel.c
index b00596d..7d1c9dc 100644
--- a/src/tga_accel.c
+++ b/src/tga_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_accel.c,v 1.15 2001/11/21 22:32:59 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_accel.c,v 1.16 2003/09/24 02:43:28 dawes Exp $ */
 
 /*
  * Copyright 1996,1997 by Alan Hourihane, Wigan, England.
@@ -507,7 +507,7 @@ TGASubsequentSolidFillRect(ScrnInfoPtr pScrn, int x, int y, int w, int h)
   TGA_FAST_WRITE_REG(pTga->current_planemask, TGA_PLANEMASK_REG);
 
   if(w > 2048) {
-    ErrorF("TGASubsequentSolidFillRect called with w = %d, truncating.\n");
+    ErrorF("TGASubsequentSolidFillRect called with w = %d, truncating.\n", w);
     w = 2048;
   }
   pixel_count = w - 1;
diff --git a/src/tga_driver.c b/src/tga_driver.c
index 3822dc9..baa0413 100644
--- a/src/tga_driver.c
+++ b/src/tga_driver.c
@@ -22,7 +22,7 @@
  * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>
  *           Matthew Grossman, <mattg@oz.net> - acceleration and misc fixes
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_driver.c,v 1.58 2001/11/21 22:33:00 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_driver.c,v 1.61 2003/11/03 05:11:41 tsi Exp $ */
 
 /* everybody includes these */
 #include "xf86.h"
@@ -69,10 +69,8 @@
 #define DPMS_SERVER
 #include "extensions/dpms.h"
 
-#ifdef XvExtension
 #include "xf86xv.h"
 #include "Xv.h"
-#endif
 
 static const OptionInfoRec * TGAAvailableOptions(int chipid, int busid);
 static void	TGAIdentify(int flags);
@@ -92,8 +90,8 @@ static void	TGAAdjustFrame(int scrnIndex, int x, int y, int flags);
 
 /* Optional functions */
 static void	TGAFreeScreen(int scrnIndex, int flags);
-static int	TGAValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
-			     int flags);
+static ModeStatus TGAValidMode(int scrnIndex, DisplayModePtr mode,
+			       Bool verbose, int flags);
 
 /* Internally used functions */
 static Bool	TGAMapMem(ScrnInfoPtr pScrn);
@@ -193,7 +191,6 @@ static const char *xaaSymbols[] = {
     "XAADestroyInfoRec",
     "XAAGCIndex",
     "XAAInit",
-    "XAAScreenIndex",
     NULL
 };
 
@@ -1419,7 +1416,6 @@ TGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
     if(xf86DPMSInit(pScreen, TGADisplayPowerManagementSet, 0) == FALSE)
       ErrorF("DPMS initialization failed!\n");
 
-#ifdef XvExtension
     {
       XF86VideoAdaptorPtr *ptr;
       int n;
@@ -1434,7 +1430,6 @@ TGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
       }
 
     }
-#endif
     
     /* Report any unused options (only for the first generation) */
     if (serverGeneration == 1) {
@@ -1503,10 +1498,9 @@ TGAEnterVT(int scrnIndex, int flags)
 static void
 TGALeaveVT(int scrnIndex, int flags)
 {
-    TGAPtr pTga;
     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+/*     TGAPtr pTga = TGAPTR(pScrn); */
 
-    pTga = TGAPTR(pScrn);
     TGARestore(pScrn);
 
     /* no longer necessary with new VT switching code */
@@ -1555,7 +1549,7 @@ TGAFreeScreen(int scrnIndex, int flags)
 /* Checks if a mode is suitable for the selected chipset. */
 
 /* Optional */
-static int
+static ModeStatus
 TGAValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
 {
     if (mode->Flags & V_INTERLACE)