Compile warning fixes.

Also rename macro name in voodoo_pcirename.h.

3 files changed, 35 insertions, 11 deletions

diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c
index 5ad741e..f2f6c3a 100644
--- a/src/voodoo_driver.c
+++ b/src/voodoo_driver.c
@@ -47,6 +47,7 @@
 #include "fb.h"
 #include "mibank.h"
 #include "micmap.h"
+#include "mipointer.h"
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Version.h"
diff --git a/src/voodoo_hardware.c b/src/voodoo_hardware.c
index 82efaf3..1469939 100644
--- a/src/voodoo_hardware.c
+++ b/src/voodoo_hardware.c
@@ -65,6 +65,24 @@
 #include "mipict.h"
 #include "dixstruct.h"
 
+#include <unistd.h>
+
+
+#if 0
+static void VoodooReadWriteBank(ScreenPtr pScreen, int bank);
+#endif
+static Bool VoodooSetupForCPUToScreenAlphaTexture(ScrnInfoPtr pScrn, int op,
+	CARD16 red, CARD16 green, CARD16 blue, CARD16 alpha, int alphaType,
+	CARD8 *alphaPtr, int alphaPitch, int width, int height, int flags);
+static void VoodooSubsequentCPUToScreenAlphaTexture(ScrnInfoPtr pScrn,
+	int dstx, int dsty, int srcx, int srcy, int width, int height);
+static Bool VoodooSetupForCPUToScreenTexture(ScrnInfoPtr pScrn, int op,
+	int texType, CARD8 *texPtr, int texPitch, int width, int height,
+	int flags);
+static void VoodooSubsequentCPUToScreenTexture(ScrnInfoPtr pScrn,
+	int dstx, int dsty, int srcx, int srcy, int width, int height);
+
+
 static int debug = 0;
 
 /*
@@ -814,7 +832,8 @@ void VoodooWriteBank(ScreenPtr pScreen, int bank)
 	mmio32_w(pVoo, 0x114, pVoo->lfbMode);
 }
 
-void VoodooReadWriteBank(ScreenPtr pScreen, int bank)
+#if 0
+static void VoodooReadWriteBank(ScreenPtr pScreen, int bank)
 {
 	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
 	VoodooPtr pVoo = VoodooPTR(pScrn);
@@ -832,6 +851,7 @@ void VoodooReadWriteBank(ScreenPtr pScreen, int bank)
 	}
 	mmio32_w(pVoo, 0x114, pVoo->lfbMode);
 }
+#endif
 
 /*
  *	We normally want to load all four rop variants at once so
@@ -1183,9 +1203,9 @@ static void Voodoo2DisableClipping(ScrnInfoPtr pScrn)
  */
  
 
-Bool VoodooSetupForCPUToScreenAlphaTexture(ScrnInfoPtr pScrn, int op, CARD16 red, 
-	CARD16 green, CARD16 blue, CARD16 alpha, int alphaType, CARD8 *alphaPtr,
-	int alphaPitch,	int width, int height, int flags)
+static Bool VoodooSetupForCPUToScreenAlphaTexture(ScrnInfoPtr pScrn, int op,
+	CARD16 red, CARD16 green, CARD16 blue, CARD16 alpha, int alphaType,
+	CARD8 *alphaPtr, int alphaPitch, int width, int height, int flags)
 {
 	VoodooPtr pVoo = VoodooPTR(pScrn);
 
@@ -1210,7 +1230,8 @@ Bool VoodooSetupForCPUToScreenAlphaTexture(ScrnInfoPtr pScrn, int op, CARD16 red
 	return TRUE;	
 }	
 
-void VoodooSubsequentCPUToScreenAlphaTexture(ScrnInfoPtr pScrn, int dstx, int dsty, int srcx, int srcy, int width, int height)
+static void VoodooSubsequentCPUToScreenAlphaTexture(ScrnInfoPtr pScrn,
+	int dstx, int dsty, int srcx, int srcy, int width, int height)
 {
 	VoodooPtr pVoo = VoodooPTR(pScrn);
 	/* 32bit LFB write mode */
@@ -1258,8 +1279,9 @@ void VoodooSubsequentCPUToScreenAlphaTexture(ScrnInfoPtr pScrn, int dstx, int ds
 	mmio32_w(pVoo, 0x10C, 0);
 }
 
-Bool VoodooSetupForCPUToScreenTexture(ScrnInfoPtr pScrn, int op, int texType,
-	CARD8 *texPtr, int texPitch, int width, int height, int flags)
+static Bool VoodooSetupForCPUToScreenTexture(ScrnInfoPtr pScrn, int op,
+	int texType, CARD8 *texPtr, int texPitch, int width, int height,
+	int flags)
 {
 	VoodooPtr pVoo = VoodooPTR(pScrn);
 	
@@ -1283,7 +1305,8 @@ Bool VoodooSetupForCPUToScreenTexture(ScrnInfoPtr pScrn, int op, int texType,
 	return TRUE;
 }
 
-void VoodooSubsequentCPUToScreenTexture(ScrnInfoPtr pScrn, int dstx, int dsty, int srcx, int srcy, int width, int height)
+static void VoodooSubsequentCPUToScreenTexture(ScrnInfoPtr pScrn,
+	int dstx, int dsty, int srcx, int srcy, int width, int height)
 {
 	VoodooPtr pVoo = VoodooPTR(pScrn);
 	/* 32bit LFB write mode */
diff --git a/src/voodoo_pcirename.h b/src/voodoo_pcirename.h
index c93988a..de113b9 100644
--- a/src/voodoo_pcirename.h
+++ b/src/voodoo_pcirename.h
@@ -26,8 +26,8 @@
  * library. The main purpose being to facilitate source code compatibility.
  */
 
-#ifndef TRIDENTPCIRENAME_H
-#define TRIDENTPCIRENAME_H
+#ifndef VOODOOPCIRENAME_H
+#define VOODOOPCIRENAME_H
 
 enum region_type {
     REGION_MEM,
@@ -119,4 +119,4 @@ typedef struct pci_device *pciVideoPtr;
 
 #endif /* XSERVER_LIBPCIACCESS */
 
-#endif /* TRIDENTPCIRENAME_H */
+#endif /* VOODOOPCIRENAME_H */