# HG changeset patch
# User nick
# Date 1010858425 0
# Node ID 3822582553d6c1ceaf0a01ab5685e5fa41c7484e
# Parent  0fc9488c87ef44c0d3054f978ebea70f7d74a650
Alpha patch by Falk Hueffner <falk.hueffner@student.uni-tuebingen.de>

diff -r 0fc9488c87ef -r 3822582553d6 libdha/AsmMacros.h
--- a/libdha/AsmMacros.h	Sat Jan 12 17:59:22 2002 +0000
+++ b/libdha/AsmMacros.h	Sat Jan 12 18:00:25 2002 +0000
@@ -61,18 +61,7 @@
 
 #if defined(__GNUC__)
 #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
-#define outb(p,v) _outb((v),(p))
-#define outw(p,v) _outw((v),(p))
-#define outl(p,v) _outl((v),(p))
+#include <sys/io.h>
 #else
 #if defined(__sparc__)
 #ifndef ASI_PL
diff -r 0fc9488c87ef -r 3822582553d6 libdha/pci.c
--- a/libdha/pci.c	Sat Jan 12 17:59:22 2002 +0000
+++ b/libdha/pci.c	Sat Jan 12 18:00:25 2002 +0000
@@ -269,7 +269,11 @@
  
 #if defined(__GLIBC__) && __GLIBC__ >= 2
 #if defined(linux)
+#ifdef __i386__
 #include <sys/perm.h>
+#else
+#include <sys/io.h>
+#endif
 #endif
 #endif
  
@@ -278,25 +282,6 @@
 #include <asm/unistd.h>
 #define BUS(tag) (((tag)>>16)&0xff)
 #define DFN(tag) (((tag)>>8)&0xff)
-static int pciconfig_read(
-          unsigned char bus,
-          unsigned char dfn,
-          unsigned char off,
-          unsigned char len,
-          void * buf)
-{
-  return syscall(__NR_pciconfig_read, bus, dfn, off, len, buf);
-}
-
-static int pciconfig_write(
-          unsigned char bus,
-          unsigned char dfn,
-          unsigned char off,
-          unsigned char len,
-          void * buf)
-{
-  return syscall(__NR_pciconfig_write, bus, dfn, off, len, buf);
-}
 #else
 Generate compiler error - scanpci unsupported on non-linux alpha platforms
 #endif /* linux */