Various IRIX-related tweaks.

10 files changed, 34 insertions, 38 deletions

diff --git a/config/cf/Imake.tmpl b/config/cf/Imake.tmpl
index 35d00fea4..bdfae85b2 100644
--- a/config/cf/Imake.tmpl
+++ b/config/cf/Imake.tmpl
@@ -1,6 +1,6 @@
 XCOMM ----------------------------------------------------------------------
 XCOMM Makefile generated from IMAKE_TEMPLATE and INCLUDE_IMAKEFILE
-XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.180tsi Exp $
+XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.181tsi Exp $
 XCOMM ----------------------------------------------------------------------
 /*
  * Copyright (c) 1994-2005 by The XFree86 Project, Inc.
@@ -1684,7 +1684,7 @@ TCLIBDIR = TclLibDir
 #define DocFilesToClean /**/
 #endif
 #ifndef FilesToClean
-#define FilesToClean *.CKP *.ln *.BAK *.bak *.Osuf core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut
+#define FilesToClean *.CKP *.ln *.BAK *.bak *.Osuf *.i *.ii core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut
 #endif
 
 #ifdef CrossCompileDir
diff --git a/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.c b/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.c
index 7dbcf7cb7..cb4cf7fed 100644
--- a/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.c
+++ b/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.c,v 1.3tsi Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -36,7 +37,6 @@
 ** Author: Eric Veach, July 1994.
 **
 */
-/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.c,v 1.2 2001/04/03 02:18:40 dawes Exp $ */
 
 #include "gluos.h"
 #include <stddef.h>
