summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/ct_accel.c4
-rw-r--r--src/ct_bank.c14
-rw-r--r--src/ct_cursor.c4
-rw-r--r--src/ct_ddc.c4
-rw-r--r--src/ct_dga.c6
-rw-r--r--src/ct_driver.c4
-rw-r--r--src/ct_regs.c30
-rw-r--r--src/ct_shadow.c6
-rw-r--r--src/ct_video.c4
9 files changed, 54 insertions, 22 deletions
diff --git a/src/ct_accel.c b/src/ct_accel.c
index 65ffef5..a8bf3e8 100644
--- a/src/ct_accel.c
+++ b/src/ct_accel.c
@@ -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
diff --git a/src/ct_bank.c b/src/ct_bank.c
index 1e478ee..b5be768 100644
--- a/src/ct_bank.c
+++ b/src/ct_bank.c
@@ -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)
diff --git a/src/ct_cursor.c b/src/ct_cursor.c
index f88a335..2d0a8af 100644
--- a/src/ct_cursor.c
+++ b/src/ct_cursor.c
@@ -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"
diff --git a/src/ct_ddc.c b/src/ct_ddc.c
index 693f325..4008e79 100644
--- a/src/ct_ddc.c
+++ b/src/ct_ddc.c
@@ -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"
diff --git a/src/ct_dga.c b/src/ct_dga.c
index 3d0fe26..c271a1b 100644
--- a/src/ct_dga.c
+++ b/src/ct_dga.c
@@ -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"
diff --git a/src/ct_driver.c b/src/ct_driver.c
index 7254753..d0bf372 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -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"
diff --git a/src/ct_regs.c b/src/ct_regs.c
index 201ac5c..56894c8 100644
--- a/src/ct_regs.c
+++ b/src/ct_regs.c
@@ -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;
}
diff --git a/src/ct_shadow.c b/src/ct_shadow.c
index ecbb642..d610ae1 100644
--- a/src/ct_shadow.c
+++ b/src/ct_shadow.c
@@ -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"
diff --git a/src/ct_video.c b/src/ct_video.c
index 471f370..4a1f1b4 100644
--- a/src/ct_video.c
+++ b/src/ct_video.c
@@ -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"
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-21 17:06:38 +0000