Attachment #177097 for bug #214591




# $FreeBSD$

PORTNAME?=	xorg-server
PORTVERSION=	1.18.4
PORTREVISION?=	0
PORTEPOCH?=	1
CATEGORIES=	x11-servers


.include <bsd.port.options.mk>

USES=		gmake libtool perl5 ssl tar:bzip2
USE_PERL5=	build
USE_GL=		gbm egl gl
USE_XORG?=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \

		videoproto compositeproto trapproto presentproto recordproto \
		xineramaproto xinerama evieproto xfont fontenc xkbui pixman \
		pciaccess xshmfence
USE_OPENSSL=	yes
CONFIGURE_ARGS?=--disable-dmx --disable-xvfb --disable-xnest \
		--without-xmlto --disable-docs --disable-devel-docs \
		--localstatedir=/var --without-dtrace --disable-xephyr \

# We handle Xorg setuid in the plist. This allows to build xorg-server as a user.
CONFIGURE_ARGS+=--disable-install-setuid

.if ${ARCH} == i386
EXTRA_PATCHES+=	${FILESDIR}/extra-arch-i386
.endif

.if ${ARCH} == ia64
EXTRA_PATCHES+=	${FILESDIR}/extra-arch-ia64
.endif

.if ${ARCH} == powerpc || ${ARCH} == powerpc64
EXTRA_PATCHES+=	${FILESDIR}/extra-arch-powerpc
.endif

Lines 1-2 Link Here

(-)x11-servers/xorg-server/distinfo (-2 / +3 lines)
1	SHA256 (xorg/xserver/xorg-server-1.17.4.tar.bz2) = 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457	1	TIMESTAMP = 1469260730
2	SIZE (xorg/xserver/xorg-server-1.17.4.tar.bz2) = 5791384	2	SHA256 (xorg/xserver/xorg-server-1.18.4.tar.bz2) = 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8
		3	SIZE (xorg/xserver/xorg-server-1.18.4.tar.bz2) = 6009508




--- hw/xfree86/common/compiler.h.orig	2015-06-05 17:19:40.000000000 +0200
+++ hw/xfree86/common/compiler.h	2015-10-12 15:41:30.817470000 +0200
@@ -968,6 +968,59 @@ inl(unsigned PORT_SIZE port)
 #endif                          /* NDS32_MMIO_SWAP */
 
 #elif defined(__i386__) || defined(__ia64__)
+#if defined(__clang__)
+
+/*
+ * If gcc uses gas rather than the native assembler, the syntax of these
+ * inlines has to be different.		DHD
+ */
+
+static __inline__ void
+outb(unsigned short port, unsigned char val)
+{
+    __asm__ __volatile__("outb %0,%1"::"a"(val), "d"(port));
+}
+
+static __inline__ void
+outw(unsigned short port, unsigned short val)
+{
+    __asm__ __volatile__("outw %0,%1"::"a"(val), "d"(port));
+}
+
+static __inline__ void
+outl(unsigned short port, unsigned int val)
+{
+    __asm__ __volatile__("outl %0,%1"::"a"(val), "d"(port));
+}
+
+static __inline__ unsigned int
+inb(unsigned short port)
+{
+    unsigned char ret;
+    __asm__ __volatile__("inb %1,%0":"=a"(ret):"d"(port));
+
+    return ret;
+}
+
+static __inline__ unsigned int
+inw(unsigned short port)
+{
+    unsigned short ret;
+    __asm__ __volatile__("inw %1,%0":"=a"(ret):"d"(port));
+
+    return ret;
+}
+
+static __inline__ unsigned int
+inl(unsigned short port)
+{
+    unsigned int ret;
+    __asm__ __volatile__("inl %1,%0":"=a"(ret):"d"(port));
+
+    return ret;
+}
+
+#else /* !__clang__, presumable GAS */
 
 static __inline__ void
 outb(unsigned short port, unsigned char val)
@@ -1014,6 +1067,7 @@ inl(unsigned short port)
     return ret;
 }
 
+#endif /* !__clang__, GAS part */
 #endif                          /* arch madness */
 
 #else                           /* !GNUC */




