From 43cd56b87ff1866778b43e494ab3dcbd9017c140 Mon Sep 17 00:00:00 2001
From: Kean Johnson <kean@armory.com>
Date: Fri, 10 Jun 2005 06:54:04 +0000
Subject: SCO port update for SCO OpenServer 5 and UnixWare 7. A few general
 cleanups     and bugs not specifically related to the port fixed along the
 way.

---
 src/ct_BlitMM.h  |  2 +-
 src/ct_Blitter.h |  2 +-
 src/ct_bank.c    |  9 ++++++---
 src/ct_dga.c     |  2 +-
 src/ct_regs.c    | 26 +++++++++-----------------
 src/ct_shadow.c  |  2 +-
 util/AsmMacros.h | 16 ++++++++--------
 util/dRegs.c     |  2 +-
 util/mRegs.c     |  2 +-
 util/modClock.c  |  2 +-
 10 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/src/ct_BlitMM.h b/src/ct_BlitMM.h
index 7660241..fb1c4e7 100644
--- a/src/ct_BlitMM.h
+++ b/src/ct_BlitMM.h
@@ -4,7 +4,7 @@
 
 
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_BlitMM.h,v 1.5 2002/11/25 14:04:58 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_BlitMM.h,v 1.3 1998/08/20 08:55:56 dawes Exp $ */
 
 /* Definitions for the Chips and Technology BitBLT engine communication. */
 /* These are done using Memory Mapped IO, of the registers */
diff --git a/src/ct_Blitter.h b/src/ct_Blitter.h
index ecb84f1..65b0989 100644
--- a/src/ct_Blitter.h
+++ b/src/ct_Blitter.h
@@ -4,7 +4,7 @@
 
 
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_Blitter.h,v 1.4 2002/01/25 21:55:58 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_Blitter.h,v 1.3 1998/08/29 05:43:06 dawes Exp $ */
 
 /* Definitions for the Chips and Technology BitBLT engine communication. */
 /* registers */
diff --git a/src/ct_bank.c b/src/ct_bank.c
index 1e478ee..3be2776 100644
--- a/src/ct_bank.c
+++ b/src/ct_bank.c
@@ -53,12 +53,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_dga.c b/src/ct_dga.c
index 3d0fe26..7cc3575 100644
--- a/src/ct_dga.c
+++ b/src/ct_dga.c
@@ -1,4 +1,4 @@
-/* $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 $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/ct_regs.c b/src/ct_regs.c
index 201ac5c..b7a7199 100644
--- a/src/ct_regs.c
+++ b/src/ct_regs.c
@@ -19,7 +19,7 @@
  * 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 $ */
 
 /*
  * The functions in this file are used to read/write the C&T extension register
@@ -361,17 +361,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 +377,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 +405,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 +416,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..98bdb8f 100644
--- a/src/ct_shadow.c
+++ b/src/ct_shadow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_shadow.c,v 1.1 2000/02/08 13:13:13 eich Exp $ */
+/* $XFree86: Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/util/AsmMacros.h b/util/AsmMacros.h
index feb5ce0..98e0b04 100644
--- a/util/AsmMacros.h
+++ b/util/AsmMacros.h
@@ -57,7 +57,7 @@
  *
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/AsmMacros.h,v 1.1 2001/11/16 21:13:34 tsi Exp $ */
+/* $XFree86$ */
 
 #if defined(__GNUC__)
 #if defined(linux) && (defined(__alpha__) || defined(__ia64__))
@@ -438,13 +438,13 @@ void outl(U16_t, U32_t);
 #   define __USLC__
 #  endif
 # endif
-#ifndef SCO325
-# include <sys/inline.h>
-#else
-# include "../common/scoasm.h"
-#endif
-#define intr_disable() asm("cli")
-#define intr_enable()  asm("sti")
+# ifndef __SCO__
+#  include <sys/inline.h>
+# else
+#  include "../common/scoasm.h"
+# endif
+# define intr_disable() asm("cli")
+# define intr_enable()  asm("sti")
 
 #endif /* _MINIX and _ACK */
 #endif /* __GNUC__ */
diff --git a/util/dRegs.c b/util/dRegs.c
index 0c8ee62..51a384b 100644
--- a/util/dRegs.c
+++ b/util/dRegs.c
@@ -4,7 +4,7 @@
 
 
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/dRegs.c,v 1.9 2001/11/16 21:13:34 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/dRegs.c,v 1.8 2001/10/01 13:44:04 eich Exp $ */
 
 #ifdef __NetBSD__
 #  include <sys/types.h>
diff --git a/util/mRegs.c b/util/mRegs.c
index 4d8da11..b1688de 100644
--- a/util/mRegs.c
+++ b/util/mRegs.c
@@ -4,7 +4,7 @@
 
 
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/mRegs.c,v 1.6 2001/11/16 21:13:34 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/mRegs.c,v 1.5 2000/10/23 12:10:13 alanh Exp $ */
 
 #ifdef __NetBSD__
 #  include <sys/types.h>
diff --git a/util/modClock.c b/util/modClock.c
index cce4f84..48a1961 100644
--- a/util/modClock.c
+++ b/util/modClock.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/modClock.c,v 1.6 2001/11/16 21:13:34 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/modClock.c,v 1.5 2001/05/09 19:57:06 dbateman Exp $ */
 
 #ifdef __NetBSD__
 #  include <sys/types.h>
-- 
cgit v1.2.3