Let the damm thing compile with -pedantic -Wall -Werror

8 files changed, 63 insertions, 45 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 0fac992..b85ebb2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,7 @@
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XORG_CFLAGS@
+AM_CFLAGS = @XORG_CFLAGS@ -pedantic -Wall -Werror -std=gnu99
 glamo_drv_la_LTLIBRARIES = glamo_drv.la
 glamo_drv_la_LDFLAGS = -module -avoid-version
 glamo_drv_ladir = @moduledir@/drivers
diff --git a/src/glamo-cmdq.c b/src/glamo-cmdq.c
index 68c2611..5a0504a 100644
--- a/src/glamo-cmdq.c
+++ b/src/glamo-cmdq.c
@@ -24,6 +24,7 @@
  */
 
 #include <sys/time.h>
+#include <unistd.h>
 
 #include "glamo-log.h"
 #include "glamo.h"
@@ -32,6 +33,8 @@
 #include "glamo-draw.h"
 
 static void GLAMOCMDQResetCP(GlamoPtr pGlamo);
+static void GLAMODumpRegs(GlamoPtr pGlamo, CARD16 from, CARD16 to);
+
 #ifndef NDEBUG
 static void
 GLAMODebugFifo(GlamoPtr pGlamo)
@@ -381,7 +384,7 @@ GLAMOCMDQResetCP(GlamoPtr pGlamo)
 	CARD32 queue_offset = 0;
 
 	xf86DrvMsg(0, X_WARNING,
-			"GLAMOCMDQResetCP %x %d\n", pGlamo->ring_addr, pGlamo->ring_len );
+			"GLAMOCMDQResetCP %p %d\n", (void *)pGlamo->ring_addr, pGlamo->ring_len );
 
 	/* make the decoder happy? */
 	memset((char*)pGlamo->ring_addr, 0, pGlamo->ring_len+2);
