[PATCH video-neomagic] config: remove ISA bus code, as support is removed from xserver
Gaetan Nadon
memsize at videotron.ca
Thu Jul 1 12:26:15 PDT 2010
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/neo_driver.c | 73 ------------------------------------------------------
2 files changed, 0 insertions(+), 81 deletions(-)
diff --git a/configure.ac b/configure.ac
index a19183b..d7b6e69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,14 +64,6 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
-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/src/neo_driver.c b/src/neo_driver.c
index 9b40943..3318167 100644
--- a/src/neo_driver.c
+++ b/src/neo_driver.c
@@ -318,18 +318,6 @@ static PciChipsets NEOPCIchipsets[] = {
{ -1, -1, RES_UNDEFINED}
};
-#ifdef HAVE_ISA
-static IsaChipsets NEOISAchipsets[] = {
- { NM2070, RES_EXCLUSIVE_VGA },
- { NM2090, RES_EXCLUSIVE_VGA },
- { NM2093, RES_EXCLUSIVE_VGA },
- { NM2097, RES_EXCLUSIVE_VGA },
- { NM2160, RES_EXCLUSIVE_VGA },
- { NM2200, RES_EXCLUSIVE_VGA },
- { -1, RES_UNDEFINED }
-};
-#endif
-
/* The options supported by the Neomagic Driver */
typedef enum {
OPTION_NOACCEL,
@@ -555,71 +543,10 @@ NEOProbe(DriverPtr drv, int flags)
}
}
-#ifdef HAVE_ISA
- /* Isa Bus */
-
- numUsed = xf86MatchIsaInstances(NEO_NAME,NEOChipsets,NEOISAchipsets,
- drv,neoFindIsaDevice,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],
- NEOISAchipsets, NULL, NULL,
- NULL, NULL, NULL))) {
- pScrn->driverVersion = NEO_VERSION;
- pScrn->driverName = NEO_DRIVER_NAME;
- pScrn->name = NEO_NAME;
- pScrn->Probe = NEOProbe;
- pScrn->PreInit = NEOPreInit;
- pScrn->ScreenInit = NEOScreenInit;
- pScrn->SwitchMode = NEOSwitchMode;
- pScrn->AdjustFrame = NEOAdjustFrame;
- pScrn->EnterVT = NEOEnterVT;
- pScrn->LeaveVT = NEOLeaveVT;
- pScrn->FreeScreen = NEOFreeScreen;
- pScrn->ValidMode = NEOValidMode;
- foundScreen = TRUE;
- }
- }
- xfree(usedChips);
- }
-#endif
-
xfree(devSections);
return foundScreen;
}
-#ifdef HAVE_ISA
-static int
-neoFindIsaDevice(GDevPtr dev)
-{
- unsigned int vgaIOBase;
- unsigned char id;
-
- vgaIOBase = (inb(0x3CC) & 0x01) ? 0x3D0 : 0x3B0;
- /* §§§ Too intrusive ? */
- outw(GRAX, 0x2609); /* Unlock NeoMagic registers */
-
- outb(vgaIOBase + 4, 0x1A);
- id = inb(vgaIOBase + 5);
-
- outw(GRAX, 0x0009); /* Lock NeoMagic registers */
-
- switch (id) {
- case PROBED_NM2070 :
- return NM2070;
- case PROBED_NM2090 :
- return NM2090;
- case PROBED_NM2093 :
- return NM2093;
- default :
- return -1;
- }
-}
-#endif
/* Mandatory */
Bool
--
1.6.0.4
More information about the xorg-devel
mailing list