diff options
Diffstat (limited to 'src/vboard.c')
| -rw-r--r-- | src/vboard.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/vboard.c b/src/vboard.c index 4e769b6..ffc8c0e 100644 --- a/src/vboard.c +++ b/src/vboard.c @@ -1,8 +1,12 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c,v 1.17 2003/03/25 04:18:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c,v 1.18tsi Exp $ */ /* * includes */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "rendition.h" #include "v1krisc.h" #include "vboard.h" @@ -50,7 +54,7 @@ verite_initboard(ScrnInfoPtr pScreenInfo) /* Note that CS ucode must wait on address in csucode_base * when initialized for later context switch code to work. */ - ErrorF("Loading csucode @ 0x%x + 0x800\n", pRendition->board.vmem_base); + ErrorF("Loading csucode @ %p + 0x800\n", pRendition->board.vmem_base); vmb=pRendition->board.vmem_base; offset=pRendition->board.csucode_base; for (c=0; c<sizeof(csrisc)/sizeof(vu32); c++, offset+=sizeof(vu32)) @@ -81,8 +85,8 @@ verite_initboard(ScrnInfoPtr pScreenInfo) if (pc != pRendition->board.csucode_base){ xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR, ("VERITE_INITBOARD -- PC != CSUCODEBASE\n")); - ErrorF ("RENDITION: PC == 0x%x -- CSU == 0x%x\n", - pc,pRendition->board.csucode_base); + ErrorF ("RENDITION: PC == 0x%x -- CSU == 0x%lx\n", + pc,(unsigned long)pRendition->board.csucode_base); } /* reset memory endian */ @@ -228,10 +232,10 @@ verite_check_csucode(ScrnInfoPtr pScreenInfo) offset=pRendition->board.csucode_base; for (c=0; c<sizeof(csrisc)/sizeof(vu32); c++, offset+=sizeof(vu32)) if (csrisc[c] != verite_read_memory32(vmb, offset)) { - ErrorF("csucode mismatch in word %02d: 0x%08x should be 0x%08x\n", + ErrorF("csucode mismatch in word %02d: 0x%08lx should be 0x%08lx\n", c, - verite_read_memory32(vmb, offset), - csrisc[c]); + (unsigned long)verite_read_memory32(vmb, offset), + (unsigned long)csrisc[c]); mismatches++; } #ifdef DEBUG |