71 lines
2.2 KiB
Text
71 lines
2.2 KiB
Text
$NetBSD: patch-sa,v 1.4 2012/05/04 16:40:01 joerg Exp $
|
|
|
|
--- hw/xfree86/common/compiler.h.orig 2009-07-07 19:48:58.000000000 +0200
|
|
+++ hw/xfree86/common/compiler.h 2009-09-20 11:51:51.000000000 +0200
|
|
@@ -465,7 +465,7 @@ extern unsigned int inb(unsigned long po
|
|
extern unsigned int inw(unsigned long port);
|
|
extern unsigned int inl(unsigned long port);
|
|
|
|
-# elif defined(linux) && defined(__amd64__)
|
|
+# elif (defined(linux) || defined(__FreeBSD__)) && defined(__amd64__)
|
|
|
|
# include <inttypes.h>
|
|
|
|
@@ -531,7 +531,7 @@ inl(unsigned short port)
|
|
return ret;
|
|
}
|
|
|
|
-# elif (defined(linux) || defined(sun) || defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__sparc__)
|
|
+# elif (defined(linux) || defined(sun) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)) && defined(__sparc__)
|
|
|
|
# ifndef ASI_PL
|
|
# define ASI_PL 0x88
|
|
@@ -1390,26 +1390,26 @@ inl(unsigned short port)
|
|
static __inline__ void
|
|
outb(unsigned short port, unsigned char val)
|
|
{
|
|
- __asm__ __volatile__("out%B0 (%1)" : :"a" (val), "d" (port));
|
|
+ __asm__ __volatile__("outb %0,%1" : :"a" (val), "d" (port));
|
|
}
|
|
|
|
static __inline__ void
|
|
outw(unsigned short port, unsigned short val)
|
|
{
|
|
- __asm__ __volatile__("out%W0 (%1)" : :"a" (val), "d" (port));
|
|
+ __asm__ __volatile__("outw %0,%1" : :"a" (val), "d" (port));
|
|
}
|
|
|
|
static __inline__ void
|
|
outl(unsigned short port, unsigned int val)
|
|
{
|
|
- __asm__ __volatile__("out%L0 (%1)" : :"a" (val), "d" (port));
|
|
+ __asm__ __volatile__("outl %0,%1" : :"a" (val), "d" (port));
|
|
}
|
|
|
|
static __inline__ unsigned int
|
|
inb(unsigned short port)
|
|
{
|
|
unsigned char ret;
|
|
- __asm__ __volatile__("in%B0 (%1)" :
|
|
+ __asm__ __volatile__("inb %1,%0" :
|
|
"=a" (ret) :
|
|
"d" (port));
|
|
return ret;
|
|
@@ -1419,7 +1419,7 @@ static __inline__ unsigned int
|
|
inw(unsigned short port)
|
|
{
|
|
unsigned short ret;
|
|
- __asm__ __volatile__("in%W0 (%1)" :
|
|
+ __asm__ __volatile__("inw %1,%0" :
|
|
"=a" (ret) :
|
|
"d" (port));
|
|
return ret;
|
|
@@ -1429,7 +1429,7 @@ static __inline__ unsigned int
|
|
inl(unsigned short port)
|
|
{
|
|
unsigned int ret;
|
|
- __asm__ __volatile__("in%L0 (%1)" :
|
|
+ __asm__ __volatile__("inl %1,%0" :
|
|
"=a" (ret) :
|
|
"d" (port));
|
|
return ret;
|