diff options
| author | Adam Jackson <ajax@freedesktop.org> | 2005-07-11 02:29:45 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@freedesktop.org> | 2005-07-11 02:29:45 +0000 |
| commit | 7dbea4acea2fea07ca9d5f3dcf9b3fdd9202885f (patch) | |
| tree | 46b25020e4174f252e153f8e7855fb8ef8b5a1f9 | |
| parent | 27a07f82fab14159adc8588c5887d2024202467a (diff) | |
Prep for modular builds by adding guarded #include "config.h" everywhere.XORG-6_8_99_16XORG-6_8_99_15
74 files changed, 331 insertions, 34 deletions
@@ -54,6 +54,10 @@ * V3, including OEM counterparts. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "atiident.h" #include "atioption.h" #include "atiprobe.h" diff --git a/src/atiaccel.c b/src/atiaccel.c index 8b60fbd..050019d 100644 --- a/src/atiaccel.c +++ b/src/atiaccel.c @@ -24,6 +24,10 @@ * Leif Delgass <ldelgass@retinalburn.net> */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "atiaccel.h" #include "atiadapter.h" #include "atimach64accel.h" diff --git a/src/atiadapter.c b/src/atiadapter.c index 897788b..7dab08a 100644 --- a/src/atiadapter.c +++ b/src/atiadapter.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiadapter.c,v 1.17 2003/01/01 19:16:30 tsi Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "atiadapter.h" /* diff --git a/src/atiadjust.c b/src/atiadjust.c index 587c066..f2fe10e 100644 --- a/src/atiadjust.c +++ b/src/atiadjust.c @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "ati.h" #include "atiadjust.h" #include "atichip.h" diff --git a/src/atiaudio.c b/src/atiaudio.c index ada8330..157cee3 100644 --- a/src/atiaudio.c +++ b/src/atiaudio.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiaudio.c,v 1.1 2003/07/24 22:08:27 tsi Exp $ */ /* - * Copyright 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "atiaudio.h" /* diff --git a/src/atibank.c b/src/atibank.c index 82d591a..aa025c7 100644 --- a/src/atibank.c +++ b/src/atibank.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atibank.c,v 1.12 2003/01/01 19:16:30 tsi Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "ati.h" #include "atibank.h" #include "atimach64io.h" diff --git a/src/atibus.c b/src/atibus.c index c06c696..c6eade1 100644 --- a/src/atibus.c +++ b/src/atibus.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atibus.c,v 1.18 2003/01/22 21:44:10 tsi Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "ati.h" #include "atiadapter.h" #include "atibus.h" diff --git a/src/atichip.c b/src/atichip.c index 3c369bf..80e1ebe 100644 --- a/src/atichip.c +++ b/src/atichip.c @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "ati.h" #include "atibus.h" #include "atichip.h" diff --git a/src/aticlock.c b/src/aticlock.c index e1201cb..5acd3f8 100644 --- a/src/aticlock.c +++ b/src/aticlock.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/aticlock.c,v 1.21 2003/04/23 21:51:27 tsi Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -192,6 +192,10 @@ * The Mach64's clock divider is not used in this case. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "ati.h" #include "atiadapter.h" #include "atichip.h" diff --git a/src/aticonfig.c b/src/aticonfig.c index 1a1e6b4..6a118a0 100644 --- a/src/aticonfig.c +++ b/src/aticonfig.c @@ -24,6 +24,10 @@ * Leif Delgass <ldelgass@retinalburn.net> */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "ati.h" #include "atiadapter.h" #include "atichip.h" diff --git a/src/aticonsole.c b/src/aticonsole.c index 6b2deeb..346bf44 100644 --- a/src/aticonsole.c +++ b/src/aticonsole.c @@ -25,6 +25,10 @@ * Leif Delgass <ldelgass@retinalburn.net> */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "ati.h" #include "atiadapter.h" #include "aticonsole.h" diff --git a/src/aticursor.c b/src/aticursor.c index a4837e4..0dfc9ac 100644 --- a/src/aticursor.c +++ b/src/aticursor.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/aticursor.c,v 1.4 2003/04/23 21:51:27 tsi Exp $ */ /* - * Copyright 2001 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 2001 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "atiadapter.h" #include "aticursor.h" #include "atimach64cursor.h" diff --git a/src/atidac.c b/src/atidac.c index bf3b403..7eb4515 100644 --- a/src/atidac.c +++ b/src/atidac.c @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "ati.h" #include "atidac.h" #include "atimach64io.h" diff --git a/src/atidecoder.c b/src/atidecoder.c index aee3741..7154a4d 100644 --- a/src/atidecoder.c +++ b/src/atidecoder.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atidecoder.c,v 1.1 2003/07/24 22:08:28 tsi Exp $ */ /* - * Copyright 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "atidecoder.h" /* diff --git a/src/atidga.c b/src/atidga.c index 9273f03..0f8fb8a 100644 --- a/src/atidga.c +++ b/src/atidga.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atidga.c,v 1.10 2003/04/23 21:51:27 tsi Exp $ */ /* - * Copyright 2000 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -21,6 +21,9 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #ifndef AVOID_DGA #include "ati.h" diff --git a/src/atidri.c b/src/atidri.c index 1cb97f0..09855eb 100644 --- a/src/atidri.c +++ b/src/atidri.c @@ -22,6 +22,9 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif /* * Authors: * Gareth Hughes <gareth@valinux.com> diff --git a/src/atidsp.c b/src/atidsp.c index 4cc2a05..d7a3b4b 100644 --- a/src/atidsp.c +++ b/src/atidsp.c @@ -1,6 +1,6 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atidsp.c,v 1.20 2003/04/23 21:51:28 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atidsp.c,v 1.21 2003/09/24 02:43:18 dawes Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -21,6 +21,9 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "ati.h" #include "atichip.h" #include "aticrtc.h" @@ -74,7 +77,7 @@ ATIDSPPreInit pATI->XCLKFeedbackDivider = ATIMach64GetPLLReg(PLL_MCLK_FB_DIV); xf86DrvMsgVerb(iScreen, X_INFO, 2, - "Engine XCLK %.3f MHz; Refresh rate code %d.\n", + "Engine XCLK %.3f MHz; Refresh rate code %ld.\n", ATIDivide(pATI->XCLKFeedbackDivider * pATI->ReferenceNumerator, pATI->XCLKReferenceDivider * pATI->ClockDescriptor.MaxM * pATI->ReferenceDenominator, 1 - pATI->XCLKPostDivider, 0) / diff --git a/src/atifillin.c b/src/atifillin.c index f474a58..ab36d56 100644 --- a/src/atifillin.c +++ b/src/atifillin.c @@ -5,6 +5,10 @@ * (c) 2004 Adam Jackson. Standard MIT license applies. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "atifillin.h" _X_EXPORT void ATIFillInScreenInfo(ScrnInfoPtr pScreenInfo) diff --git a/src/atii2c.c b/src/atii2c.c index b884e59..cb7bc04 100644 --- a/src/atii2c.c +++ b/src/atii2c.c @@ -1,6 +1,6 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atii2c.c,v 1.2 2003/08/29 21:07:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atii2c.c,v 1.3 2003/11/10 18:41:20 tsi Exp $ */ /* - * Copyright 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "atiadapter.h" #include "atii2c.h" #include "atiload.h" @@ -113,7 +117,7 @@ /* - * ATII2CAddress -- + * ATII2CAddress -- * * This function puts a Start bit and an 8-bit address on the I2C bus. */ diff --git a/src/atiident.c b/src/atiident.c index 1fb9dbb..563be3b 100644 --- a/src/atiident.c +++ b/src/atiident.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiident.c,v 1.11 2003/01/01 19:16:32 tsi Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "ati.h" #include "atiident.h" #include "atiutil.h" diff --git a/src/atiload.c b/src/atiload.c index 8ed14f1..7c901f6 100644 --- a/src/atiload.c +++ b/src/atiload.c @@ -24,6 +24,10 @@ * Leif Delgass <ldelgass@retinalburn.net> */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifdef XFree86LOADER #include "ati.h" diff --git a/src/atilock.c b/src/atilock.c index 8b40d6d..dcf1f84 100644 --- a/src/atilock.c +++ b/src/atilock.c @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "ati.h" #include "atiadapter.h" #include "atichip.h" diff --git a/src/atimach64.c b/src/atimach64.c index 619d413..95a9c07 100644 --- a/src/atimach64.c +++ b/src/atimach64.c @@ -49,6 +49,10 @@ * Leif Delgass <ldelgass@retinalburn.net> */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "ati.h" #include "atibus.h" #include "atichip.h" diff --git a/src/atimach64accel.c b/src/atimach64accel.c index 9a38cf0..1ecb13b 100644 --- a/src/atimach64accel.c +++ b/src/atimach64accel.c @@ -49,6 +49,10 @@ * Leif Delgass <ldelgass@retinalburn.net> */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "ati.h" #include "atichip.h" #include "atimach64accel.h" diff --git a/src/atimach64cursor.c b/src/atimach64cursor.c index 07d85cb..65a9dbf 100644 --- a/src/atimach64cursor.c +++ b/src/atimach64cursor.c @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "ati.h" #include "aticrtc.h" #include "atimach64accel.h" diff --git a/src/atimach64i2c.c b/src/atimach64i2c.c index 4cb565f..10636fa 100644 --- a/src/atimach64i2c.c +++ b/src/atimach64i2c.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64i2c.c,v 1.1 2003/07/24 22:08:28 tsi Exp $ */ /* - * Copyright 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "ati.h" #include "atichip.h" #include "atii2c.h" diff --git a/src/atimach64io.c b/src/atimach64io.c index e6a15b3..7a25ceb 100644 --- a/src/atimach64io.c +++ b/src/atimach64io.c @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "ati.h" #include "atichip.h" #include "atimach64io.h" diff --git a/src/atimach64xv.c b/src/atimach64xv.c index 120cb7d..cba6f99 100644 --- a/src/atimach64xv.c +++ b/src/atimach64xv.c @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "ati.h" #include "atiaccel.h" #include "atichip.h" diff --git a/src/atimisc.c b/src/atimisc.c index c6ba9fb..de118c0 100644 --- a/src/atimisc.c +++ b/src/atimisc.c @@ -24,6 +24,10 @@ * Leif Delgass <ldelgass@retinalburn.net> */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifdef XFree86LOADER #include "ati.h" diff --git a/src/atimode.c b/src/atimode.c index 63b0dcd..39e6005 100644 --- a/src/atimode.c +++ b/src/atimode.c @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "ati.h" #include "atiadapter.h" #include "atichip.h" diff --git a/src/atimodule.c b/src/atimodule.c index 9435f84..a3fe5dd 100644 --- a/src/atimodule.c +++ b/src/atimodule.c @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifdef XFree86LOADER #include "ati.h" diff --git a/src/atioption.c b/src/atioption.c index 2b97abf..6c862ed 100644 --- a/src/atioption.c +++ b/src/atioption.c @@ -24,6 +24,10 @@ * Leif Delgass <ldelgass@retinalburn.net> */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "atioption.h" #include "atiutil.h" diff --git a/src/atipreinit.c b/src/atipreinit.c index 0f36af3..fa5d50c 100644 --- a/src/atipreinit.c +++ b/src/atipreinit.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "ati.h" #include "atiadapter.h" #include "atiadjust.h" diff --git a/src/atiprint.c b/src/atiprint.c index 6b7f20d..f611e9a 100644 --- a/src/atiprint.c +++ b/src/atiprint.c @@ -1,6 +1,6 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiprint.c,v 1.26 2003/04/23 21:51:30 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiprint.c,v 1.28 2003/11/07 13:45:26 tsi Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "ati.h" #include "atiadapter.h" #include "atichip.h" @@ -184,7 +188,7 @@ ATIMach64PrintRegisters (IOValue & CRTC_EXT_DISP_EN)) *crtc = ATI_CRTC_MACH64; - xf86ErrorFVerb(4, " %08X", IOValue); + xf86ErrorFVerb(4, " %08lX", (unsigned long)IOValue); } } @@ -223,7 +227,7 @@ ATIMach64PrintRegisters (IOValue & CRTC_EXT_DISP_EN)) *crtc = ATI_CRTC_MACH64; - xf86ErrorFVerb(4, " %08X", IOValue); + xf86ErrorFVerb(4, " %08lX", (unsigned long)IOValue); } } @@ -685,7 +689,8 @@ ATIPrintRegisters { if (!(Index & 15)) xf86ErrorFVerb(4, "\n 0x%02X: ", Index); - xf86ErrorFVerb(4, " 0x%08X", pciReadLong(pPCI->tag, Index)); + xf86ErrorFVerb(4, " 0x%08lX", + (unsigned long)pciReadLong(pPCI->tag, Index)); } } @@ -695,7 +700,7 @@ ATIPrintRegisters if (pATI->pBank) xf86ErrorFVerb(4, "\n Banked aperture at 0x%0lX.", - pATI->pBank); + (unsigned long)pATI->pBank); else xf86ErrorFVerb(4, "\n No banked aperture."); @@ -712,18 +717,18 @@ ATIPrintRegisters #endif /* AVOID_CPIO */ { - xf86ErrorFVerb(4, "\n Linear aperture at 0x%0lX.\n", pATI->pMemory); + xf86ErrorFVerb(4, "\n Linear aperture at %p.\n", pATI->pMemory); } if (pATI->pBlock[0]) { - xf86ErrorFVerb(4, " Block 0 aperture at 0x%0lX.\n", pATI->pBlock[0]); + xf86ErrorFVerb(4, " Block 0 aperture at %p.\n", pATI->pBlock[0]); if (inr(CONFIG_CHIP_ID) == pATI->config_chip_id) xf86ErrorFVerb(4, " MMIO registers are correctly mapped.\n"); else xf86ErrorFVerb(4, " MMIO mapping is in error!\n"); if (pATI->pBlock[1]) - xf86ErrorFVerb(4, " Block 1 aperture at 0x%0lX.\n", + xf86ErrorFVerb(4, " Block 1 aperture at %p.\n", pATI->pBlock[1]); } else @@ -732,7 +737,7 @@ ATIPrintRegisters } if (pATI->pCursorImage) - xf86ErrorFVerb(4, " Hardware cursor image aperture at 0x%0lX.\n", + xf86ErrorFVerb(4, " Hardware cursor image aperture at %p.\n", pATI->pCursorImage); else xf86ErrorFVerb(4, " No hardware cursor image aperture.\n"); diff --git a/src/atiprobe.c b/src/atiprobe.c index c7dff49..5c347bb 100644 --- a/src/atiprobe.c +++ b/src/atiprobe.c @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "ati.h" #include "atiadapter.h" #include "atiadjust.h" diff --git a/src/atirgb514.c b/src/atirgb514.c index bedb794..c23c1df 100644 --- a/src/atirgb514.c +++ b/src/atirgb514.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atirgb514.c,v 1.4 2003/01/01 19:16:34 tsi Exp $ */ /* - * Copyright 2001 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 2001 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "ati.h" #include "aticrtc.h" #include "atimach64io.h" diff --git a/src/atiscreen.c b/src/atiscreen.c index 4846b3c..effeb66 100644 --- a/src/atiscreen.c +++ b/src/atiscreen.c @@ -26,6 +26,10 @@ * Leif Delgass <ldelgass@retinalburn.net> */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "ati.h" #include "atibus.h" #include "atichip.h" diff --git a/src/atituner.c b/src/atituner.c index 55dc7c2..22bb250 100644 --- a/src/atituner.c +++ b/src/atituner.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atituner.c,v 1.1 2003/07/24 22:08:28 tsi Exp $ */ /* - * Copyright 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "atituner.h" /* Temporary interface glitch */ diff --git a/src/atiutil.c b/src/atiutil.c index e7bb412..31d85bd 100644 --- a/src/atiutil.c +++ b/src/atiutil.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiutil.c,v 1.8 2003/01/01 19:16:34 tsi Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "atiutil.h" /* diff --git a/src/ativalid.c b/src/ativalid.c index 5379584..224f761 100644 --- a/src/ativalid.c +++ b/src/ativalid.c @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "atiadapter.h" #include "atichip.h" #include "aticrtc.h" diff --git a/src/ativga.c b/src/ativga.c index c093ff6..f9e57d1 100644 --- a/src/ativga.c +++ b/src/ativga.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "ati.h" #include "atiadapter.h" #include "atichip.h" diff --git a/src/ativgaio.c b/src/ativgaio.c index def54e2..f3b1e20 100644 --- a/src/ativgaio.c +++ b/src/ativgaio.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ativgaio.c,v 1.4 2003/01/01 19:16:34 tsi Exp $ */ /* - * Copyright 2000 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "ati.h" #include "atistruct.h" #include "ativgaio.h" diff --git a/src/atividmem.c b/src/atividmem.c index 1b86659..f43f32a 100644 --- a/src/atividmem.c +++ b/src/atividmem.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atividmem.c,v 1.15 2003/04/23 21:51:31 tsi Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "ati.h" #include "atiadapter.h" #include "atistruct.h" diff --git a/src/atiwonder.c b/src/atiwonder.c index 404aeaf..85111c2 100644 --- a/src/atiwonder.c +++ b/src/atiwonder.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiwonder.c,v 1.14 2003/01/01 19:16:35 tsi Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + /* * The ATI x8800 chips use special registers for their extended VGA features. * These registers are accessible through an index I/O port and a data I/O diff --git a/src/atiwonderio.c b/src/atiwonderio.c index 064e49e..853c58a 100644 --- a/src/atiwonderio.c +++ b/src/atiwonderio.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiwonderio.c,v 1.4 2003/01/01 19:16:35 tsi Exp $ */ /* - * Copyright 2000 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "ati.h" #include "atichip.h" #include "atiwonderio.h" diff --git a/src/atixv.c b/src/atixv.c index 417373a..0c59dad 100644 --- a/src/atixv.c +++ b/src/atixv.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atixv.c,v 1.5 2003/04/25 04:09:54 tsi Exp $ */ /* - * Copyright 2001 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 2001 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "atiadapter.h" #include "atimach64xv.h" #include "atistruct.h" diff --git a/src/r128_accel.c b/src/r128_accel.c index 08654bc..2bc4ae4 100644 --- a/src/r128_accel.c +++ b/src/r128_accel.c @@ -28,6 +28,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + /* * Authors: * Rickard E. Faith <faith@valinux.com> diff --git a/src/r128_cursor.c b/src/r128_cursor.c index 41f8f2d..d8e58aa 100644 --- a/src/r128_cursor.c +++ b/src/r128_cursor.c @@ -44,6 +44,10 @@ * */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + /* Driver data structures */ #include "r128.h" #include "r128_reg.h" diff --git a/src/r128_dga.c b/src/r128_dga.c index f0110b4..ec85480 100644 --- a/src/r128_dga.c +++ b/src/r128_dga.c @@ -5,6 +5,10 @@ * borrowing some code from the Chips and MGA drivers. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + /* Driver data structures */ #include "r128.h" #include "r128_probe.h" diff --git a/src/r128_dri.c b/src/r128_dri.c index f9d4be5..fb64aa0 100644 --- a/src/r128_dri.c +++ b/src/r128_dri.c @@ -28,6 +28,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + /* * Authors: * Kevin E. Martin <martin@valinux.com> diff --git a/src/r128_driver.c b/src/r128_driver.c index f7315e5..cff6a77 100644 --- a/src/r128_driver.c +++ b/src/r128_driver.c @@ -28,6 +28,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + /* * Authors: * Rickard E. Faith <faith@valinux.com> diff --git a/src/r128_misc.c b/src/r128_misc.c index c66d823..cd379b5 100644 --- a/src/r128_misc.c +++ b/src/r128_misc.c @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifdef XFree86LOADER #include "ativersion.h" diff --git a/src/r128_probe.c b/src/r128_probe.c index 85ba641..fa601ac 100644 --- a/src/r128_probe.c +++ b/src/r128_probe.c @@ -28,6 +28,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + /* * Authors: * Rickard E. Faith <faith@valinux.com> diff --git a/src/r128_video.c b/src/r128_video.c index 7304c9b..7f4912f 100644 --- a/src/r128_video.c +++ b/src/r128_video.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_video.c,v 1.30 2003/11/10 18:22:18 tsi Exp $ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "r128.h" #include "r128_reg.h" diff --git a/src/radeon_accel.c b/src/radeon_accel.c index 355cf5c..d89568d 100644 --- a/src/radeon_accel.c +++ b/src/radeon_accel.c @@ -27,6 +27,10 @@ * DEALINGS IN THE SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + /* * Authors: * Kevin E. Martin <martin@xfree86.org> diff --git a/src/radeon_accelfuncs.c b/src/radeon_accelfuncs.c index 872a717..c31e274 100644 --- a/src/radeon_accelfuncs.c +++ b/src/radeon_accelfuncs.c @@ -27,6 +27,10 @@ * DEALINGS IN THE SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + /* * Authors: * Kevin E. Martin <martin@xfree86.org> diff --git a/src/radeon_bios.c b/src/radeon_bios.c index d9f20a7..7c4f66d 100644 --- a/src/radeon_bios.c +++ b/src/radeon_bios.c @@ -26,6 +26,10 @@ * DEALINGS IN THE SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "xf86.h" #include "xf86_OSproc.h" diff --git a/src/radeon_cursor.c b/src/radeon_cursor.c index 4832399..c08550d 100644 --- a/src/radeon_cursor.c +++ b/src/radeon_cursor.c @@ -27,6 +27,10 @@ * DEALINGS IN THE SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + /* * Authors: * Kevin E. Martin <martin@xfree86.org> diff --git a/src/radeon_dga.c b/src/radeon_dga.c index 809c1a4..9c70d78 100644 --- a/src/radeon_dga.c +++ b/src/radeon_dga.c @@ -27,6 +27,10 @@ * DEALINGS IN THE SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + /* * Authors: * Kevin E. Martin <martin@xfree86.org> diff --git a/src/radeon_dri.c b/src/radeon_dri.c index ef82bac..11d5db5 100644 --- a/src/radeon_dri.c +++ b/src/radeon_dri.c @@ -27,6 +27,10 @@ * DEALINGS IN THE SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + /* * Authors: * Kevin E. Martin <martin@xfree86.org> diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 0733913..15a94e7 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -27,6 +27,10 @@ * DEALINGS IN THE SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + /* * Authors: * Kevin E. Martin <martin@xfree86.org> diff --git a/src/radeon_mergedfb.c b/src/radeon_mergedfb.c index 25088c3..c04577d 100644 --- a/src/radeon_mergedfb.c +++ b/src/radeon_mergedfb.c @@ -26,6 +26,10 @@ * DEALINGS IN THE SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + /* * Authors: * Alex Deucher <agd5f@yahoo.com> diff --git a/src/radeon_misc.c b/src/radeon_misc.c index 32253e6..39336e5 100644 --- a/src/radeon_misc.c +++ b/src/radeon_misc.c @@ -21,6 +21,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifdef XFree86LOADER #include "ativersion.h" diff --git a/src/radeon_mm_i2c.c b/src/radeon_mm_i2c.c index e60df51..95f05ef 100644 --- a/src/radeon_mm_i2c.c +++ b/src/radeon_mm_i2c.c @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "radeon.h" #include "radeon_reg.h" #include "radeon_macros.h" diff --git a/src/radeon_probe.c b/src/radeon_probe.c index fbbf09f..688c1c7 100644 --- a/src/radeon_probe.c +++ b/src/radeon_probe.c @@ -27,6 +27,10 @@ * DEALINGS IN THE SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + /* * Authors: * Kevin E. Martin <martin@xfree86.org> diff --git a/src/radeon_render.c b/src/radeon_render.c index f4cad67..32e6a3e 100644 --- a/src/radeon_render.c +++ b/src/radeon_render.c @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "dixstruct.h" diff --git a/src/radeon_video.c b/src/radeon_video.c index 0c4a5c1..2c2dffd 100644 --- a/src/radeon_video.c +++ b/src/radeon_video.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_video.c,v 1.30 2003/11/10 18:22:18 tsi Exp $ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "radeon.h" #include "radeon_reg.h" #include "radeon_macros.h" diff --git a/src/radeon_vip.c b/src/radeon_vip.c index d017ad7..a75a89d 100644 --- a/src/radeon_vip.c +++ b/src/radeon_vip.c @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "radeon.h" #include "radeon_reg.h" #include "radeon_macros.h" diff --git a/src/theatre.c b/src/theatre.c index 7c29e0b..7008ca3 100644 --- a/src/theatre.c +++ b/src/theatre.c @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "xf86.h" #include "generic_bus.h" #include "theatre.h" diff --git a/src/theatre200.c b/src/theatre200.c index 8da99c0..b41d36b 100644 --- a/src/theatre200.c +++ b/src/theatre200.c @@ -5,12 +5,19 @@ * License: GPL * * $Log$ + * Revision 1.3 2005/07/11 02:29:45 ajax + * Prep for modular builds by adding guarded #include "config.h" everywhere. + * * Revision 1.2 2005/07/01 22:43:11 daniels * Change all misc.h and os.h references to <X11/foo.h>. * * ************************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "xf86.h" #include "generic_bus.h" #include "xf86_ansic.h" diff --git a/src/theatre200_module.c b/src/theatre200_module.c index decc2da..2f13c09 100644 --- a/src/theatre200_module.c +++ b/src/theatre200_module.c @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "xf86Module.h" diff --git a/src/theatre_detect.c b/src/theatre_detect.c index 9336ec2..07e6d7c 100644 --- a/src/theatre_detect.c +++ b/src/theatre_detect.c @@ -5,12 +5,19 @@ * License: GPL * * $Log$ + * Revision 1.3 2005/07/11 02:29:45 ajax + * Prep for modular builds by adding guarded #include "config.h" everywhere. + * * Revision 1.2 2005/07/01 22:43:11 daniels * Change all misc.h and os.h references to <X11/foo.h>. * * ************************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "xf86.h" #include "generic_bus.h" #include "theatre.h" diff --git a/src/theatre_detect_module.c b/src/theatre_detect_module.c index e426d85..1b11043 100644 --- a/src/theatre_detect_module.c +++ b/src/theatre_detect_module.c @@ -2,6 +2,10 @@ * Created by Bogdan D. bogdand@users.sourceforge.net */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "xf86Module.h" static MODULESETUPPROTO(theatre_detectSetup); diff --git a/src/theatre_module.c b/src/theatre_module.c index 015ce2b..608b356 100644 --- a/src/theatre_module.c +++ b/src/theatre_module.c @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "xf86Module.h" |