diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2009-01-25 17:15:37 +0100 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-01-25 17:15:37 +0100 |
| commit | 3712b1b6b9d77789ac1c5d0dccfb8494a608e6aa (patch) | |
| tree | f67833cec5dbda1df702e6399bf919c52a95d5d9 /src/glamo-cmdq.c | |
| parent | 5b1749258d20bfb97bc2ec33d92ec2dfad216165 (diff) | |
Let the damm thing compile with -pedantic -Wall -Werror
Diffstat (limited to 'src/glamo-cmdq.c')
| -rw-r--r-- | src/glamo-cmdq.c | 11 |
1 files changed, 7 insertions, 4 deletions
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)); } |