unifdef ISC

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

1 files changed, 1 insertions, 37 deletions

diff --git a/src/XF86DGA2.c b/src/XF86DGA2.c
index 9f13faf..6479c18 100644
--- a/src/XF86DGA2.c
+++ b/src/XF86DGA2.c
@@ -737,20 +737,6 @@ void XDGAKeyEventToXKeyEvent(
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
-#if defined(ISC)
-# define HAS_SVR3_MMAP
-# include <sys/types.h>
-# include <errno.h>
-
-# include <sys/at_ansi.h>
-# include <sys/kd.h>
-
-# include <sys/sysmacros.h>
-# include <sys/immu.h>
-# include <sys/region.h>
-
-# include <sys/mmap.h>
-#else
 # if defined(Lynx) && defined(NO_MMAP)
 #  include <sys/types.h>
 #  include <errno.h>
@@ -758,7 +744,6 @@ void XDGAKeyEventToXKeyEvent(
 # else
 #  include <sys/mman.h>
 # endif
-#endif
 #include <sys/wait.h>
 #include <signal.h>
 #include <unistd.h>
@@ -884,9 +869,6 @@ DGAMapPhysical(
    CARD32 extra,		/* optional extra data */
    DGAMapPtr pMap
 ) {
-#if defined(ISC) && defined(HAS_SVR3_MMAP)
-    struct kd_memloc mloc;
-#endif
 
     base += offset;
 
@@ -894,17 +876,7 @@ DGAMapPhysical(
     pMap->physical = base;
     pMap->size = size;
 
-#if defined(ISC) && defined(HAS_SVR3_MMAP)
-    if ((pMap->fd = open("/dev/mmap", O_RDWR)) < 0)
-	return False;
-    mloc.vaddr = (char *)0;
-    mloc.physaddr = (char *)base;
-    mloc.length = size;
-    mloc.ioflg=1;
-
-    if ((pMap->virtual = (void *)ioctl(pMap->fd, MAP, &mloc)) == (void *)-1)
-	return False;
-#elif defined (Lynx) && defined(NO_MMAP)
+#if defined (Lynx) && defined(NO_MMAP)
     pMap->virtual = smem_create("XF86DGA", (char*)base, size, SM_READ|SM_WRITE);
 #else
 #ifndef MAP_FILE
@@ -929,13 +901,6 @@ DGAMapPhysical(
 static void
 DGAUnmapPhysical(DGAMapPtr pMap)
 {
-#if defined(ISC) && defined(HAS_SVR3_MMAP)
-    /* XXX Add unmapping code here. */
-#elif defined(Lynx) && defined(NO_MMAP)
-	/* XXX this doesn't allow enable after disable */
-    smem_create(NULL, pMap->virtual, pMap->size, SM_DETACH);
-    smem_remove("XF86DGA");
-#else
     if (pMap->virtual && pMap->virtual != (void *)-1) {
 	mprotect(pMap->virtual,pMap->size, PROT_READ);
 	munmap(pMap->virtual, pMap->size);
@@ -945,5 +910,4 @@ DGAUnmapPhysical(DGAMapPtr pMap)
 	close(pMap->fd);
 	pMap->fd = -1;
     }
-#endif
 }