update to xf86-video-chips 1.2.1

4 files changed, 19 insertions, 19 deletions

diff --git a/driver/xf86-video-chips/configure.ac b/driver/xf86-video-chips/configure.ac
index 776f2501b..b4120a313 100644
--- a/driver/xf86-video-chips/configure.ac
+++ b/driver/xf86-video-chips/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-chips],
-        1.2.0,
+        1.2.1,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-chips)
 
@@ -73,6 +73,14 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
 fi
 AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
 
+save_CFLAGS="$CFLAGS"
+CFLAGS="$XORG_CFLAGS"
+AC_CHECK_DECL(xf86ConfigIsaEntity,
+	      [AC_DEFINE(HAVE_ISA, 1, [Have ISA support])],
+	      [],
+	      [#include "xf86.h"])
+CFLAGS="$save_CFLAGS"
+
 # Checks for header files.
 AC_HEADER_STDC
 
diff --git a/driver/xf86-video-chips/src/ct_driver.c b/driver/xf86-video-chips/src/ct_driver.c
index 725fcab20..4bc5e68ea 100644
--- a/driver/xf86-video-chips/src/ct_driver.c
+++ b/driver/xf86-video-chips/src/ct_driver.c
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 1993 by Jon Block <block@frc.com>
  * Modified by Mike Hollick <hollick@graphics.cis.upenn.edu>
@@ -86,9 +85,6 @@
 /* Drivers that need to access the PCI config space directly need this */
 #include "xf86Pci.h"
 
-/* This is used for module versioning */
-#include "xf86Version.h"
-
 /* Standard resources are defined here */
 #include "xf86Resources.h"
 
@@ -558,6 +554,7 @@ static PciChipsets CHIPSPCIchipsets[] = {
     { -1,	     -1,	     RES_UNDEFINED}
 };
 
+#ifdef HAVE_ISA
 static IsaChipsets CHIPSISAchipsets[] = {
     { CHIPS_CT65520,		RES_EXCLUSIVE_VGA },
     { CHIPS_CT65525,		RES_EXCLUSIVE_VGA },
@@ -577,6 +574,7 @@ static IsaChipsets CHIPSISAchipsets[] = {
     { CHIPS_CT64300,		RES_EXCLUSIVE_VGA },
     { -1,			RES_UNDEFINED }
 };
+#endif
 
 /* The options supported by the Chips and Technologies Driver */
 typedef enum {
@@ -1043,7 +1041,8 @@ CHIPSProbe(DriverPtr drv, int flags)
 	    xfree(usedChips);
 	}
     }
-    
+
+#ifdef HAVE_ISA 
     /* Isa Bus */
     numUsed = xf86MatchIsaInstances(CHIPS_NAME,CHIPSChipsets,CHIPSISAchipsets,
 				    drv,chipsFindIsaDevice,devSections,
@@ -1057,7 +1056,7 @@ CHIPSProbe(DriverPtr drv, int flags)
 						   usedChips[i],
 						   CHIPSISAchipsets,NULL,
 						   NULL,NULL,NULL,NULL))) {
-		pScrn->driverVersion = VERSION;
+		pScrn->driverVersion = CHIPS_VERSION;
 		pScrn->driverName    = CHIPS_DRIVER_NAME;
 		pScrn->name          = CHIPS_NAME;
 		pScrn->Probe         = CHIPSProbe;
@@ -1074,12 +1073,14 @@ CHIPSProbe(DriverPtr drv, int flags)
 	    xfree(usedChips);
 	}
     }
+#endif
     
     xfree(devSections);
     return foundScreen;
 }
 #endif
 
+#ifdef HAVE_ISA
 static int
 chipsFindIsaDevice(GDevPtr dev)
 {
@@ -1163,6 +1164,7 @@ chipsFindIsaDevice(GDevPtr dev)
     }
     return found;
 }
+#endif
 
 /* Mandatory */
 Bool
@@ -1542,11 +1544,7 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
 
     hwp = VGAHWPTR(pScrn);
     vgaHWGetIOBase(hwp);
-#if XF86_VERSION_CURRENT > XF86_VERSION_NUMERIC(4,1,0,0,0)
     cPtr->PIOBase = hwp->PIOOffset;
-#else
-     cPtr->PIOBase = 0 ; /* for old version the IO offset is global */
-#endif
     /*
      * Must allow ensure that storage for the 2nd set of vga registers is
      * allocated for dual channel cards
diff --git a/driver/xf86-video-chips/src/ct_driver.h b/driver/xf86-video-chips/src/ct_driver.h
index 351e8135f..d8ce2281b 100644
--- a/driver/xf86-video-chips/src/ct_driver.h
+++ b/driver/xf86-video-chips/src/ct_driver.h
@@ -36,6 +36,7 @@
 #include "xf86xv.h"
 #include "vgaHW.h"
 #include <string.h>
+#include <unistd.h>
 
 /* Supported chipsets */
 typedef enum {
@@ -274,11 +275,7 @@ typedef struct _CHIPSRec {
     PCITAG		PciTag;
     int			Chipset;
     EntityInfoPtr       pEnt;
-#if XF86_VERSION_CURRENT > XF86_VERSION_NUMERIC(4,1,0,0,0)
-      IOADDRESS		PIOBase;
-#else
-    int			PIOBase; /* unused variable : here for compatibility reason with newer version */
-#endif
+    IOADDRESS		PIOBase;
     CARD32		IOAddress;
     unsigned long	FbAddress;
     unsigned int	IOBase;
diff --git a/driver/xf86-video-chips/src/ct_regs.c b/driver/xf86-video-chips/src/ct_regs.c
index e2f62df7d..e9a4c20d9 100644
--- a/driver/xf86-video-chips/src/ct_regs.c
+++ b/driver/xf86-video-chips/src/ct_regs.c
@@ -64,9 +64,6 @@
 /* Drivers that need to access the PCI config space directly need this */
 #include "xf86Pci.h"
 
-/* This is used for module versioning */
-#include "xf86Version.h"
-
 /* Driver specific headers */
 #include "ct_driver.h"