diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2022-07-17 18:42:33 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2022-07-17 18:42:33 -0700 |
| commit | b512d07b3125ed3ec5ae962ebb1a01d007d0efe9 (patch) | |
| tree | 572636eb635503df8a4bf3f376aeb61535a1d4c1 /src/XF86DGA2.c | |
| parent | fd5436d2ef3484a0eaec619cf69870c18d7cb3ca (diff) | |
unifdef __UNIXOS2__
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'src/XF86DGA2.c')
| -rw-r--r-- | src/XF86DGA2.c | 50 |
1 files changed, 1 insertions, 49 deletions
diff --git a/src/XF86DGA2.c b/src/XF86DGA2.c index fc5b9ce..9f13faf 100644 --- a/src/XF86DGA2.c +++ b/src/XF86DGA2.c @@ -10,12 +10,6 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc #include <config.h> #endif -#ifdef __UNIXOS2__ /* needed here to override certain constants in X headers */ -#define INCL_DOS -#define INCL_DOSIOCTL -#define I_NEED_OS2_H -#include <os2.h> -#endif #include <X11/Xlibint.h> #include <X11/extensions/Xxf86dga.h> @@ -762,9 +756,7 @@ void XDGAKeyEventToXKeyEvent( # include <errno.h> # include <smem.h> # else -# if !defined(__UNIXOS2__) -# include <sys/mman.h> -# endif +# include <sys/mman.h> # endif #endif #include <sys/wait.h> @@ -894,10 +886,6 @@ DGAMapPhysical( ) { #if defined(ISC) && defined(HAS_SVR3_MMAP) struct kd_memloc mloc; -#elif defined(__UNIXOS2__) - APIRET rc; - ULONG action; - HFILE hfd; #endif base += offset; @@ -916,40 +904,6 @@ DGAMapPhysical( if ((pMap->virtual = (void *)ioctl(pMap->fd, MAP, &mloc)) == (void *)-1) return False; -#elif defined (__UNIXOS2__) - /* - * Dragon warning here! /dev/pmap$ is never closed, except on program exit. - * Consecutive calling of this routine will make PMAP$ driver run out - * of memory handles. Some umap/close mechanism should be provided - */ - - rc = DosOpen("/dev/pmap$", &hfd, &action, 0, FILE_NORMAL, FILE_OPEN, - OPEN_ACCESS_READWRITE | OPEN_SHARE_DENYNONE, (PEAOP2)NULL); - if (rc != 0) - return False; - { - struct map_ioctl { - union { - ULONG phys; - void* user; - } a; - ULONG size; - } pmap,dmap; - ULONG plen,dlen; -#define XFREE86_PMAP 0x76 -#define PMAP_MAP 0x44 - - pmap.a.phys = base; - pmap.size = size; - rc = DosDevIOCtl(hfd, XFREE86_PMAP, PMAP_MAP, - (PULONG)&pmap, sizeof(pmap), &plen, - (PULONG)&dmap, sizeof(dmap), &dlen); - if (rc == 0) { - pMap->virtual = dmap.a.user; - } - } - if (rc != 0) - return False; #elif defined (Lynx) && defined(NO_MMAP) pMap->virtual = smem_create("XF86DGA", (char*)base, size, SM_READ|SM_WRITE); #else @@ -977,8 +931,6 @@ DGAUnmapPhysical(DGAMapPtr pMap) { #if defined(ISC) && defined(HAS_SVR3_MMAP) /* XXX Add unmapping code here. */ -#elif defined (__UNIXOS2__) - /* 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); |