@@ -275,7 +275,7 @@ gluTessNormal( GLUtesselator *tess, GLdouble x, GLdouble y, GLdouble z )
 
 void GLAPIENTRY
 gluTessCallback( GLUtesselator *tess, GLenum which,
-		GLvoid (GLAPIENTRY *fn)(GLvoid))
+		GLvoid (GLAPIENTRY *fn)(void))
 {
   switch( which ) {
   case GLU_TESS_BEGIN:
diff --git a/extras/ogl-sample/main/gfx/lib/glu/libutil/quad.c b/extras/ogl-sample/main/gfx/lib/glu/libutil/quad.c
index 3055c6494..f87fdeb5e 100644
--- a/extras/ogl-sample/main/gfx/lib/glu/libutil/quad.c
+++ b/extras/ogl-sample/main/gfx/lib/glu/libutil/quad.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libutil/quad.c,v 1.4tsi Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -32,7 +33,6 @@
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
 */
-/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libutil/quad.c,v 1.3tsi Exp $ */
 
 #include "gluos.h"
 #include "gluint.h"
@@ -90,7 +90,7 @@ static void gluQuadricError(GLUquadric *qobj, GLenum which)
 
 void GLAPIENTRY
 gluQuadricCallback(GLUquadric *qobj, GLenum which,
-		GLvoid (GLAPIENTRY *fn)(GLvoid))
+		GLvoid (GLAPIENTRY *fn)(void))
 {
     switch (which) {
       case GLU_ERROR:
diff --git a/include/GL/glu.h b/include/GL/glu.h
index 3320ad10c..96fac47c3 100644
--- a/include/GL/glu.h
+++ b/include/GL/glu.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/GL/glu.h,v 1.2 2001/04/03 02:18:39 dawes Exp $ */
+/* $XFree86: xc/include/GL/glu.h,v 1.3tsi Exp $ */
 
 /*
 ** License Applicability. Except to the extent portions of this file are
@@ -259,7 +259,7 @@ typedef struct GLUtesselator GLUtriangulatorObj;
 #ifdef __cplusplus
 typedef GLvoid (*_GLUfuncptr)();
 #else
-typedef GLvoid (*_GLUfuncptr)(GLvoid);
+typedef GLvoid (*_GLUfuncptr)(void);
 #endif
 
 extern void gluBeginCurve (GLUnurbs* nurb);
diff --git a/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c b/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c
index 842d2eb29..4351a2800 100644
--- a/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c
+++ b/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c,v 1.98tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c,v 1.99tsi Exp $ */
 /*
  * Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
  *                      Precision Insight, Inc., Cedar Park, Texas, and
@@ -3579,22 +3579,22 @@ static Bool R128InitCrtc2Registers(ScrnInfoPtr pScrn, R128SavePtr save,
     int    hsync_wid;
     int    hsync_fudge;
     int    vsync_wid;
-    int    bytpp;
     int    hsync_fudge_default[] = { 0x00, 0x12, 0x09, 0x09, 0x06, 0x05 };
 
     switch (info->CurrentLayout.pixel_code) {
-    case 4:  format = 1; bytpp = 0; break;
-    case 8:  format = 2; bytpp = 1; break;
-    case 15: format = 3; bytpp = 2; break;      /*  555 */
-    case 16: format = 4; bytpp = 2; break;      /*  565 */
-    case 24: format = 5; bytpp = 3; break;      /*  RGB */
-    case 32: format = 6; bytpp = 4; break;      /* xRGB */
+    case 4:  format = 1; break;
+    case 8:  format = 2; break;
+    case 15: format = 3; break;      /*  555 */
+    case 16: format = 4; break;      /*  565 */
+    case 24: format = 5; break;      /*  RGB */
+    case 32: format = 6; break;      /* xRGB */
     default:
 	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 		   "Unsupported pixel depth (%d)\n", info->CurrentLayout.bitsPerPixel);
 	return FALSE;
     }
-    R128TRACE(("Format = %d (%d bytes per pixel)\n", format, bytpp));
+    R128TRACE(("Format = %d (%d bytes per pixel)\n", format,
+	       (info->CurrentLayout.pixel_code + 1) / 8));
 
     hsync_fudge = hsync_fudge_default[format-1];
 
diff --git a/programs/Xserver/hw/xfree86/drivers/ati/radeon.h b/programs/Xserver/hw/xfree86/drivers/ati/radeon.h
index 1280bacad..32c55f8ed 100644
--- a/programs/Xserver/hw/xfree86/drivers/ati/radeon.h
+++ b/programs/Xserver/hw/xfree86/drivers/ati/radeon.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h,v 1.48tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h,v 1.49tsi Exp $ */
 /*
  * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
  *                VA Linux Systems Inc., Fremont, California.
@@ -292,9 +292,10 @@ typedef enum {
  * Errata workarounds
  */
 typedef enum {
-       CHIP_ERRATA_R300_CG             = 0x00000001,
-       CHIP_ERRATA_PLL_DUMMYREADS      = 0x00000002,
-       CHIP_ERRATA_PLL_DELAY           = 0x00000004
+	CHIP_ERRATA_NONE           = 0,
+	CHIP_ERRATA_R300_CG        = 0x00000001,
+	CHIP_ERRATA_PLL_DUMMYREADS = 0x00000002,
+	CHIP_ERRATA_PLL_DELAY      = 0x00000004
 } RADEONErrata;
 
 typedef enum {
diff --git a/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c b/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
index d08e99ba2..8165612a7 100644
--- a/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
+++ b/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v 1.138tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v 1.139tsi Exp $ */
 /*
  * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
  *                VA Linux Systems Inc., Fremont, California.
@@ -2854,7 +2854,7 @@ static Bool RADEONPreInitChipType(ScrnInfoPtr pScrn)
 
 				/* Read registers used to determine options */
     /* Check chip errata */
-    info->ChipErrata = 0;
+    info->ChipErrata = CHIP_ERRATA_NONE;
 
     if (info->ChipFamily == CHIP_FAMILY_R300 &&
 	(INREG(RADEON_CONFIG_CNTL) & RADEON_CFG_ATI_REV_ID_MASK)
diff --git a/programs/Xserver/hw/xfree86/drivers/ati/radeon_mergedfb.c b/programs/Xserver/hw/xfree86/drivers/ati/radeon_mergedfb.c
index 55b7655f3..c9be44007 100644
--- a/programs/Xserver/hw/xfree86/drivers/ati/radeon_mergedfb.c
+++ b/programs/Xserver/hw/xfree86/drivers/ati/radeon_mergedfb.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_mergedfb.c,v 1.0tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_mergedfb.c,v 1.1tsi Exp $ */
 /*
  * Copyright 2003 Alex Deucher.
  *
@@ -48,7 +48,9 @@
 #include "radeon_mergedfb.h"
 
 /* pseudo xinerama support */
+#if 0
 static unsigned char	RADEONXineramaReqCode = 0;
+#endif
 int			RADEONXineramaPixWidth = 0;
 int			RADEONXineramaPixHeight = 0;
 int			RADEONXineramaNumScreens = 0;
@@ -605,7 +607,6 @@ void
 RADEONUpdateXineramaScreenInfo(ScrnInfoPtr pScrn1)
 {
     RADEONInfoPtr  info   = RADEONPTR(pScrn1);
-    ScrnInfoPtr pScrn2 = NULL;
     int crt1scrnnum = 0, crt2scrnnum = 1;
     /* Upper case to avoid shadow warnings */
     int X1=0, X2=0, Y1=0, Y2=0, H1=0, H2=0, W1=0, W2=0;
@@ -629,8 +630,6 @@ RADEONUpdateXineramaScreenInfo(ScrnInfoPtr pScrn1)
        crt2scrnnum = 0;
     }
 
-    pScrn2 = info->CRT2pScrn;
-
     /* Attention: Usage of RandR may lead into virtual X and Y values
      * actually smaller than our MetaModes! To avoid this, we calculate
      * the maxCRT fields here (and not somewhere else, like in CopyNLink)
@@ -1309,7 +1308,9 @@ RADEONXineramaExtensionInit(ScrnInfoPtr pScrn)
 
 	  if(!info->XineramaExtEntry) break;
 
+#if 0
 	  RADEONXineramaReqCode = (unsigned char)info->XineramaExtEntry->base;
+#endif
 
 	  if(!(RADEONXineramadataPtr = (RADEONXineramaData *)
 		xcalloc(RADEONXineramaNumScreens, sizeof(RADEONXineramaData)))) break;
diff --git a/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h b/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h
index 678ee3776..fa4cd8ad6 100644
--- a/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h
+++ b/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h,v 1.19tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h,v 1.20tsi Exp $ */
 /*
  * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
  *                VA Linux Systems Inc., Fremont, California.
@@ -129,8 +129,8 @@ typedef struct
     ScrnInfoPtr pSecondaryScrn;
     ScrnInfoPtr pPrimaryScrn;
 
-    int MonType1;
-    int MonType2;
+    RADEONMonitorType MonType1;
+    RADEONMonitorType MonType2;
     xf86MonPtr MonInfo1;
     xf86MonPtr MonInfo2;
     Bool ReversedDAC;	  /* TVDAC used as primary dac */
diff --git a/programs/Xserver/hw/xfree86/drivers/ati/radeon_video.c b/programs/Xserver/hw/xfree86/drivers/ati/radeon_video.c
index 51d741fc4..1824f0b18 100644
--- a/programs/Xserver/hw/xfree86/drivers/ati/radeon_video.c
+++ b/programs/Xserver/hw/xfree86/drivers/ati/radeon_video.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_video.c,v 1.33tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_video.c,v 1.34tsi Exp $ */
 
 #include "radeon.h"
 #include "radeon_macros.h"
@@ -705,7 +705,6 @@ static void RADEONSetTransform (ScrnInfoPtr pScrn,
     float	    CAdjRCb, CAdjRCr;
     float	    CAdjGCb, CAdjGCr;
     float	    CAdjBCb, CAdjBCr;
-    float	    RedAdj,GreenAdj,BlueAdj;
     float	    OvLuma, OvROff, OvGOff, OvBOff;
     float	    OvRCb, OvRCr;
     float	    OvGCb, OvGCr;
@@ -748,9 +747,6 @@ static void RADEONSetTransform (ScrnInfoPtr pScrn,
 
     CAdjLuma = cont * trans[ref].RefLuma;
     CAdjOff = cont * trans[ref].RefLuma * bright * 1023.0;
-    RedAdj = cont * trans[ref].RefLuma * red_intensity * 1023.0;
-    GreenAdj = cont * trans[ref].RefLuma * green_intensity * 1023.0;
-    BlueAdj = cont * trans[ref].RefLuma * blue_intensity * 1023.0;
 
     CAdjRCb = sat * -OvHueSin * trans[ref].RefRCr;
     CAdjRCr = sat * OvHueCos * trans[ref].RefRCr;
@@ -2113,7 +2109,7 @@ RADEONPutImage(
    unsigned char *dst_start;
    int new_size, offset, s2offset, s3offset;
    int srcPitch, srcPitch2, dstPitch;
-   int top, left, npixels, nlines, bpp;
+   int top, left, npixels, nlines;
    int video_offset;
    BoxRec dstBox;
    CARD32 tmp;
@@ -2167,8 +2163,6 @@ RADEONPutImage(
 	dstBox.y2 -= pScrn->frameY0;
    }
 
-   bpp = pScrn->bitsPerPixel >> 3;
-
    switch(id) {
    case FOURCC_RGB24:
 	dstPitch=(width*4+0x0f)&(~0x0f);