--- configure.dist	2009-06-18 17:05:59.000000000 -0700
+++ configure	2009-06-18 17:08:47.000000000 -0700
@@ -1097,6 +1097,8 @@
 SPARC64_VIDEO_TRUE
 PPC_VIDEO_FALSE
 PPC_VIDEO_TRUE
+IA64_VIDEO_FALSE
+IA64_VIDEO_TRUE
 I386_VIDEO_FALSE
 I386_VIDEO_TRUE
 ARM_VIDEO_FALSE
@@ -19134,6 +19136,7 @@
 	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
 	;;
   ia64*)
+	IA64_VIDEO=yes
   	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
 	;;
   s390*)
@@ -19166,6 +19169,14 @@
   I386_VIDEO_FALSE=
 fi
 
+ if test "x$IA64_VIDEO" = xyes; then
+  IA64_VIDEO_TRUE=
+  IA64_VIDEO_FALSE='#'
+else
+  IA64_VIDEO_TRUE='#'
+  IA64_VIDEO_FALSE=
+fi
+
  if test "x$PPC_VIDEO" = xyes; then
   PPC_VIDEO_TRUE=
   PPC_VIDEO_FALSE='#'
--- hw/xfree86/os-support/bsd/Makefile.in.dist	2009-06-18 17:45:13.000000000 -0700
+++ hw/xfree86/os-support/bsd/Makefile.in	2009-06-18 17:45:19.000000000 -0700
@@ -63,6 +63,7 @@
 @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@am__objects_1 = sparc64_video.lo \
 @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@	ioperm_noop.lo
 @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_TRUE@am__objects_1 = ppc_video.lo
+@IA64_VIDEO_TRUE@am__objects_1 = ia64_video.lo
 @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_TRUE@am__objects_1 = i386_video.lo
 @ALPHA_VIDEO_FALSE@@ARM_VIDEO_TRUE@am__objects_1 = arm_video.lo
 @ALPHA_VIDEO_TRUE@am__objects_1 = alpha_video.lo bsd_ev56.lo \
@@ -393,6 +394,7 @@
 
 @ARM_VIDEO_TRUE@ARCH_SOURCES = arm_video.c
 @I386_VIDEO_TRUE@ARCH_SOURCES = i386_video.c
+@IA64_VIDEO_TRUE@ARCH_SOURCES = ia64_video.c
 @PPC_VIDEO_TRUE@ARCH_SOURCES = ppc_video.c
 
 # Cheat here and piggyback other sparc64 bits on SPARC64_VIDEO.
