[Mplayer-cvslog] CVS: main/libdha pci.c,1.1,1.2 AsmMacros.h,1.2,1.3

[Nick Kurshev]

Update of /cvsroot/mplayer/main/libdha
In directory mplayer:/var/tmp.root/cvs-serv18482/main/libdha

Modified Files:
	pci.c AsmMacros.h 
Log Message:
Alpha patch by Falk Hueffner <falk.hueffner at student.uni-tuebingen.de>

Index: pci.c
===================================================================
RCS file: /cvsroot/mplayer/main/libdha/pci.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pci.c	4 Jan 2002 10:32:26 -0000	1.1
+++ pci.c	12 Jan 2002 18:00:25 -0000	1.2
@@ -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 */

Index: AsmMacros.h
===================================================================
RCS file: /cvsroot/mplayer/main/libdha/AsmMacros.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AsmMacros.h	12 Jan 2002 09:40:07 -0000	1.2
+++ AsmMacros.h	12 Jan 2002 18:00:25 -0000	1.3
@@ -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