Compile cleanup with stricter gcc settings

19 files changed, 31 insertions, 43 deletions

diff --git a/src/via_bandwidth.c b/src/via_bandwidth.c
index 24e8583..1bd6341 100644
--- a/src/via_bandwidth.c
+++ b/src/via_bandwidth.c
@@ -29,7 +29,6 @@
 #endif
 
 #include "via_driver.h"
-#include "via_vgahw.h"
 
 /*
  * Now that via_bios is no longer such a behemoth and the relevant code has
diff --git a/src/via_ch7xxx.c b/src/via_ch7xxx.c
index 59fbce3..7686aa6 100644
--- a/src/via_ch7xxx.c
+++ b/src/via_ch7xxx.c
@@ -30,7 +30,6 @@
 #endif
 
 #include "via_driver.h"
-#include "via_vgahw.h"
 #include "via_ch7xxx.h"
 #include <unistd.h>
 
diff --git a/src/via_display.c b/src/via_display.c
index 179d2d7..c5ccc1e 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -28,7 +28,6 @@
 #endif
 
 #include "via_driver.h"
-#include "via_vgahw.h"
 
 /*
  * Enables the second display channel.
diff --git a/src/via_dri.h b/src/via_dri.h
index 10818b5..fad90ac 100644
--- a/src/via_dri.h
+++ b/src/via_dri.h
@@ -73,4 +73,7 @@ typedef struct {
     int dummy;
 } VIADRIContextRec, *VIADRIContextPtr;
 
+Bool VIADRIKernelInit(ScrnInfoPtr pScrn);
+void kickVblank(ScrnInfoPtr pScrn);
+
 #endif /* _VIA_DRI_H_ */
diff --git a/src/via_i2c.c b/src/via_i2c.c
index 40e1387..ba2bc8d 100644
--- a/src/via_i2c.c
+++ b/src/via_i2c.c
@@ -32,18 +32,15 @@
 #endif
 
 #include "via_driver.h"
-#include "via_vgahw.h"
 
 #define SDA_READ  0x04
 #define SCL_READ  0x08
 #define SDA_WRITE 0x10
 #define SCL_WRITE 0x20
 
-
 /*
  * CRT I2C
  */
-
 static void
 ViaI2C1PutBits(I2CBusPtr Bus, int clock, int data)
 {
diff --git a/src/via_lvds.c b/src/via_lvds.c
index 23d59dc..201456c 100644
--- a/src/via_lvds.c
+++ b/src/via_lvds.c
@@ -32,7 +32,6 @@
 #endif
 
 #include "via_driver.h"
-#include "via_vgahw.h"
 #include "via_mode.h"
 #include <unistd.h>
 
diff --git a/src/via_memmgr.c b/src/via_memmgr.c
index 5068b94..a185647 100644
--- a/src/via_memmgr.c
+++ b/src/via_memmgr.c
@@ -176,7 +176,7 @@ drm_bo_map(ScrnInfoPtr pScrn, struct buffer_object *obj)
             obj->ptr = NULL;
         }
     } else
-        obj->ptr = (unsigned char *) obj->map_offset + obj->offset;
+        obj->ptr = (void *) (obj->map_offset + obj->offset);
     return obj->ptr;
 }
 
@@ -216,7 +216,7 @@ drm_bo_free(ScrnInfoPtr pScrn, struct buffer_object *obj)
                 struct drm_gem_close close;
 
                 close.handle = obj->handle;
-                if (ioctl(pVia->drmmode.fd, DRM_IOCTL_GEM_CLOSE, &close) < 0)
+                if (drmIoctl(pVia->drmmode.fd, DRM_IOCTL_GEM_CLOSE, &close) < 0)
                     ErrorF("DRM failed to free for handle %lld.\n", obj->handle);
 #endif
             }
diff --git a/src/via_outputs.c b/src/via_outputs.c
index 47ccd73..43c105a 100644
--- a/src/via_outputs.c
+++ b/src/via_outputs.c
@@ -36,7 +36,6 @@
 #endif
 
 #include "via_driver.h"