@@ -411,7 +414,6 @@ static Bool
 GLAMOCMDQInit(GlamoPtr pGlamo,
 	      Bool force)
 {
-	char *mmio = pGlamo->reg_base;
 	int cq_len = CQ_LEN;
 
 	xf86DrvMsg(0, X_WARNING,
@@ -479,13 +481,14 @@ GLAMOCMQCacheTeardown(GlamoPtr pGlamo)
 	pGlamo->cmd_queue_cache = NULL;
 }
 
-void GLAMODumpRegs(GlamoPtr pGlamo,
+static void
+GLAMODumpRegs(GlamoPtr pGlamo,
               CARD16 from,
               CARD16 to)
 {
 	int i=0;
 	for (i=from; i <= to; i += 2) {
-			xf86DrvMsg(0, X_WARNING,"reg:%#x, val:%#x\n",
+			xf86DrvMsg(0, X_WARNING,"reg:%p, val:%#x\n",
 		pGlamo->reg_base+i,
 		*(VOL16*)(pGlamo->reg_base+i));
 	}
diff --git a/src/glamo-cmdq.h b/src/glamo-cmdq.h
index b04df10..725258c 100644
--- a/src/glamo-cmdq.h
+++ b/src/glamo-cmdq.h
@@ -26,7 +26,7 @@
 #ifndef _GLAMO_DMA_H_
 #define _GLAMO_DMA_H_
 
-#define CCE_DEBUG 1
+#define CCE_DEBUG 0
 
 #if !CCE_DEBUG
 
@@ -45,6 +45,15 @@ do {									\
 	pGlamo->cmd_queue_cache->used += __count * 2;			\
 } while (0)
 
+#define OUT_BURST_REG(reg, val) do {                                   \
+       __head[__count++] = (val);                                      \
+} while (0)
+
+#define OUT_BURST(reg, n)                                              \
+do {                                                                   \
+       OUT_PAIR((1 << 15) | reg, n);                                   \
+} while (0)
+
 #else
 
 #define RING_LOCALS	\
@@ -69,14 +78,6 @@ do {									\
 	pGlamo->cmd_queue_cache->used += __count * 2;			\
 } while (0)
 
-#endif
-
-#define OUT_PAIR(v1, v2)                                               \
-do {                                                                   \
-       __head[__count++] = (v1);                                       \
-       __head[__count++] = (v2);                                       \
-} while (0)
-
 #define OUT_BURST_REG(reg, val) do {                                   \
        if (__reg != reg)                                               \
                FatalError("unexpected reg (0x%x vs 0x%x) at %s:%d\n",  \
@@ -88,9 +89,6 @@ do {                                                                   \
        __reg += 2;                                                     \
 } while (0)
 
-#define OUT_REG(reg, val)                                              \
-       OUT_PAIR(reg, val)
-
 #define OUT_BURST(reg, n)                                              \
 do {                                                                   \
        OUT_PAIR((1 << 15) | reg, n);                                   \
@@ -98,6 +96,19 @@ do {                                                                   \
        __packet0count = n;                                             \
 } while (0)
 
+#endif
+
+#define OUT_PAIR(v1, v2)                                               \
+do {                                                                   \
+       __head[__count++] = (v1);                                       \
+       __head[__count++] = (v2);                                       \
+} while (0)
+
+
+#define OUT_REG(reg, val)                                              \
+       OUT_PAIR(reg, val)
+
+
 
 #define TIMEOUT_LOCALS struct timeval _target, _curtime
 
diff --git a/src/glamo-draw.c b/src/glamo-draw.c
index ef06d99..28c36e4 100644
--- a/src/glamo-draw.c
+++ b/src/glamo-draw.c
@@ -70,8 +70,6 @@ static const CARD8 GLAMOBltRop[16] = {
     /* GXset        */      0xff,         /* 1 */
 };
 
-static CARD32 settings, color, src_pitch_offset, dst_pitch_offset;
-
 /********************************
  * exa entry points declarations
  ********************************/
@@ -190,7 +188,6 @@ GLAMODrawExaInit(ScreenPtr pScreen, ScrnInfoPtr pScrn)
 {
 	GlamoPtr pGlamo = GlamoPTR(pScrn);
 
-	int offscreen_memory_size = 0;
 	Bool success = FALSE;
 	ExaDriverPtr exa;
 
@@ -264,6 +261,7 @@ GLAMOExaPrepareSolid(PixmapPtr      pPix,
 	GlamoPtr pGlamo = GlamoPTR(pScrn);
 
 	CARD32 offset, pitch;
+    CARD8 op;
 	FbBits mask;
 	RING_LOCALS;
 
@@ -275,7 +273,7 @@ GLAMOExaPrepareSolid(PixmapPtr      pPix,
 		GLAMO_FALLBACK(("Can't do planemask 0x%08x\n",
 				(unsigned int) pm));
 
-	settings = GLAMOSolidRop[alu] << 8;
+	op = GLAMOSolidRop[alu] << 8;
 	offset = exaGetPixmapOffset(pPix);
 	pitch = pPix->devKind;
 
@@ -287,7 +285,7 @@ GLAMOExaPrepareSolid(PixmapPtr      pPix,
 	OUT_REG(GLAMO_REG_2D_DST_PITCH, pitch);
 	OUT_REG(GLAMO_REG_2D_DST_HEIGHT, pPix->drawable.height);
 	OUT_REG(GLAMO_REG_2D_PAT_FG, fg);
-	OUT_REG(GLAMO_REG_2D_COMMAND2, settings);
+	OUT_REG(GLAMO_REG_2D_COMMAND2, op);
 	END_CMDQ();
 	GLAMO_LOG("leave\n");
 
@@ -337,11 +335,7 @@ GLAMOExaPrepareCopy(PixmapPtr       pSrc,
 {
 	ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum];
 	GlamoPtr pGlamo = GlamoPTR(pScrn);
-
-	CARD32 src_offset, src_pitch;
-	CARD32 dst_offset, dst_pitch;
 	FbBits mask;
-	RING_LOCALS;
 
 	GLAMO_LOG("enter\n");
 
@@ -529,7 +523,7 @@ GLAMOExaDownloadFromScreen(PixmapPtr pSrc,
 	src_pitch = pSrc->devKind;
 	src = pGlamo->exa->memoryBase + exaGetPixmapOffset(pSrc) +
 						x*bpp + y*src_pitch;
-	dst_offset = dst ;
+	dst_offset = (unsigned char*)dst;
 
 	GLAMO_LOG("dst_pitch:%d, src_pitch\n", dst_pitch, src_pitch);
 	for (i = 0; i < h; i++) {
@@ -544,7 +538,7 @@ GLAMOExaDownloadFromScreen(PixmapPtr pSrc,
 void
 GLAMOExaWaitMarker (ScreenPtr pScreen, int marker)
 {
-	ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum];
+	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
 	GlamoPtr pGlamo = GlamoPTR(pScrn);
 	GLAMO_LOG("enter\n");
 	GLAMOEngineWait(pGlamo, GLAMO_ENGINE_ALL);
diff --git a/src/glamo-driver.c b/src/glamo-driver.c
index 2d2d4c0..db79168 100644
--- a/src/glamo-driver.c
+++ b/src/glamo-driver.c
@@ -60,8 +60,8 @@ static Bool	GlamoPreInit(ScrnInfoPtr pScrn, int flags);
 static Bool	GlamoScreenInit(int Index, ScreenPtr pScreen, int argc,
 				char **argv);
 static Bool	GlamoCloseScreen(int scrnIndex, ScreenPtr pScreen);
-static void *	GlamoWindowLinear(ScreenPtr pScreen, CARD32 row, CARD32 offset, int mode,
-				  CARD32 *size, void *closure);
+/*static void *	GlamoWindowLinear(ScreenPtr pScreen, CARD32 row, CARD32 offset, int mode,
+				  CARD32 *size, void *closure);*/
 static void	GlamoPointerMoved(int index, int x, int y);
 static Bool	GlamoDGAInit(ScrnInfoPtr pScrn, ScreenPtr pScreen);
 static Bool	GlamoDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op,
@@ -135,11 +135,11 @@ static const OptionInfoRec GlamoOptions[] = {
 
 /* -------------------------------------------------------------------- */
 
-static const char *afbSymbols[] = {
+/*static const char *afbSymbols[] = {
 	"afbScreenInit",
 	"afbCreateDefColormap",
 	NULL
-};
+};*/
 
 static const char *fbSymbols[] = {
 	"fbScreenInit",
@@ -438,9 +438,8 @@ GlamoPreInit(ScrnInfoPtr pScrn, int flags)
 {
 	GlamoPtr fPtr;
 	int default_depth, fbbpp;
-	const char *mod = NULL, *s;
-	const char **syms = NULL;
-	int type;
+	const char /**mod = NULL,*/ *s;
+	/*const char **syms = NULL;*/
 
 	if (flags & PROBE_DETECT) return FALSE;
 
@@ -608,10 +607,9 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 	GlamoPtr fPtr = GlamoPTR(pScrn);
 	VisualPtr visual;
 	int init_picture = 0;
-	int ret, flags;
-	int type;
+    int ret, flags;
 
-	TRACE_ENTER("GlamoScreenInit");
+    TRACE_ENTER("GlamoScreenInit");
 
 #if DEBUG
 	ErrorF("\tbitsPerPixel=%d, depth=%d, defaultVisual=%s\n"
@@ -820,7 +818,7 @@ GlamoCloseScreen(int scrnIndex, ScreenPtr pScreen)
 /***********************************************************************
  * Shadow stuff
  ***********************************************************************/
-
+#if 0
 static void *
 GlamoWindowLinear(ScreenPtr pScreen, CARD32 row, CARD32 offset, int mode,
 		 CARD32 *size, void *closure)
@@ -838,7 +836,7 @@ GlamoWindowLinear(ScreenPtr pScreen, CARD32 row, CARD32 offset, int mode,
 
     return ((CARD8 *)fPtr->fbstart + row * fPtr->lineLength + offset);
 }
-
+#endif
 static void
 GlamoPointerMoved(int index, int x, int y)
 {
@@ -877,7 +875,6 @@ GlamoPointerMoved(int index, int x, int y)
     (*fPtr->PointerMoved)(index, newX, newY);
 }
 
-
 /***********************************************************************
  * DGA stuff
  ***********************************************************************/
diff --git a/src/glamo-funcs.c b/src/glamo-funcs.c
index a31a605..f7dbb18 100644
--- a/src/glamo-funcs.c
+++ b/src/glamo-funcs.c
@@ -23,6 +23,8 @@
  *  Dodji Seketeli <dodji@openedhand.com>
  */
 
+#include <unistd.h>
+
 #include "glamo-log.h"
 #include "glamo.h"
 #include "glamo-funcs.h"
@@ -139,6 +141,8 @@ GLAMOResetEngine(GlamoPtr pGlamo, enum GLAMOEngine engine)
 			reg = GLAMO_REG_CLOCK_2D;
 			mask = GLAMO_CLOCK_2D_RESET;
 			break;
+        default:
+            return;
 	}
 
 	GLAMOSetBitMask(pGlamo, reg, mask, 0xffff);
@@ -238,6 +242,8 @@ GLAMOEnableEngine(GlamoPtr pGlamo, enum GLAMOEngine engine)
 					GLAMO_CLOCK_GEN51_EN_DIV_GCLK,
 					0xffff);
 			break;
+        default:
+            break;
 	}
 	usleep(1000);
 	engine_status[engine] |= STATUS_ENABLED;
@@ -399,6 +405,7 @@ GLAMOISPYuvRgbPipelineInit(GlamoPtr pGlamo)
 	GLAMO_LOG("leave\n");
 }
 
+#if 0
 static void
 GLAMOISPColorKeyOverlayInit(GlamoPtr pGlamo)
 {
@@ -413,6 +420,7 @@ GLAMOISPColorKeyOverlayInit(GlamoPtr pGlamo)
 			GLAMO_ISP_EN4_OVERLAY|GLAMO_ISP_EN4_LCD_OVERLAY,
 			0x0003);
 }
+#endif
 
 void
 GLAMOISPSetColorKeyOverlay(GlamoPtr	pGlamo,
@@ -435,7 +443,7 @@ GLAMOISPSetColorKeyOverlay(GlamoPtr	pGlamo,
 		  start_addr, x, y, width, height, pitch,
 		  red_key, green_key, blue_key);
 
-	green_red_keys = (green_key << 8+2) & 0xff00;
+	green_red_keys = (green_key << (8+2)) & 0xff00;
 	green_red_keys |= (red_key << 3) & 0x00ff;
 
 	BEGIN_CMDQ(18);
@@ -514,7 +522,6 @@ GLAMOISPDisplayYUVPlanarFrame (GlamoPtr pGlamo,
 			       short scale_w,
 			       short scale_h)
 {
-	int en3;
 	RING_LOCALS;
 
 
diff --git a/src/glamo-log.h b/src/glamo-log.h
index 70bbf1d..c51b51e 100644
--- a/src/glamo-log.h
+++ b/src/glamo-log.h
@@ -36,8 +36,8 @@
 
 #ifdef NDEBUG
 /*we are not in debug mode*/
-#define GLAMO_LOG
-#define GLAMO_LOG_ERROR
+#define GLAMO_LOG(...) do {} while(0)
+#define GLAMO_LOG_ERROR(...) do {} while(0)
 
 #else /*NDEBUG*/
 #define ERROR_LOG_LEVEL 3
diff --git a/src/glamo.h b/src/glamo.h
index 7738bc5..b2c1784 100644
--- a/src/glamo.h
+++ b/src/glamo.h
@@ -214,6 +214,9 @@ Bool
 GLAMODrawInit(ScreenPtr pScreen);
 
 void
+GLAMODrawSetup(GlamoPtr pGlamo);
+
+void
 GLAMODrawEnable(GlamoPtr pScreen);
 
 void
@@ -228,4 +231,7 @@ GLAMORecolorCursor(ScreenPtr pScreen, int ndef, xColorItem *pdef);
 int
 GLAMOLog2(int val);
 
+Bool
+GLAMODrawExaInit(ScreenPtr pScreen, ScrnInfoPtr pScrn);
+
 #endif /* _GLAMO_H_ */