diff options
| author | tsi <tsi> | 2008-04-03 14:50:15 +0000 |
|---|---|---|
| committer | tsi <tsi> | 2008-04-03 14:50:15 +0000 |
| commit | 6860e937eac5f063e3b03feb9ce96c821f872297 (patch) | |
| tree | 1f2667332f62514e9d89e3c319997fa19e2f8bfa | |
| parent | 0fd49ef188ef1ebc2e1b134281a2dc7b45d5d1e0 (diff) | |
Fix printf warning
| -rw-r--r-- | programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c | 9 | ||||
| -rw-r--r-- | programs/Xserver/hw/xfree86/int10/generic.c | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c b/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c index 00652b33a..d08e99ba2 100644 --- a/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c +++ b/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v 1.137tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v 1.138tsi Exp $ */ /* * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and * VA Linux Systems Inc., Fremont, California. @@ -6029,7 +6029,8 @@ static void RADEONRestoreMemMapRegisters(ScrnInfoPtr pScrn, "Timeout trying to update memory controller settings !\n"); xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "MC_STATUS = 0x%08x (on entry = 0x%08x)\n", - INREG(RADEON_MC_STATUS), (unsigned int)old_mc_status); + (unsigned int)INREG(RADEON_MC_STATUS), + (unsigned int)old_mc_status); xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "You will probably crash now ... \n"); /* Nothing we can do except maybe try to kill the server, @@ -6120,10 +6121,10 @@ static void RADEONAdjustMemMapRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save) "DRI init changed memory map, adjusting ...\n"); xf86DrvMsg(pScrn->scrnIndex, X_WARNING, " MC_FB_LOCATION was: 0x%08x is: 0x%08x\n", - info->mc_fb_location, fb); + (unsigned int)info->mc_fb_location, fb); xf86DrvMsg(pScrn->scrnIndex, X_WARNING, " MC_AGP_LOCATION was: 0x%08x is: 0x%08x\n", - info->mc_agp_location, agp); + (unsigned int)info->mc_agp_location, agp); info->mc_fb_location = fb; info->mc_agp_location = agp; info->fbLocation = (save->mc_fb_location & 0xffff) << 16; diff --git a/programs/Xserver/hw/xfree86/int10/generic.c b/programs/Xserver/hw/xfree86/int10/generic.c index 471717a23..8d6ebe2d6 100644 --- a/programs/Xserver/hw/xfree86/int10/generic.c +++ b/programs/Xserver/hw/xfree86/int10/generic.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/generic.c,v 1.31tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/generic.c,v 1.32tsi Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment @@ -77,7 +77,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) #ifdef _PC int size; - CARD32 cs; + unsigned int cs; #endif screen = (xf86FindScreenForEntity(entityIndex))->scrnIndex; |