[PATCH video-vesa] config: remove ISA bus code, as support is removed from xserver

[Gaetan Nadon]

Remove declaration check and AM conditional HAVE_ISA along
with the code conditionnaly included.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 configure.ac |    8 -------
 src/vesa.c   |   59 ----------------------------------------------------------
 2 files changed, 0 insertions(+), 67 deletions(-)

diff --git a/configure.ac b/configure.ac
index 51d9d33..ee7d5b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,14 +67,6 @@ AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
 
 save_CFLAGS="$CFLAGS"
 CFLAGS="$XORG_CFLAGS"
-AC_CHECK_DECL(xf86ConfigIsaEntity,
-	      [AC_DEFINE(HAVE_ISA, 1, [Have ISA support])],
-	      [],
-	      [#include "xf86.h"])
-CFLAGS="$save_CFLAGS"
-
-save_CFLAGS="$CFLAGS"
-CFLAGS="$XORG_CFLAGS"
 AC_CHECK_DECL(VBEReadPanelID,
 	      [AC_DEFINE(HAVE_PANELID, 1, [Have VBE PanelID call])],
 	      [],
diff --git a/src/vesa.c b/src/vesa.c
index 034a019..2ffbca5 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -94,9 +94,6 @@ VESADisplayPowerManagementSet(ScrnInfoPtr pScrn, int mode,
                 int flags);
 
 /* locally used functions */
-#ifdef HAVE_ISA
-static int VESAFindIsaDevice(GDevPtr dev);
-#endif
 static Bool VESAMapVidMem(ScrnInfoPtr pScrn);
 static void VESAUnmapVidMem(ScrnInfoPtr pScrn);
 static int VESABankSwitch(ScreenPtr pScreen, unsigned int iBank);
@@ -175,13 +172,6 @@ static PciChipsets VESAPCIchipsets[] = {
 };
 #endif
 
-#ifdef HAVE_ISA
-static IsaChipsets VESAISAchipsets[] = {
-  {CHIP_VESA_GENERIC, RES_EXCLUSIVE_VGA},
-  {-1,		0 }
-};
-#endif
-
 
 /* 
  * This contains the functions needed by the server after loading the
@@ -485,60 +475,11 @@ VESAProbe(DriverPtr drv, int flags)
     }
 #endif
 
-#ifdef HAVE_ISA
-    /* Isa Bus */
-    numUsed = xf86MatchIsaInstances(VESA_NAME,VESAChipsets,
-				    VESAISAchipsets, drv,
-				    VESAFindIsaDevice, devSections,
-				    numDevSections, &usedChips);
-    if(numUsed > 0) {
-	if (flags & PROBE_DETECT)
-	    foundScreen = TRUE;
-	else for (i = 0; i < numUsed; i++) {
-	    ScrnInfoPtr pScrn = NULL;
-	    if ((pScrn = xf86ConfigIsaEntity(pScrn, 0,usedChips[i],
-					     VESAISAchipsets, NULL,
-					     NULL, NULL, NULL, NULL))) {
-		VESAInitScrn(pScrn);
-		foundScreen = TRUE;
-	    }
-	}
-	xfree(usedChips);
-    }
-#endif
-
     xfree(devSections);
 
     return (foundScreen);
 }
 
-#ifdef HAVE_ISA
-static int
-VESAFindIsaDevice(GDevPtr dev)
-{
-#ifndef PC98_EGC
-    CARD16 GenericIOBase = VGAHW_GET_IOBASE();
-    CARD8 CurrentValue, TestValue;
-
-    /* There's no need to unlock VGA CRTC registers here */
-
-    /* VGA has one more read/write attribute register than EGA */
-    (void) inb(GenericIOBase + VGA_IN_STAT_1_OFFSET);  /* Reset flip-flop */
-    outb(VGA_ATTR_INDEX, 0x14 | 0x20);
-    CurrentValue = inb(VGA_ATTR_DATA_R);
-    outb(VGA_ATTR_DATA_W, CurrentValue ^ 0x0F);
-    outb(VGA_ATTR_INDEX, 0x14 | 0x20);
-    TestValue = inb(VGA_ATTR_DATA_R);
-    outb(VGA_ATTR_DATA_R, CurrentValue);
-
-    /* Quit now if no VGA is present */
-    if ((CurrentValue ^ 0x0F) != TestValue)
-      return -1;
-#endif
-    return (int)CHIP_VESA_GENERIC;
-}
-#endif
-
 static void
 VESAFreeRec(ScrnInfoPtr pScrn)
 {
-- 
1.6.0.4