--- /dev/null	2009-06-18 18:27:23.000000000 -0700
+++ hw/xfree86/os-support/bsd/ia64_video.c	2009-06-18 18:26:02.000000000 -0700
@@ -0,0 +1,150 @@
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <X11/X.h>
+#include "xf86.h"
+#include "xf86Priv.h"
+
+#include "xf86_OSlib.h"
+#include "xf86OSpriv.h"
+
+#include "bus/Pci.h"
+
+#ifndef MAP_FAILED
+#define MAP_FAILED ((caddr_t)-1)
+#endif
+
+
+/***************************************************************************/
+/* Video Memory Mapping section                                            */
+/***************************************************************************/
+
+#define DEV_MEM "/dev/mem"
+
+static pointer ia64MapVidMem(int, unsigned long, unsigned long, int flags);
+static void ia64UnmapVidMem(int, pointer, unsigned long);
+
+Bool xf86EnableIO(void);
+void xf86DisableIO(void);
+
+void
+xf86OSInitVidMem(VidMemInfoPtr pVidMem)
+{
+	pVidMem->linearSupported = TRUE;
+	pVidMem->mapMem = ia64MapVidMem;
+	pVidMem->unmapMem = ia64UnmapVidMem;
+	pVidMem->initialised = TRUE;
+	xf86EnableIO();
+}
+
+
+_X_EXPORT volatile unsigned char *ioBase = MAP_FAILED;
+
+static pointer
+ia64MapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
+{
+	int fd = xf86Info.screenFd;
+	pointer base;
+#ifdef DEBUG
+	xf86MsgVerb(X_INFO, 3, "mapVidMem %lx, %lx, fd = %d", 
+		    Base, Size, fd);
+#endif
+
+	base = mmap(0, Size,
+		    (flags & VIDMEM_READONLY) ?
+		     PROT_READ : (PROT_READ | PROT_WRITE),
+		    MAP_SHARED, fd, Base);
+	if (base == MAP_FAILED)
+		FatalError("%s: could not mmap screen [s=%lx,a=%lx] (%s)",
+			   "xf86MapVidMem", Size, Base, strerror(errno));
+
+	return base;
+}
+
+static void
+ia64UnmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
+{
+	munmap(Base, Size);
+}
+
+_X_EXPORT int
+xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
+	     int Len)
+{
+	int rv;
+	static int kmem = -1;
+
+	if (kmem == -1) {
+		kmem = open(DEV_MEM, 2);
+		if (kmem == -1) {
+			FatalError("xf86ReadBIOS: open %s", DEV_MEM);
+		}
+	}
+
+#ifdef DEBUG
+	xf86MsgVerb(X_INFO, 3, "xf86ReadBIOS() %lx %lx, %x\n", 
+		    Base, Offset, Len);
+#endif
+
+
+	lseek(kmem, Base + Offset, 0);
+	rv = read(kmem, Buf, Len);
+
+	return rv;
+}
+
+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,
+                    0);
+                xf86MsgVerb(X_INFO, 3, "xf86EnableIO: %p\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((void *)(uintptr_t)(void *)ioBase, 0x10000);
+                ioBase = MAP_FAILED;
+        }
+}
+
+void outb(unsigned long port, unsigned char val)
+{
+}
+
+void outw(unsigned long port, unsigned short val)
+{
+}
+
+void outl(unsigned long port, unsigned int val)
+{
+}
+
+unsigned int inb(unsigned long port)
+{
+	return 0xff;
+}
+
+unsigned int inw(unsigned long port)
+{
+	return 0xffff;
+}
+
+unsigned int inl(unsigned long port)
+{
+	return 0xffffffff;
+}

Lines 1-5 Link Here