-#include "via_vgahw.h"
 #include <unistd.h>
 
 /*
@@ -911,7 +910,7 @@ ViaGetMemoryBandwidth(ScrnInfoPtr pScrn)
  * Standard vga call really.
  * Needs to be called to reset the dotclock (after SR40:2/1 reset)
  */
-static void
+void
 ViaSetUseExternalClock(vgaHWPtr hwp)
 {
     CARD8 data;
@@ -976,7 +975,7 @@ ViaSetPrimaryDotclock(ScrnInfoPtr pScrn, CARD32 clock)
 /*
  *
  */
-static void
+void
 ViaSetSecondaryDotclock(ScrnInfoPtr pScrn, CARD32 clock)
 {
     vgaHWPtr hwp = VGAHWPTR(pScrn);
diff --git a/src/via_ums.c b/src/via_ums.c
index e975cb2..6d84755 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -25,6 +25,7 @@
 #include "config.h"
 #endif
 #include "xf86Crtc.h"
+#include "xf86fbman.h"
 
 #include "globals.h"
 #include "via_driver.h"
diff --git a/src/via_ums.h b/src/via_ums.h
index b105c57..7d5a0a9 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -26,6 +26,8 @@
 #ifndef _VIA_BIOS_H_
 #define _VIA_BIOS_H_ 1
 
+#include "via_vgahw.h"
+
 #define     VIA_PANEL6X4                    0
 #define     VIA_PANEL8X6                    1
 #define     VIA_PANEL10X7                   2
@@ -188,16 +190,18 @@ Bool ViaVbeModePreInit(ScrnInfoPtr pScrn);
 void ViaVbeDPMS(ScrnInfoPtr pScrn, int mode);
 void ViaVbeDoDPMS(ScrnInfoPtr pScrn, int mode);
 int ViaVbePanelPower(vbeInfoPtr pVbe, int mode);
+Bool ViaVbeSetPanelMode(ScrnInfoPtr pScrn, Bool expand);
 
 /* via_ums.c */
 Bool VIAMapMem(ScrnInfoPtr pScrn);
 void VIAUnmapMem(ScrnInfoPtr pScrn);
 Bool ums_create(ScrnInfoPtr pScrn);
 Bool UMSPreInit(ScrnInfoPtr pScrn);
+Bool UMSAccelInit(ScreenPtr pScreen);
+void viaDisableVQ(ScrnInfoPtr pScrn);
 
 /* via_output.c */
 void ViaOutputsDetect(ScrnInfoPtr pScrn);
-void via_analog_init(ScrnInfoPtr pScrn);
 CARD32 ViaGetMemoryBandwidth(ScrnInfoPtr pScrn);
 CARD32 ViaModeDotClockTranslate(ScrnInfoPtr pScrn, DisplayModePtr mode);
 void ViaModePrimaryLegacy(xf86CrtcPtr crtc, DisplayModePtr mode);
@@ -211,6 +215,8 @@ void ViaTVPrintRegs(ScrnInfoPtr pScrn);
 #endif
 void ViaModeSecondCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode);
 void ViaModeFirstCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode);
+void ViaSetSecondaryDotclock(ScrnInfoPtr pScrn, CARD32 clock);
+void ViaSetUseExternalClock(vgaHWPtr hwp);
 
 /* via_display.c */
 Bool UMSCrtcInit(ScrnInfoPtr pScrn);
@@ -222,6 +228,7 @@ void ViaSecondCRTCHorizontalOffset(ScrnInfoPtr pScrn);
 void ViaSecondCRTCHorizontalQWCount(ScrnInfoPtr pScrn, int width);
 void ViaSecondCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
 void ViaShadowCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
+void ViaGammaDisable(ScrnInfoPtr pScrn);
 
 /* via_lvds.c */
 void via_lvds_init(ScrnInfoPtr pScrn);
diff --git a/src/via_vbe.c b/src/via_vbe.c
index e6c20c0..fd8b06d 100644
--- a/src/via_vbe.c
+++ b/src/via_vbe.c
@@ -133,7 +133,7 @@ ViaVbeSetActiveDevices(ScrnInfoPtr pScrn, int mode, int refresh)
 /*
  * Sets the panel mode (expand or center).
  */
