diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-03-07 11:35:52 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-03-07 11:35:52 +0000 |
| commit | f73759d7a72939a5921c9ddd9a6137d97f0a93df (patch) | |
| tree | 2e18a1058cbb2857ebe77081418777f55e274765 /driver | |
| parent | 88e39705fd15eac31e7ec2a0c20a76ef68e5f5a0 (diff) | |
Update to xf86-video-neomagic 1.2.2
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/xf86-video-neomagic/configure.ac | 10 | ||||
| -rw-r--r-- | driver/xf86-video-neomagic/src/neo_driver.c | 12 |
2 files changed, 16 insertions, 6 deletions
diff --git a/driver/xf86-video-neomagic/configure.ac b/driver/xf86-video-neomagic/configure.ac index 97fd8f2c6..2f7843a53 100644 --- a/driver/xf86-video-neomagic/configure.ac +++ b/driver/xf86-video-neomagic/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-neomagic], - 1.2.1, + 1.2.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-neomagic) @@ -59,6 +59,14 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) +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 libraries. SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" diff --git a/driver/xf86-video-neomagic/src/neo_driver.c b/driver/xf86-video-neomagic/src/neo_driver.c index 31e47f022..f4726011a 100644 --- a/driver/xf86-video-neomagic/src/neo_driver.c +++ b/driver/xf86-video-neomagic/src/neo_driver.c @@ -62,9 +62,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. /* Drivers that need to access the PCI config space directly need this */ #include "xf86Pci.h" -/* This is used for module versioning */ -#include "xf86Version.h" - /* All drivers using the vgahw module need this */ #include "vgaHW.h" @@ -325,6 +322,7 @@ static PciChipsets NEOPCIchipsets[] = { { -1, -1, RES_UNDEFINED} }; +#ifdef HAVE_ISA static IsaChipsets NEOISAchipsets[] = { { NM2070, RES_EXCLUSIVE_VGA }, { NM2090, RES_EXCLUSIVE_VGA }, @@ -334,6 +332,7 @@ static IsaChipsets NEOISAchipsets[] = { { NM2200, RES_EXCLUSIVE_VGA }, { -1, RES_UNDEFINED } }; +#endif /* The options supported by the Neomagic Driver */ typedef enum { @@ -646,7 +645,8 @@ NEOProbe(DriverPtr drv, int flags) xfree(usedChips); } } - + +#ifdef HAVE_ISA /* Isa Bus */ numUsed = xf86MatchIsaInstances(NEO_NAME,NEOChipsets,NEOISAchipsets, @@ -677,11 +677,13 @@ NEOProbe(DriverPtr drv, int flags) } xfree(usedChips); } +#endif xfree(devSections); return foundScreen; } +#ifdef HAVE_ISA static int neoFindIsaDevice(GDevPtr dev) { @@ -708,7 +710,7 @@ neoFindIsaDevice(GDevPtr dev) return -1; } } - +#endif /* Mandatory */ Bool |