frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a real xf86EnableIO/xf86DisableIO for NetBSD/PPC.

This commit is contained in:
Jared D. McNeill 2007-04-10 12:57:15 -07:00 committed by Eric Anholt
parent f77a8ea849
commit 4aae2de74b
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/xfree86/os-support/bsd/Makefile.am
View File

@ -38,8 +38,7 @@ ARCH_SOURCES = i386_video.c
endif endif
if PPC_VIDEO if PPC_VIDEO
ARCH_SOURCES = ppc_video.c \ ARCH_SOURCES = ppc_video.c
$(srcdir)/../shared/ioperm_noop.c
endif endif
if SPARC64_VIDEO if SPARC64_VIDEO

33
hw/xfree86/os-support/bsd/ppc_video.c
View File

@ -56,6 +56,9 @@
static pointer ppcMapVidMem(int, unsigned long, unsigned long, int flags); static pointer ppcMapVidMem(int, unsigned long, unsigned long, int flags);
static void ppcUnmapVidMem(int, pointer, unsigned long); static void ppcUnmapVidMem(int, pointer, unsigned long);
Bool xf86EnableIO(void);
void xf86DisableIO(void);
void void
xf86OSInitVidMem(VidMemInfoPtr pVidMem) xf86OSInitVidMem(VidMemInfoPtr pVidMem)
{ {
@ -63,6 +66,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
pVidMem->mapMem = ppcMapVidMem; pVidMem->mapMem = ppcMapVidMem;
pVidMem->unmapMem = ppcUnmapVidMem; pVidMem->unmapMem = ppcUnmapVidMem;
pVidMem->initialised = TRUE; pVidMem->initialised = TRUE;
xf86EnableIO();
} }
@ -138,3 +142,32 @@ xf86EnableInterrupts()
return; return;
} }
Bool xf86EnableIO()
{
int fd = xf86Info.screenFd;
xf86MsgVerb(X_WARNING, 3, "xf86EnableIO %d\n", fd);
if (ioBase == MAP_FAILED)
{
ioBase=mmap(NULL, 0x10000, PROT_READ|PROT_WRITE, MAP_SHARED, fd,
0xf2000000);
xf86MsgVerb(X_INFO, 3, "xf86EnableIO: %08x\n", ioBase);
if (ioBase == MAP_FAILED) {
xf86MsgVerb(X_WARNING, 3, "Can't map IO space!\n");
return FALSE;
}
}
return TRUE;
}
void xf86DisableIO()
{
if (ioBase != MAP_FAILED)
{
munmap(__UNVOLATILE(ioBase), 0x10000);
ioBase = MAP_FAILED;
}
}