diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-11-29 06:39:12 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-11-29 06:39:12 -0200 |
| commit | a0d4a4755c528c924f23000f83c5712f65593087 (patch) | |
| tree | 5656259e7d82275fbc5aecf59cd56e7ac9c71aac | |
| parent | 97e2d12548921d92b6dc2dcce8abee48f25981d2 (diff) | |
Make ISA support optional.
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/generic.c | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index be83b67..a22236f 100644 --- a/configure.ac +++ b/configure.ac @@ -66,6 +66,14 @@ AC_CHECK_HEADER(xf1bpp.h,[AC_DEFINE(HAVE_XF1BPP, 1, [Have 1bpp support])],[]) AC_CHECK_HEADER(xf4bpp.h,[AC_DEFINE(HAVE_XF4BPP, 1, [Have 4bpp support])],[]) CPPFLAGS="$SAVE_CPPFLAGS" +SAVE_CFLAGS="$CFLAGS" +CFLAGS="$XORG_CFLAGS" +AC_CHECK_DECL(xf86ConfigIsaEntity, + [AC_DEFINE(HAVE_ISA, 1, [Have ISA support])], + [], + [#include "xf86.h"]) +CFLAGS="$SAVE_CFLAGS" + if test "x$XSERVER_LIBPCIACCESS" = xyes; then PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0]) XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS" diff --git a/src/generic.c b/src/generic.c index 8fd788f..cda0e71 100644 --- a/src/generic.c +++ b/src/generic.c @@ -120,7 +120,9 @@ static void GenericAdjustFrame(int, int, int, int); static Bool GenericEnterVT(int, int); static void GenericLeaveVT(int, int); static void GenericFreeScreen(int, int); +#ifdef HAVE_ISA static int VGAFindIsaDevice(GDevPtr dev); +#endif #ifdef SPECIAL_FB_BYTE_ACCESS static Bool GenericMapMem(ScrnInfoPtr scrp); #endif @@ -303,11 +305,13 @@ static PciChipsets GenericPCIchipsets[] = }; #endif +#ifdef HAVE_ISA static IsaChipsets GenericISAchipsets[] = { {CHIP_VGA_GENERIC, RES_EXCLUSIVE_VGA}, {-1, 0} }; +#endif static void GenericIdentify(int flags) @@ -419,6 +423,7 @@ GenericProbe(DriverPtr drv, int flags) } #endif +#ifdef HAVE_ISA /* Isa Bus */ numUsed = xf86MatchIsaInstances(VGA_NAME, GenericChipsets, GenericISAchipsets, drv, @@ -454,11 +459,13 @@ GenericProbe(DriverPtr drv, int flags) xfree(usedChips); } } +#endif xfree(devSections); return foundScreen; } +#ifdef HAVE_ISA static int VGAFindIsaDevice(GDevPtr dev) { @@ -484,6 +491,7 @@ VGAFindIsaDevice(GDevPtr dev) return (int)CHIP_VGA_GENERIC; } +#endif static GenericPtr GenericGetRec(ScrnInfoPtr pScreenInfo) |