(-)x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Xinput.c (-2 / +12 lines)
1	Index: hw/xfree86/common/xf86Xinput.c	1	--- hw/xfree86/common/xf86Xinput.c.orig 2015-10-28 19:15:36.000000000 +0100
2	@@ -942,6 +942,7 @@	2	+++ hw/xfree86/common/xf86Xinput.c 2015-11-18 23:51:11.993397000 +0100
		3	@@ -841,7 +841,7 @@ xf86NewInputDevice(InputInfoPtr pInfo, D
		4	{
		5	InputDriverPtr drv = NULL;
		6	DeviceIntPtr dev = NULL;
		7	- Bool paused;
		8	+ Bool paused = 0;
		9	int rval;
		10	const char *path;
		11
		12	@@ -993,6 +993,7 @@ NewInputDeviceRequest(InputOption *optio
3	if (strcmp(key, "_source") == 0 &&	13	if (strcmp(key, "_source") == 0 &&
4	(strcmp(value, "server/hal") == 0 \|\|	14	(strcmp(value, "server/hal") == 0 \|\|
5	strcmp(value, "server/udev") == 0 \|\|	15	strcmp(value, "server/udev") == 0 \|\|




include/xorg/damagestr.h
include/xorg/dbestruct.h
include/xorg/dgaproc.h
include/xorg/displaymode.h
include/xorg/dix.h
include/xorg/dixaccess.h
include/xorg/dixevents.h

include/xorg/misyncshm.h
include/xorg/misyncstr.h
include/xorg/mizerarc.h
include/xorg/nonsdk_extinit.h
include/xorg/opaque.h
include/xorg/optionstr.h
include/xorg/os.h

include/xorg/shadowfb.h
include/xorg/shmint.h
include/xorg/site.h
include/xorg/swaprep.h
include/xorg/swapreq.h
include/xorg/syncsdk.h
include/xorg/validate.h
include/xorg/vbe.h
include/xorg/vbeModes.h
include/xorg/vgaHW.h
include/xorg/vidmodeproc.h
include/xorg/wfbrename.h
include/xorg/window.h
include/xorg/windowstr.h

include/xorg/xf86xv.h
include/xorg/xf86xvmc.h
include/xorg/xf86xvpriv.h
include/xorg/xfixes.h
include/xorg/xisb.h
include/xorg/xkbfile.h
include/xorg/xkbrules.h

Return to bug 214591

Lines 2-8 Link Here

(-)x11-servers/xorg-server/Makefile (-11 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME?= xorg-server	4	PORTNAME?= xorg-server
5	PORTVERSION= 1.17.4	5	PORTVERSION= 1.18.4
6	PORTREVISION?= 0	6	PORTREVISION?= 0
7	PORTEPOCH?= 1	7	PORTEPOCH?= 1
8	CATEGORIES= x11-servers	8	CATEGORIES= x11-servers
Lines 35-41 Link Here
35		35
36	.include <bsd.port.options.mk>	36	.include <bsd.port.options.mk>
37		37
38	USES= gmake libtool perl5 tar:bzip2	38	USES= gmake libtool perl5 ssl tar:bzip2
39	USE_PERL5= build	39	USE_PERL5= build
40	USE_GL= gbm egl gl	40	USE_GL= gbm egl gl
41	USE_XORG?= xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \	41	USE_XORG?= xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
Lines 46-52 Link Here
46	videoproto compositeproto trapproto presentproto recordproto \	46	videoproto compositeproto trapproto presentproto recordproto \
47	xineramaproto xinerama evieproto xfont fontenc xkbui pixman \	47	xineramaproto xinerama evieproto xfont fontenc xkbui pixman \
48	pciaccess xshmfence	48	pciaccess xshmfence
49	USE_OPENSSL= yes
50	CONFIGURE_ARGS?=--disable-dmx --disable-xvfb --disable-xnest \	49	CONFIGURE_ARGS?=--disable-dmx --disable-xvfb --disable-xnest \
51	--without-xmlto --disable-docs --disable-devel-docs \	50	--without-xmlto --disable-docs --disable-devel-docs \
52	--localstatedir=/var --without-dtrace --disable-xephyr \	51	--localstatedir=/var --without-dtrace --disable-xephyr \
Lines 81-94 Link Here
81	# We handle Xorg setuid in the plist. This allows to build xorg-server as a user.	80	# We handle Xorg setuid in the plist. This allows to build xorg-server as a user.
82	CONFIGURE_ARGS+=--disable-install-setuid	81	CONFIGURE_ARGS+=--disable-install-setuid
83		82
84	.if ${ARCH} == i386
85	EXTRA_PATCHES+= ${FILESDIR}/extra-arch-i386
86	.endif
87
88	.if ${ARCH} == ia64
89	EXTRA_PATCHES+= ${FILESDIR}/extra-arch-ia64
90	.endif
91
92	.if ${ARCH} == powerpc \|\| ${ARCH} == powerpc64	83	.if ${ARCH} == powerpc \|\| ${ARCH} == powerpc64
93	EXTRA_PATCHES+= ${FILESDIR}/extra-arch-powerpc	84	EXTRA_PATCHES+= ${FILESDIR}/extra-arch-powerpc
94	.endif	85	.endif

Lines 1-70 Link Here

(-)x11-servers/xorg-server/files/extra-arch-i386 (-70 lines)
1	--- hw/xfree86/common/compiler.h.orig 2015-06-05 17:19:40.000000000 +0200
2	+++ hw/xfree86/common/compiler.h 2015-10-12 15:41:30.817470000 +0200
3	@@ -968,6 +968,59 @@ inl(unsigned PORT_SIZE port)
4	#endif /* NDS32_MMIO_SWAP */
5
6	#elif defined(__i386__) \|\| defined(__ia64__)
7	+#if defined(__clang__)
8	+
9	+/*
10	+ * If gcc uses gas rather than the native assembler, the syntax of these
11	+ * inlines has to be different. DHD
12	+ */
13	+
14	+static __inline__ void
15	+outb(unsigned short port, unsigned char val)
16	+{
17	+ __asm__ __volatile__("outb %0,%1"::"a"(val), "d"(port));
18	+}
19	+
20	+static __inline__ void
21	+outw(unsigned short port, unsigned short val)
22	+{
23	+ __asm__ __volatile__("outw %0,%1"::"a"(val), "d"(port));
24	+}
25	+
26	+static __inline__ void
27	+outl(unsigned short port, unsigned int val)
28	+{
29	+ __asm__ __volatile__("outl %0,%1"::"a"(val), "d"(port));
30	+}
31	+
32	+static __inline__ unsigned int
33	+inb(unsigned short port)
34	+{
35	+ unsigned char ret;
36	+ __asm__ __volatile__("inb %1,%0":"=a"(ret):"d"(port));
37	+
38	+ return ret;
39	+}
40	+
41	+static __inline__ unsigned int
42	+inw(unsigned short port)
43	+{
44	+ unsigned short ret;
45	+ __asm__ __volatile__("inw %1,%0":"=a"(ret):"d"(port));
46	+
47	+ return ret;
48	+}
49	+
50	+static __inline__ unsigned int
51	+inl(unsigned short port)
52	+{
53	+ unsigned int ret;
54	+ __asm__ __volatile__("inl %1,%0":"=a"(ret):"d"(port));
55	+
56	+ return ret;
57	+}
58	+
59	+#else /* !__clang__, presumable GAS */
60
61	static __inline__ void
62	outb(unsigned short port, unsigned char val)
63	@@ -1014,6 +1067,7 @@ inl(unsigned short port)
64	return ret;
65	}
66
67	+#endif /* !__clang__, GAS part */
68	#endif /* arch madness */
69
70	#else /* !GNUC */

Lines 1-205 Link Here

(-)x11-servers/xorg-server/files/extra-arch-ia64 (-205 lines)
1	--- configure.dist 2009-06-18 17:05:59.000000000 -0700
2	+++ configure 2009-06-18 17:08:47.000000000 -0700
3	@@ -1097,6 +1097,8 @@
4	SPARC64_VIDEO_TRUE
5	PPC_VIDEO_FALSE
6	PPC_VIDEO_TRUE
7	+IA64_VIDEO_FALSE
8	+IA64_VIDEO_TRUE
9	I386_VIDEO_FALSE
10	I386_VIDEO_TRUE
11	ARM_VIDEO_FALSE
12	@@ -19134,6 +19136,7 @@
13	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
14	;;
15	ia64*)
16	+ IA64_VIDEO=yes
17	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
18	;;
19	s390*)
20	@@ -19166,6 +19169,14 @@
21	I386_VIDEO_FALSE=
22	fi
23
24	+ if test "x$IA64_VIDEO" = xyes; then
25	+ IA64_VIDEO_TRUE=
26	+ IA64_VIDEO_FALSE='#'
27	+else
28	+ IA64_VIDEO_TRUE='#'
29	+ IA64_VIDEO_FALSE=
30	+fi
31	+
32	if test "x$PPC_VIDEO" = xyes; then
33	PPC_VIDEO_TRUE=
34	PPC_VIDEO_FALSE='#'
35	--- hw/xfree86/os-support/bsd/Makefile.in.dist 2009-06-18 17:45:13.000000000 -0700
36	+++ hw/xfree86/os-support/bsd/Makefile.in 2009-06-18 17:45:19.000000000 -0700
37	@@ -63,6 +63,7 @@
38	@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@am__objects_1 = sparc64_video.lo \
39	@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@ ioperm_noop.lo
40	@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_TRUE@am__objects_1 = ppc_video.lo
41	+@IA64_VIDEO_TRUE@am__objects_1 = ia64_video.lo
42	@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_TRUE@am__objects_1 = i386_video.lo
43	@ALPHA_VIDEO_FALSE@@ARM_VIDEO_TRUE@am__objects_1 = arm_video.lo
44	@ALPHA_VIDEO_TRUE@am__objects_1 = alpha_video.lo bsd_ev56.lo \
45	@@ -393,6 +394,7 @@
46
47	@ARM_VIDEO_TRUE@ARCH_SOURCES = arm_video.c
48	@I386_VIDEO_TRUE@ARCH_SOURCES = i386_video.c
49	+@IA64_VIDEO_TRUE@ARCH_SOURCES = ia64_video.c
50	@PPC_VIDEO_TRUE@ARCH_SOURCES = ppc_video.c
51
52	# Cheat here and piggyback other sparc64 bits on SPARC64_VIDEO.
53	--- /dev/null 2009-06-18 18:27:23.000000000 -0700
54	+++ hw/xfree86/os-support/bsd/ia64_video.c 2009-06-18 18:26:02.000000000 -0700
55	@@ -0,0 +1,150 @@
56	+#ifdef HAVE_XORG_CONFIG_H
57	+#include <xorg-config.h>
58	+#endif
59	+
60	+#include <X11/X.h>
61	+#include "xf86.h"
62	+#include "xf86Priv.h"
63	+
64	+#include "xf86_OSlib.h"
65	+#include "xf86OSpriv.h"
66	+
67	+#include "bus/Pci.h"
68	+
69	+#ifndef MAP_FAILED
70	+#define MAP_FAILED ((caddr_t)-1)
71	+#endif
72	+
73	+
74	+/***************************************************************************/
75	+/* Video Memory Mapping section */
76	+/***************************************************************************/
77	+
78	+#define DEV_MEM "/dev/mem"
79	+
80	+static pointer ia64MapVidMem(int, unsigned long, unsigned long, int flags);
81	+static void ia64UnmapVidMem(int, pointer, unsigned long);
82	+
83	+Bool xf86EnableIO(void);
84	+void xf86DisableIO(void);
85	+
86	+void
87	+xf86OSInitVidMem(VidMemInfoPtr pVidMem)
88	+{
89	+ pVidMem->linearSupported = TRUE;
90	+ pVidMem->mapMem = ia64MapVidMem;
91	+ pVidMem->unmapMem = ia64UnmapVidMem;
92	+ pVidMem->initialised = TRUE;
93	+ xf86EnableIO();
94	+}
95	+
96	+
97	+_X_EXPORT volatile unsigned char *ioBase = MAP_FAILED;
98	+
99	+static pointer
100	+ia64MapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
101	+{
102	+ int fd = xf86Info.screenFd;
103	+ pointer base;
104	+#ifdef DEBUG
105	+ xf86MsgVerb(X_INFO, 3, "mapVidMem %lx, %lx, fd = %d",
106	+ Base, Size, fd);
107	+#endif
108	+
109	+ base = mmap(0, Size,
110	+ (flags & VIDMEM_READONLY) ?
111	+ PROT_READ : (PROT_READ \| PROT_WRITE),
112	+ MAP_SHARED, fd, Base);
113	+ if (base == MAP_FAILED)
114	+ FatalError("%s: could not mmap screen [s=%lx,a=%lx] (%s)",
115	+ "xf86MapVidMem", Size, Base, strerror(errno));
116	+
117	+ return base;
118	+}
119	+
120	+static void
121	+ia64UnmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
122	+{
123	+ munmap(Base, Size);
124	+}
125	+
126	+_X_EXPORT int
127	+xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
128	+ int Len)
129	+{
130	+ int rv;
131	+ static int kmem = -1;
132	+
133	+ if (kmem == -1) {
134	+ kmem = open(DEV_MEM, 2);
135	+ if (kmem == -1) {
136	+ FatalError("xf86ReadBIOS: open %s", DEV_MEM);
137	+ }
138	+ }
139	+
140	+#ifdef DEBUG
141	+ xf86MsgVerb(X_INFO, 3, "xf86ReadBIOS() %lx %lx, %x\n",
142	+ Base, Offset, Len);
143	+#endif
144	+
145	+
146	+ lseek(kmem, Base + Offset, 0);
147	+ rv = read(kmem, Buf, Len);
148	+
149	+ return rv;
150	+}
151	+
152	+Bool xf86EnableIO()
153	+{
154	+ int fd = xf86Info.screenFd;
155	+
156	+ xf86MsgVerb(X_WARNING, 3, "xf86EnableIO %d\n", fd);
157	+ if (ioBase == MAP_FAILED)
158	+ {
159	+ ioBase=mmap(NULL, 0x10000, PROT_READ\|PROT_WRITE, MAP_SHARED, fd,
160	+ 0);
161	+ xf86MsgVerb(X_INFO, 3, "xf86EnableIO: %p\n", ioBase);
162	+ if (ioBase == MAP_FAILED) {
163	+ xf86MsgVerb(X_WARNING, 3, "Can't map IO space!\n");
164	+ return FALSE;
165	+ }
166	+ }
167	+ return TRUE;
168	+}
169	+
170	+void xf86DisableIO()
171	+{
172	+
173	+ if (ioBase != MAP_FAILED)
174	+ {
175	+ munmap((void )(uintptr_t)(void )ioBase, 0x10000);
176	+ ioBase = MAP_FAILED;
177	+ }
178	+}
179	+
180	+void outb(unsigned long port, unsigned char val)
181	+{
182	+}
183	+
184	+void outw(unsigned long port, unsigned short val)
185	+{
186	+}
187	+
188	+void outl(unsigned long port, unsigned int val)
189	+{
190	+}
191	+
192	+unsigned int inb(unsigned long port)
193	+{
194	+ return 0xff;
195	+}
196	+
197	+unsigned int inw(unsigned long port)
198	+{
199	+ return 0xffff;
200	+}
201	+
202	+unsigned int inl(unsigned long port)
203	+{
204	+ return 0xffffffff;
205	+}

Lines 22-27 Link Here

(-)x11-servers/xorg-server/pkg-plist (-4 / +2 lines)
22	include/xorg/damagestr.h	22	include/xorg/damagestr.h
23	include/xorg/dbestruct.h	23	include/xorg/dbestruct.h
24	include/xorg/dgaproc.h	24	include/xorg/dgaproc.h
		25	include/xorg/displaymode.h
25	include/xorg/dix.h	26	include/xorg/dix.h
26	include/xorg/dixaccess.h	27	include/xorg/dixaccess.h
27	include/xorg/dixevents.h	28	include/xorg/dixevents.h
Lines 75-80 Link Here
75	include/xorg/misyncshm.h	76	include/xorg/misyncshm.h
76	include/xorg/misyncstr.h	77	include/xorg/misyncstr.h
77	include/xorg/mizerarc.h	78	include/xorg/mizerarc.h
		79	include/xorg/nonsdk_extinit.h
78	include/xorg/opaque.h	80	include/xorg/opaque.h
79	include/xorg/optionstr.h	81	include/xorg/optionstr.h
80	include/xorg/os.h	82	include/xorg/os.h
Lines 106-119 Link Here
106	include/xorg/shadowfb.h	108	include/xorg/shadowfb.h
107	include/xorg/shmint.h	109	include/xorg/shmint.h
108	include/xorg/site.h	110	include/xorg/site.h
109	include/xorg/swaprep.h
110	include/xorg/swapreq.h
111	include/xorg/syncsdk.h	111	include/xorg/syncsdk.h
112	include/xorg/validate.h	112	include/xorg/validate.h
113	include/xorg/vbe.h	113	include/xorg/vbe.h
114	include/xorg/vbeModes.h	114	include/xorg/vbeModes.h
115	include/xorg/vgaHW.h	115	include/xorg/vgaHW.h
116	include/xorg/vidmodeproc.h
117	include/xorg/wfbrename.h	116	include/xorg/wfbrename.h
118	include/xorg/window.h	117	include/xorg/window.h
119	include/xorg/windowstr.h	118	include/xorg/windowstr.h
Lines 151-157 Link Here
151	include/xorg/xf86xv.h	150	include/xorg/xf86xv.h
152	include/xorg/xf86xvmc.h	151	include/xorg/xf86xvmc.h
153	include/xorg/xf86xvpriv.h	152	include/xorg/xf86xvpriv.h
154	include/xorg/xfixes.h
155	include/xorg/xisb.h	153	include/xorg/xisb.h
156	include/xorg/xkbfile.h	154	include/xorg/xkbfile.h
157	include/xorg/xkbrules.h	155	include/xorg/xkbrules.h