configure.ac | 10 +++++++++- src/ct_driver.c | 18 ++++++++---------- src/ct_driver.h | 7 ++----- src/ct_regs.c | 3 --- 4 files changed, 19 insertions(+), 19 deletions(-)
New commits: commit 6380f6ac5924397c0be27198e9779971eb9b0086 Author: Dave Airlie <airl...@redhat.com> Date: Mon Dec 22 14:27:11 2008 +1000 chips 1.2.1 diff --git a/configure.ac b/configure.ac index 7dc6f0b..b4120a3 100644 --- a/configure.ac +++ b/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) commit d791ee9897108fe301e39f7daba145130d78939d Author: Adam Jackson <a...@redhat.com> Date: Sun Nov 23 17:48:00 2008 -0500 Make ISA optional diff --git a/configure.ac b/configure.ac index 776f250..7dc6f0b 100644 --- a/configure.ac +++ b/configure.ac @@ -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/src/ct_driver.c b/src/ct_driver.c index 1c791c8..4bc5e68 100644 --- a/src/ct_driver.c +++ b/src/ct_driver.c @@ -1,4 +1,3 @@ - /* * Copyright 1993 by Jon Block <bl...@frc.com> * Modified by Mike Hollick <holl...@graphics.cis.upenn.edu> @@ -555,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 }, @@ -574,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 { @@ -1040,7 +1041,8 @@ CHIPSProbe(DriverPtr drv, int flags) xfree(usedChips); } } - + +#ifdef HAVE_ISA /* Isa Bus */ numUsed = xf86MatchIsaInstances(CHIPS_NAME,CHIPSChipsets,CHIPSISAchipsets, drv,chipsFindIsaDevice,devSections, @@ -1071,12 +1073,14 @@ CHIPSProbe(DriverPtr drv, int flags) xfree(usedChips); } } +#endif xfree(devSections); return foundScreen; } #endif +#ifdef HAVE_ISA static int chipsFindIsaDevice(GDevPtr dev) { @@ -1160,6 +1164,7 @@ chipsFindIsaDevice(GDevPtr dev) } return found; } +#endif /* Mandatory */ Bool commit 328be647a21f0da7b7beacd56398d78072eeee6b Author: Adam Jackson <a...@redhat.com> Date: Fri Aug 15 14:04:11 2008 -0400 Uninclude xf86Version.h, remove some dead code. diff --git a/src/ct_driver.c b/src/ct_driver.c index f88bef2..1c791c8 100644 --- a/src/ct_driver.c +++ b/src/ct_driver.c @@ -86,9 +86,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" @@ -1542,11 +1539,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/src/ct_driver.h b/src/ct_driver.h index d2fa6f7..d8ce228 100644 --- a/src/ct_driver.h +++ b/src/ct_driver.h @@ -275,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/src/ct_regs.c b/src/ct_regs.c index e2f62df..e9a4c20 100644 --- a/src/ct_regs.c +++ b/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" commit fe599dbf5178a10b0021c1f33bed528ce3199af9 Author: Julien Cristau <jcris...@debian.org> Date: Mon Jun 2 21:32:17 2008 +0200 Compiler warning fixes Include <unistd.h> for usleep(), and s/VERSION/CHIPS_&/ in one place where it had been missed. diff --git a/src/ct_driver.c b/src/ct_driver.c index 725fcab..f88bef2 100644 --- a/src/ct_driver.c +++ b/src/ct_driver.c @@ -1057,7 +1057,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; diff --git a/src/ct_driver.h b/src/ct_driver.h index 351e813..d2fa6f7 100644 --- a/src/ct_driver.h +++ b/src/ct_driver.h @@ -36,6 +36,7 @@ #include "xf86xv.h" #include "vgaHW.h" #include <string.h> +#include <unistd.h> /* Supported chipsets */ typedef enum { -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org