-static Bool
+Bool
 ViaVbeSetPanelMode(ScrnInfoPtr pScrn, Bool expand)
 {
     VIAPtr pVia = VIAPTR(pScrn);
diff --git a/src/via_vgahw.c b/src/via_vgahw.c
index 836635a..fff95f4 100644
--- a/src/via_vgahw.c
+++ b/src/via_vgahw.c
@@ -33,7 +33,6 @@
 #include "compiler.h"
 #include "xf86.h"
 #include "via_driver.h" /* for HAVE_DEBUG */
-#include "via_vgahw.h"
 
 #if ABI_VIDEODRV_VERSION < 12
 #define PIOOFFSET hwp->PIOOffset
diff --git a/src/via_vgahw.h b/src/via_vgahw.h
index 10047bb..11bfc2c 100644
--- a/src/via_vgahw.h
+++ b/src/via_vgahw.h
@@ -25,15 +25,6 @@
 
 #include "vgaHW.h"
 
-/* not used currently */
-/*
-CARD8 ViaVgahwIn(vgaHWPtr hwp, int address);
-void ViaVgahwOut(vgaHWPtr hwp, int address, CARD8 value);
-
-CARD8 ViaVgahwRead(vgaHWPtr hwp, int indexaddress, CARD8 index, 
-		   int valueaddress);
-*/
-
 void ViaVgahwWrite(vgaHWPtr hwp, int indexaddress, CARD8 index,
 		  int valueaddress, CARD8 value);
 
@@ -44,6 +35,9 @@ void ViaCrtcMask(vgaHWPtr hwp, CARD8 index, CARD8 value, CARD8 mask);
 void ViaSeqMask(vgaHWPtr hwp, CARD8 index, CARD8 value, CARD8 mask);
 void ViaGrMask(vgaHWPtr hwp, CARD8 index, CARD8 value, CARD8 mask);
 
+void VIASave(ScrnInfoPtr pScrn);
+void VIARestore(ScrnInfoPtr pScrn);
+
 #ifdef HAVE_DEBUG
 void ViaVgahwPrint(vgaHWPtr hwp);
 #endif /* HAVE_DEBUG */
diff --git a/src/via_vt162x.c b/src/via_vt162x.c
index f7aacf5..f13a94b 100644
--- a/src/via_vt162x.c
+++ b/src/via_vt162x.c
@@ -28,7 +28,6 @@
 #endif
 
 #include "via_driver.h"
-#include "via_vgahw.h"
 #include "via_vt162x.h"
 
 static void
diff --git a/src/via_xv.c b/src/via_xv.c
index 0829eca..21e5a3f 100644
--- a/src/via_xv.c
+++ b/src/via_xv.c
@@ -39,7 +39,6 @@
 
 #include "compiler.h"
 #include "xf86Pci.h"
-#include "xf86fbman.h"
 #include "regionstr.h"
 #include "via_driver.h"
 
diff --git a/src/via_xv_overlay.c b/src/via_xv_overlay.c
index a80c237..9469dbd 100644
--- a/src/via_xv_overlay.c
+++ b/src/via_xv_overlay.c
@@ -29,17 +29,12 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86fbman.h"
 
 #ifdef XF86DRI
 #include "xf86drm.h"
-#endif
-
-#include "via_driver.h"
-#ifdef XF86DRI
 #include "via_drm.h"
 #endif
-#include "via_vgahw.h"
+#include "via_driver.h"
 
 #include <math.h>
 #include <unistd.h>
diff --git a/src/via_xvmc.c b/src/via_xvmc.c
index f26ec3e..89b23b1 100644
--- a/src/via_xvmc.c
+++ b/src/via_xvmc.c
@@ -34,7 +34,6 @@
 
 #include "compiler.h"
 #include "xf86Pci.h"
-#include "xf86fbman.h"
 #include "regionstr.h"
 
 #ifdef XF86DRI
diff --git a/src/via_xvmc.h b/src/via_xvmc.h
index 6bae5ba..901e9cd 100644
--- a/src/via_xvmc.h
+++ b/src/via_xvmc.h
@@ -29,8 +29,8 @@
 #include "via_drm.h"
 
 /*
- * This file contains the common definitions between the XvMC lib and the 
- * X server side. It is referenced also by the XvMC lib. Make sure any 
+ * This file contains the common definitions between the XvMC lib and the
+ * X server side. It is referenced also by the XvMC lib. Make sure any
  * structure change is reflected also in a change in minor version number!!
  */
 
diff --git a/src/xvmc/viaXvMCPriv.h b/src/xvmc/viaXvMCPriv.h
index 2b8e63e..5792234 100644
--- a/src/xvmc/viaXvMCPriv.h
+++ b/src/xvmc/viaXvMCPriv.h
@@ -55,8 +55,8 @@ extern Status _xvmc_destroy_subpicture(Display * dpy,
 #define VIA_SUBPIC_PALETTE_SIZE 16     /*Number of colors in subpicture palette */
 #define VIA_CBUFFERSIZE 4096	       /*Hardware command buffer size */
 #define VIA_MAX_BUFS 2		       /*Number of YUV buffers per surface */
-#define VIA_MAX_RENDSURF 3	       /*Maximum numbers of surfaces per context 
-				        * that can answer RENDERING to a rendering 
+#define VIA_MAX_RENDSURF 3	       /*Maximum numbers of surfaces per context
+				        * that can answer RENDERING to a rendering
 				        * query */
 
 typedef enum
@@ -99,7 +99,7 @@ typedef struct
     unsigned rendSurf[VIA_MAX_RENDSURF];	/* Which surfaces answer rendering to
 						 * a rendering query */
     int decoderOn;		       /* Decoder switched on ? */
-    int intraLoaded;		       /* Intra quantiser matrix loaded in 
+    int intraLoaded;		       /* Intra quantiser matrix loaded in
 				        * decoder? */
     int nonIntraLoaded;		       /* Non-Intra quantiser matrix loaded
 				        * in decoder */
@@ -109,7 +109,7 @@ typedef struct
     int attribChanged;		       /* Attributes have changed and need to
 				        * be uploaded to Xv at next frame
 				        * display */
-    drmLockPtr hwLock;		       /* Virtual address Pointer to the 
+    drmLockPtr hwLock;		       /* Virtual address Pointer to the
 				        * heavyweight drm hardware lock */
     unsigned xvMCPort;		       /* XvMC private port. Corresponds to
 				        * an Xv port, but not by number */
@@ -118,9 +118,9 @@ typedef struct
     XvAttribute attribDesc[VIA_NUM_XVMC_ATTRIBUTES];	/* Attribute decriptions */
     int useAGP;			       /* Use the AGP ringbuffer to upload data to the chip */
     void *xl;			       /* Lowlevel context. Opaque to us. */
-    int haveXv;			       /* Have I initialized the Xv 
+    int haveXv;			       /* Have I initialized the Xv
 				        * connection for this surface? */
-    XvImage *xvImage;		       /* Fake Xv Image used for command 
+    XvImage *xvImage;		       /* Fake Xv Image used for command
 				        * buffer transport to the X server */
     GC  gc;			       /* X GC needed for displaying */
     Drawable draw;		       /* Drawable to undisplay from */
@@ -162,14 +162,14 @@ typedef struct
     unsigned srfNo;		       /* XvMC private surface numbers */
     unsigned numBuffers;	       /* Number of picture buffers */
     unsigned curBuf;		       /* Which is the current buffer? */
-    unsigned offsets[VIA_MAX_BUFS];    /* Offsets of picture buffers 
+    unsigned offsets[VIA_MAX_BUFS];    /* Offsets of picture buffers
 				        * into the frame-buffer area */
     unsigned yStride;		       /* Stride of YUV420 Y component. */
     unsigned width;		       /* Dimensions */
     unsigned height;
     int progressiveSequence;	       /* Mpeg progressive picture? Hmm? */
     ViaXvMCContext *privContext;       /* XvMC context private part. */
-    ViaXvMCSubPicture *privSubPic;     /* Subpicture to be blended when 
+    ViaXvMCSubPicture *privSubPic;     /* Subpicture to be blended when
 				        * displaying. NULL if none. */
     int needsSync;
     int syncMode;