Fix build on hurd-i386
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=523970
This commit is contained in:
parent
faf7dfa099
commit
74d27c8b5b
|
@ -1455,6 +1455,9 @@ if test "x$XORG" = xyes; then
|
|||
gnu*)
|
||||
XORG_OS="gnu"
|
||||
XORG_OS_SUBDIR="hurd"
|
||||
# Use the same stubs as BSD for old functions, since we now
|
||||
# use libpciaccess for PCI
|
||||
xorg_bus_bsdpci="yes"
|
||||
;;
|
||||
*)
|
||||
XORG_OS="unknown"
|
||||
|
|
|
@ -169,7 +169,7 @@
|
|||
#endif /* !defined(DEBUGPCI) */
|
||||
|
||||
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || \
|
||||
defined(__DragonFly__) || defined(__sun)
|
||||
defined(__DragonFly__) || defined(__sun) || defined(__GNU__)
|
||||
#define ARCH_PCI_INIT bsdPciInit
|
||||
#endif
|
||||
|
||||
|
|
|
@ -5,6 +5,7 @@ libhurd_la_SOURCES = hurd_bell.c hurd_init.c hurd_mmap.c \
|
|||
$(srcdir)/../shared/VTsw_noop.c \
|
||||
$(srcdir)/../shared/posix_tty.c \
|
||||
$(srcdir)/../shared/stdResource.c \
|
||||
$(srcdir)/../shared/vidmem.c \
|
||||
$(srcdir)/../shared/sigiostubs.c \
|
||||
$(srcdir)/../shared/pm_noop.c \
|
||||
$(srcdir)/../shared/kmod_noop.c \
|
||||
|
|
|
@ -41,8 +41,8 @@
|
|||
/**************************************************************************
|
||||
* Video Memory Mapping section
|
||||
***************************************************************************/
|
||||
pointer
|
||||
xf86MapVidMem(int ScreenNum,int Flags, unsigned long Base, unsigned long Size)
|
||||
static pointer
|
||||
mapVidMem(int ScreenNum,int Flags, unsigned long Base, unsigned long Size)
|
||||
{
|
||||
mach_port_t device,iopl_dev;
|
||||
memory_object_t iopl_mem;
|
||||
|
@ -95,8 +95,8 @@ xf86MapVidMem(int ScreenNum,int Flags, unsigned long Base, unsigned long Size)
|
|||
return (pointer)addr;
|
||||
}
|
||||
|
||||
void
|
||||
xf86UnMapVidMem(int ScreenNum,pointer Base,unsigned long Size)
|
||||
static void
|
||||
unmapVidMem(int ScreenNum,pointer Base,unsigned long Size)
|
||||
{
|
||||
kern_return_t err = vm_deallocate(mach_task_self(), (int)Base, Size);
|
||||
if( err )
|
||||
|
@ -107,12 +107,6 @@ xf86UnMapVidMem(int ScreenNum,pointer Base,unsigned long Size)
|
|||
return;
|
||||
}
|
||||
|
||||
Bool
|
||||
xf86LinearVidMem()
|
||||
{
|
||||
return(TRUE);
|
||||
}
|
||||
|
||||
/**************************************************************************
|
||||
* I/O Permissions section
|
||||
***************************************************************************/
|
||||
|
@ -143,14 +137,10 @@ xf86DisableIO()
|
|||
}
|
||||
|
||||
void
|
||||
xf86MapReadSideEffects(int ScreenNum, int Flags, pointer Base,
|
||||
unsigned long Size)
|
||||
xf86OSInitVidMem(VidMemInfoPtr pVidMem)
|
||||
{
|
||||
pVidMem->linearSupported = TRUE;
|
||||
pVidMem->mapMem = mapVidMem;
|
||||
pVidMem->unmapMem = unmapVidMem;
|
||||
pVidMem->initialised = TRUE;
|
||||
}
|
||||
|
||||
Bool
|
||||
xf86CheckMTRR(int s)
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
#include "bus/Pci.h"
|
||||
|
||||
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
|
||||
defined(__DragonFly__) || defined(__sun)
|
||||
defined(__DragonFly__) || defined(__sun) || defined(__GNU__)
|
||||
#define xf86StdAccResFromOS xf86AccResFromOS
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user