diff options
| author | nick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-12 09:40:07 +0000 |
|---|---|---|
| committer | nick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-12 09:40:07 +0000 |
| commit | fb1daa65aba947c37657cff7c99b05fa50db1840 (patch) | |
| tree | a775cfc11994cc63f25ca6b03dc56191dd136222 /libdha | |
| parent | 13f9d6e928651d2ec2754d5c6f77fe24f1bdaae3 (diff) | |
| download | mpv-fb1daa65aba947c37657cff7c99b05fa50db1840.tar.bz2 mpv-fb1daa65aba947c37657cff7c99b05fa50db1840.tar.xz | |
Sync with XFree86-4.1.99.5+
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4103 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libdha')
| -rw-r--r-- | libdha/AsmMacros.h | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/libdha/AsmMacros.h b/libdha/AsmMacros.h index bb6742228d..feb5ce02d1 100644 --- a/libdha/AsmMacros.h +++ b/libdha/AsmMacros.h @@ -57,13 +57,16 @@ * */ - - - -/* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/AsmMacros.h,v 3.13 1999/03/28 15:32:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/AsmMacros.h,v 1.1 2001/11/16 21:13:34 tsi Exp $ */ #if defined(__GNUC__) -#if defined(linux) && defined(__alpha__) +#if defined(linux) && (defined(__alpha__) || defined(__ia64__)) +#undef inb +#undef inw +#undef inl +#undef outb +#undef outw +#undef outl #define inb _inb #define inw _inw #define inl _inl @@ -251,6 +254,18 @@ short port; } #else +#if defined(__FreeBSD__) && defined(__alpha__) + +#include <sys/types.h> + +extern void outb(u_int32_t port, u_int8_t val); +extern void outw(u_int32_t port, u_int16_t val); +extern void outl(u_int32_t port, u_int32_t val); +extern u_int8_t inb(u_int32_t port); +extern u_int16_t inw(u_int32_t port); +extern u_int32_t inl(u_int32_t port); + +#else #ifdef GCCUSESGAS static __inline__ void outb(port, val) @@ -373,6 +388,7 @@ inl(port) #endif /* arm32 */ #endif /* linux && __sparc__ */ #endif /* linux && __alpha__ */ +#endif /* __FreeBSD__ && __alpha__ */ #if defined(linux) || defined(__arm32__) || (defined(Lynx) && defined(__powerpc__)) |