Prep for modular builds by adding guarded #include "config.h" everywhere.

This commit is contained in:
Adam Jackson
2005-07-11 02:29:46 +00:00
parent e3cc3456c1
commit 8826d34f0b
9 changed files with 54 additions and 22 deletions

View File

@@ -22,6 +22,10 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
/*
* When monochrome tiles/stipples are cached on the HiQV chipsets the
* pitch of the monochrome data is the displayWidth. The HiQV manuals

View File

@@ -28,6 +28,11 @@
* negligence, tort, under statute, in equity, at law or otherwise, even if
* advised of the possibility of such damage.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#define PSZ 8
/*
@@ -53,12 +58,15 @@
/* Driver specific headers */
#include "ct_driver.h"
#ifdef __arm32__
/*#include <machine/sysarch.h>*/
#if defined(__arm32__) && defined(__NetBSD__)
#include <machine/sysarch.h>
#define arm32_drain_writebuf() sysarch(1, 0)
#define ChipsBank(pScreen) CHIPSPTR(xf86Screens[pScreen->myNum])->Bank
#elif defined(__arm32__)
#define arm32_drain_writebuf()
#endif
#define ChipsBank(pScreen) CHIPSPTR(xf86Screens[pScreen->myNum])->Bank
#ifdef DIRECT_REGISTER_ACCESS
int
CHIPSSetRead(ScreenPtr pScreen, int bank)

View File

@@ -26,6 +26,10 @@
* Modified for Chips and Technologies by David Bateman <dbateman@eng.uts.edu.au>
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
/* All drivers should typically include these */
#include "xf86.h"
#include "xf86_OSproc.h"

View File

@@ -1,5 +1,9 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_ddc.c,v 1.8 2001/05/09 19:57:04 dbateman Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
/* All drivers should typically include these */
#include "xf86.h"
#include "xf86_OSproc.h"

View File

@@ -1,4 +1,8 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_dga.c,v 1.5 2002/11/25 14:04:58 eich Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_dga.c,v 1.3tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "xf86.h"
#include "xf86_OSproc.h"

View File

@@ -70,6 +70,10 @@
* advised of the possibility of such damage.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
/* All drivers should typically include these */
#include "xf86.h"
#include "xf86_OSproc.h"

View File

@@ -19,7 +19,11 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_regs.c,v 1.8 2002/01/25 21:56:00 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_regs.c,v 1.8tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
/*
* The functions in this file are used to read/write the C&T extension register
@@ -361,17 +365,15 @@ chipsMmioReadSeq(vgaHWPtr hwp, CARD8 index)
static void
chipsMmioWriteAttr(vgaHWPtr hwp, CARD8 index, CARD8 value)
{
CARD8 tmp;
if (hwp->paletteEnabled)
index &= ~0x20;
else
index |= 0x20;
if (hwp->IOBase == VGA_IOBASE_MONO)
tmp = minb(CHIPS_MMIO_MONO_STAT_1);
(void) minb(CHIPS_MMIO_MONO_STAT_1);
else
tmp = minb(CHIPS_MMIO_COLOR_STAT_1);
(void) minb(CHIPS_MMIO_COLOR_STAT_1);
moutb(CHIPS_MMIO_ATTR_INDEX, index);
moutb(CHIPS_MMIO_ATTR_DATA_W, value);
}
@@ -379,17 +381,15 @@ chipsMmioWriteAttr(vgaHWPtr hwp, CARD8 index, CARD8 value)
static CARD8
chipsMmioReadAttr(vgaHWPtr hwp, CARD8 index)
{
CARD8 tmp;
if (hwp->paletteEnabled)
index &= ~0x20;
else
index |= 0x20;
if (hwp->IOBase == VGA_IOBASE_MONO)
tmp = minb(CHIPS_MMIO_MONO_STAT_1);
(void) minb(CHIPS_MMIO_MONO_STAT_1);
else
tmp = minb(CHIPS_MMIO_COLOR_STAT_1);
(void) minb(CHIPS_MMIO_COLOR_STAT_1);
moutb(CHIPS_MMIO_ATTR_INDEX, index);
return minb(CHIPS_MMIO_ATTR_DATA_R);
}
@@ -409,12 +409,10 @@ chipsMmioReadMiscOut(vgaHWPtr hwp)
static void
chipsMmioEnablePalette(vgaHWPtr hwp)
{
CARD8 tmp;
if (hwp->IOBase == VGA_IOBASE_MONO)
tmp = minb(CHIPS_MMIO_MONO_STAT_1);
(void) minb(CHIPS_MMIO_MONO_STAT_1);
else
tmp = minb(CHIPS_MMIO_COLOR_STAT_1);
(void) minb(CHIPS_MMIO_COLOR_STAT_1);
moutb(CHIPS_MMIO_ATTR_INDEX, 0x00);
hwp->paletteEnabled = TRUE;
}
@@ -422,12 +420,10 @@ chipsMmioEnablePalette(vgaHWPtr hwp)
static void
chipsMmioDisablePalette(vgaHWPtr hwp)
{
CARD8 tmp;
if (hwp->IOBase == VGA_IOBASE_MONO)
tmp = minb(CHIPS_MMIO_MONO_STAT_1);
(void) minb(CHIPS_MMIO_MONO_STAT_1);
else
tmp = minb(CHIPS_MMIO_COLOR_STAT_1);
(void) minb(CHIPS_MMIO_COLOR_STAT_1);
moutb(CHIPS_MMIO_ATTR_INDEX, 0x20);
hwp->paletteEnabled = FALSE;
}

View File

@@ -1,4 +1,8 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_shadow.c,v 1.1 2000/02/08 13:13:13 eich Exp $ */
/* $XFree86: Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "xf86.h"
#include "xf86_OSproc.h"

View File

@@ -1,5 +1,9 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_video.c,v 1.16tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86Resources.h"