summaryrefslogtreecommitdiff
path: root/xserver/hw
diff options
context:
space:
mode:
authorVisa Hankala <visa@cvs.openbsd.org>2021-12-27 04:58:37 +0000
committerVisa Hankala <visa@cvs.openbsd.org>2021-12-27 04:58:37 +0000
commit94783c7a10cdea8076f881228288d89afa7ecbb0 (patch)
tree531b94ff29fd01fb5155f7b72f27a389857678ae /xserver/hw
parentcb61b514c282a96da99999ef9be563652f2a1608 (diff)
Recommit: compiler.h: don't define inb/outb and friends on mips
From Julien Cristau 0148a15da1616a868d71abe1b56e3f28cc79533c in xserver git without arm_video.c changes. OK matthieu@
Diffstat (limited to 'xserver/hw')
-rw-r--r--xserver/hw/xfree86/common/compiler.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/xserver/hw/xfree86/common/compiler.h b/xserver/hw/xfree86/common/compiler.h
index 2b2008b3f..eb788d3fd 100644
--- a/xserver/hw/xfree86/common/compiler.h
+++ b/xserver/hw/xfree86/common/compiler.h
@@ -518,14 +518,10 @@ xf86WriteMmio32Le(__volatile__ void *base, const unsigned long offset,
barrier();
}
-#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
-#if defined(__arm32__) || defined(__mips64)
+#elif defined(__arm32__) && !defined(__linux__)
#define PORT_SIZE long
-#else
-#define PORT_SIZE short
-#endif
-_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */
+extern _X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */
static __inline__ void
outb(unsigned PORT_SIZE port, unsigned char val)