Improved readability and new stuffs

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4165 b3059339-0415-0410-9bf9-f77b7e298cf2

30 files changed, 1394 insertions, 960 deletions

diff --git a/libdha/AsmMacros.h b/libdha/AsmMacros.h
index 3a1a9a5e52..5e4e1addc4 100644
--- a/libdha/AsmMacros.h
+++ b/libdha/AsmMacros.h
@@ -59,347 +59,25 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/AsmMacros.h,v 1.1 2001/11/16 21:13:34 tsi Exp $ */
 
+/*
+ *   Modified for readability by Nick Kurshev
+*/
+
 #if defined(__GNUC__)
-#if defined(linux) && (defined(__alpha__) || defined(__ia64__))
-#include <sys/io.h>
+#if defined(__alpha__)
+#include "sysdep/AsmMacros_alpha.h"
+#elif defined(__ia64__)
+#include "sysdep/AsmMacros_ia64.h"
+#elif defined(__sparc__)
+#include "sysdep/AsmMacros_sparc.h"
+#elif defined( __arm32__ )
+#include "sysdep/AsmMacros_arm32.h"
+#elif defined(__powerpc__)
+#include "sysdep/AsmMacros_powerpc.h"
 #else
-#if defined(__sparc__)
-#ifndef ASI_PL
-#define ASI_PL 0x88
+#include "sysdep/AsmMacros_x86.h"
 #endif
 
-static __inline__ void
-outb(port, val)
-unsigned long port;
-char val;
-{
-  __asm__ __volatile__("stba %0, [%1] %2" : : "r" (val), "r" (port), "i" (ASI_PL));
-}
-
-static __inline__ void
-outw(port, val)
-unsigned long port;
-char val;
-{
-  __asm__ __volatile__("stha %0, [%1] %2" : : "r" (val), "r" (port), "i" (ASI_PL));
-}
-
-static __inline__ void
-outl(port, val)
-unsigned long port;
-char val;
-{
-  __asm__ __volatile__("sta %0, [%1] %2" : : "r" (val), "r" (port), "i" (ASI_PL));
-}
-
-static __inline__ unsigned int
-inb(port)
-unsigned long port;
-{
-   unsigned char ret;
-   __asm__ __volatile__("lduba [%1] %2, %0" : "=r" (ret) : "r" (port), "i" (ASI_PL));
-   return ret;
-}
-
-static __inline__ unsigned int
-inw(port)
-unsigned long port;
-{
-   unsigned char ret;
-   __asm__ __volatile__("lduha [%1] %2, %0" : "=r" (ret) : "r" (port), "i" (ASI_PL));
-   return ret;
-}
-
-static __inline__ unsigned int
-inl(port)
-unsigned long port;
-{
-   unsigned char ret;
-   __asm__ __volatile__("lda [%1] %2, %0" : "=r" (ret) : "r" (port), "i" (ASI_PL));
-   return ret;
-}
-#else
-#ifdef __arm32__
-unsigned int IOPortBase;  /* Memory mapped I/O port area */
-
-static __inline__ void
-outb(port, val)
-     short port;
-     char val;
-{
-	 if ((unsigned short)port >= 0x400) return;
-
-	*(volatile unsigned char*)(((unsigned short)(port))+IOPortBase) = val;
-}
-
-static __inline__ void
-outw(port, val)
-     short port;
-     short val;
-{
-	 if ((unsigned short)port >= 0x400) return;
-
-	*(volatile unsigned short*)(((unsigned short)(port))+IOPortBase) = val;
-}
-
-static __inline__ void
-outl(port, val)
-     short port;
-     int val;
-{
-	 if ((unsigned short)port >= 0x400) return;
-
-	*(volatile unsigned long*)(((unsigned short)(port))+IOPortBase) = val;
-}
-
-static __inline__ unsigned int
-inb(port)
-     short port;
-{
-	 if ((unsigned short)port >= 0x400) return((unsigned int)-1);
-
-	return(*(volatile unsigned char*)(((unsigned short)(port))+IOPortBase));
-}
-
-static __inline__ unsigned int
-inw(port)
-     short port;
-{
-	 if ((unsigned short)port >= 0x400) return((unsigned int)-1);
-
-	return(*(volatile unsigned short*)(((unsigned short)(port))+IOPortBase));
-}
-
-static __inline__ unsigned int
-inl(port)
-     short port;
-{
-	 if ((unsigned short)port >= 0x400) return((unsigned int)-1);
-
-	return(*(volatile unsigned long*)(((unsigned short)(port))+IOPortBase));
-}
-#else /* __arm32__ */
-#if defined(Lynx) && defined(__powerpc__)
-extern unsigned char *ioBase;
-
-static volatile void
-eieio()
-{
-	__asm__ __volatile__ ("eieio");
-}
-
-static void
-outb(port, value)
-short port;
-unsigned char value;
-{
-	*(uchar *)(ioBase + port) = value; eieio();
-}
-
-static void
-outw(port, value)
-short port;
-unsigned short value;
-{
-	*(unsigned short *)(ioBase + port) = value; eieio();
-}
-
-static void
-outl(port, value)
-short port;
-unsigned long value;
-{
-	*(unsigned long *)(ioBase + port) = value; eieio();
-}
-
-static unsigned char
-inb(port)
-short port;
-{
-	unsigned char val;
-
-	val = *((unsigned char *)(ioBase + port)); eieio();
-	return(val);
-}
-
-static unsigned short
-inw(port)
-short port;
-{
-	unsigned short val;
-
-	val = *((unsigned short *)(ioBase + port)); eieio();
-	return(val);
-}
-
-static unsigned long
-inl(port)
-short port;
-{
-	unsigned long val;
-
-	val = *((unsigned long *)(ioBase + port)); eieio();
-	return(val);
-}
-
-#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)
-short port;
-char val;
-{
-   __asm__ __volatile__("outb %0,%1" : :"a" (val), "d" (port));
-}
-
-static __inline__ void
-outw(port, val)
-short port;
-short val;
-{
-   __asm__ __volatile__("outw %0,%1" : :"a" (val), "d" (port));
-}
-
-static __inline__ void
-outl(port, val)
-short port;
-unsigned int val;
-{
-   __asm__ __volatile__("outl %0,%1" : :"a" (val), "d" (port));
-}
-
-static __inline__ unsigned int
-inb(port)
-short port;
-{
-   unsigned char ret;
-   __asm__ __volatile__("inb %1,%0" :
-       "=a" (ret) :
-       "d" (port));
-   return ret;
-}
-
-static __inline__ unsigned int
-inw(port)
-short port;
-{
-   unsigned short ret;
-   __asm__ __volatile__("inw %1,%0" :
-       "=a" (ret) :
-       "d" (port));
-   return ret;
-}
-
-static __inline__ unsigned int
-inl(port)
-short port;
-{
-   unsigned int ret;
-   __asm__ __volatile__("inl %1,%0" :
-       "=a" (ret) :
-       "d" (port));
-   return ret;
-}
-
-#else /* GCCUSESGAS */
-
-static __inline__ void
-outb(port, val)
-     short port;
-     char val;
-{
-  __asm__ __volatile__("out%B0 (%1)" : :"a" (val), "d" (port));
-}
-
-static __inline__ void
-outw(port, val)
-     short port;
-     short val;
-{
-  __asm__ __volatile__("out%W0 (%1)" : :"a" (val), "d" (port));
-}
-
-static __inline__ void
-outl(port, val)
-     short port;
-     unsigned int val;
-{
-  __asm__ __volatile__("out%L0 (%1)" : :"a" (val), "d" (port));
-}
-
-static __inline__ unsigned int
-inb(port)
-     short port;
-{
-  unsigned int ret;
-  __asm__ __volatile__("in%B0 (%1)" :
-                   "=a" (ret) :
-                   "d" (port));
-  return ret;
-}
-
-static __inline__ unsigned int
-inw(port)
-     short port;
-{
-  unsigned int ret;
-  __asm__ __volatile__("in%W0 (%1)" :
-                   "=a" (ret) :
-                   "d" (port));
-  return ret;
-}
-
-static __inline__ unsigned int
-inl(port)
-     short port;
-{
-  unsigned int ret;
-  __asm__ __volatile__("in%L0 (%1)" :
-                   "=a" (ret) :
-                   "d" (port));
-  return ret;
-}
-
-#endif /* GCCUSESGAS */
-#endif /* Lynx && __powerpc__ */
-#endif /* arm32 */
-#endif /* linux && __sparc__ */
-#endif /* linux && __alpha__ */
-#endif /* __FreeBSD__ && __alpha__ */
-
-#if defined(linux) || defined(__arm32__) || (defined(Lynx) && defined(__powerpc__))
-
-#define intr_disable()
-#define intr_enable()
-
-#else 
-
-static __inline__ void
-intr_disable()
-{
-  __asm__ __volatile__("cli");
-}
-
-static __inline__ void
-intr_enable()
-{
-  __asm__ __volatile__("sti");
-}
-
-#endif /* else !linux && !__arm32__ */
-
 #else /* __GNUC__ */
 
 #if defined(_MINIX) && defined(_ACK)
diff --git a/libdha/libdha.c b/libdha/libdha.c
index 923ed766d4..ddd27aca5e 100644
--- a/libdha/libdha.c
+++ b/libdha/libdha.c
@@ -26,87 +26,38 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#ifdef _WIN32
-// MAPDEV.h - include file for VxD MAPDEV
-// Copyright (c) 1996 Vireo Software, Inc.
-
-#include <windows.h>
-
-// This is the request structure that applications use
-// to request services from the MAPDEV VxD.
-
-typedef struct _MapDevRequest
-{
-	DWORD	mdr_ServiceID;			// supplied by caller
-	LPVOID	mdr_PhysicalAddress;	// supplied by caller
-	DWORD	mdr_SizeInBytes;		// supplied by caller
-	LPVOID	mdr_LinearAddress;		// returned by VxD
-	WORD	mdr_Selector;			// returned if 16-bit caller
-	WORD	mdr_Status;				// MDR_xxxx code below
-} MAPDEVREQUEST, *PMAPDEVREQUEST;
-
-#define MDR_SERVICE_MAP		CTL_CODE(FILE_DEVICE_UNKNOWN, 1, METHOD_NEITHER, FILE_ANY_ACCESS)
-#define MDR_SERVICE_UNMAP	CTL_CODE(FILE_DEVICE_UNKNOWN, 2, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-#define MDR_STATUS_SUCCESS	1
-#define MDR_STATUS_ERROR	0
-/*#include "winioctl.h"*/
-#define FILE_DEVICE_UNKNOWN             0x00000022
-#define METHOD_NEITHER                  3
-#define FILE_ANY_ACCESS                 0
-#define CTL_CODE( DeviceType, Function, Method, Access ) ( \
-    ((DeviceType)<<16) | ((Access)<<14) | ((Function)<<2) | (Method) )
-
-/* Memory Map a piece of Real Memory */
-void *map_phys_mem(unsigned base, unsigned size) {
-
-  HANDLE hDevice ;
-  PVOID inBuf[1] ;		/* buffer for struct pointer to VxD */
-  DWORD RetInfo[2] ;		/* buffer to receive data from VxD */
-  DWORD cbBytesReturned ;	/* count of bytes returned from VxD */
-  MAPDEVREQUEST req ;		/* map device request structure */
-  DWORD *pNicstar, Status, Time ; int i ; char *endptr ;
-  const PCHAR VxDName = "\\\\.\\MAPDEV.VXD" ;
-  const PCHAR VxDNameAlreadyLoaded = "\\\\.\\MAPDEV" ;
-
-  hDevice = CreateFile(VxDName, 0,0,0,
-                       CREATE_NEW, FILE_FLAG_DELETE_ON_CLOSE, 0) ;
-  if (hDevice == INVALID_HANDLE_VALUE)
-    hDevice = CreateFile(VxDNameAlreadyLoaded, 0,0,0,
-                         CREATE_NEW, FILE_FLAG_DELETE_ON_CLOSE, 0) ;
-  if (hDevice == INVALID_HANDLE_VALUE) {
-    fprintf(stderr, "Cannot open driver, error=%08lx\n", GetLastError()) ;
-    exit(1) ; }
-
-  req.mdr_ServiceID = MDR_SERVICE_MAP ;
-  req.mdr_PhysicalAddress = (PVOID)base ;
-  req.mdr_SizeInBytes = size ;
-  inBuf[0] = &req ;
-
-  if ( ! DeviceIoControl(hDevice, MDR_SERVICE_MAP, inBuf, sizeof(PVOID),
-         NULL, 0, &cbBytesReturned, NULL) ) {
-    fprintf(stderr, "Failed to map device\n") ; exit(1) ; }
-
-  return (void*)req.mdr_LinearAddress ;
-}
-
-void unmap_phys_mem(void *ptr, unsigned size) { }
-
+#if defined(_WIN32)
+#include "sysdep/libdha_win32.c"
+#elif defined (__EMX__)
+#include "sysdep/libdha_os2.c"
 #else
+
+#if defined(SVR4) || defined(SCO325)
+#  if !(defined(sun) && defined (i386) && defined (SVR4))
+#    define DEV_MEM "/dev/pmem"
+#  elif defined(PowerMAX_OS)
+#    define DEV_MEM "/dev/iomem"
+#  endif
+#  ifdef SCO325
+#   undef DEV_MEM
+#   define DEV_MEM "/dev/mem"
+#  endif
+# endif /* SVR4 */
+
+/* Generic version */
 #include <sys/mman.h>
 
+#ifndef DEV_MEM
+#define DEV_MEM "/dev/mem"
+#endif
+
 static int mem=-1;
 void *map_phys_mem(unsigned base, unsigned size)
 {
-  void *ptr;
-  if ( (mem = open("/dev/mem",O_RDWR)) == -1) {
+  if ( (mem = open(DEV_MEM,O_RDWR)) == -1) {
     perror("libdha: open(/dev/mem) failed") ; exit(1) ;
   }
-  ptr=mmap(0,size,PROT_READ|PROT_WRITE,MAP_SHARED,mem,base) ;
-  if ((int)ptr == -1) {
-    perror("libdha: mmap() failed") ; exit(1) ;
-  }
-  return ptr;
+  return mmap(0,size,PROT_READ|PROT_WRITE,MAP_SHARED,mem,base) ;
 }
 
 void unmap_phys_mem(void *ptr, unsigned size)
diff --git a/libdha/pci.c b/libdha/pci.c
index 2daa48c36a..74efb96611 100644
--- a/libdha/pci.c
+++ b/libdha/pci.c
@@ -2,26 +2,6 @@
    (C) 2002 - library implementation by Nick Kyrshev
    XFree86 3.3.3 scanpci.c, modified for GATOS/win/gfxdump by Øyvind Aabling.
  */
- 
-#include "libdha.h"
- 
-#include <errno.h>
-#include <string.h>
-#include "AsmMacros.h"
-#ifdef __unix__
-#include <unistd.h>
-#include <sys/mman.h>
-#elif defined ( _WIN32 )
-#include <windows.h>
-#else
-#include <dos.h>
-#endif
- 
-#define outb	pcioutb
-#define outl	pcioutl
-#define inb	pciinb
-#define inl	pciinl
- 
 /* $XConsortium: scanpci.c /main/25 1996/10/27 11:48:40 kaleb $ */
 /*
  *  name:             scanpci.c
@@ -71,34 +51,47 @@
  *
  */
  
-#if defined(__SVR4)
-#if !defined(SVR4)
-#define SVR4
-#endif
-#endif
- 
-#ifdef __EMX__
-#define INCL_DOSFILEMGR
-#include <os2.h>
-#endif
- 
+#include "libdha.h"
+#include <errno.h>
+#include <string.h>
 #include <stdio.h>
-#include <sys/types.h>
-#if defined(SVR4)
-#if defined(sun)
-#ifndef __EXTENSIONS__
-#define __EXTENSIONS__
+#ifdef __unix__
+#include <unistd.h>
 #endif
+#include "AsmMacros.h"
+/* OS depended stuff */
+#if defined (linux)
+#include "sysdep/pci_linux.c"
+#elif defined (__FreeBSD__)
+#include "sysdep/pci_freebsd.c"
+#elif defined (__386BSD__)
+#include "sysdep/pci_386bsd.c"
+#elif defined (__NetBSD__)
+#include "sysdep/pci_netbsd.c"
+#elif defined (__OpenBSD__)
+#include "sysdep/pci_openbsd.c"
+#elif defined (__bsdi__)
+#include "sysdep/pci_bsdi.c"
+#elif defined (Lynx)
+#include "sysdep/pci_lynx.c"
+#elif defined (MACH386)
+#include "sysdep/pci_mach386.c"
+#elif defined (__SVR4)
+#if !defined(SVR4)
+#define SVR4
 #endif
-#include <sys/proc.h>
-#include <sys/tss.h>
-#if defined(NCR)
-#define __STDC
-#include <sys/sysi86.h>
-#undef __STDC
-#else
-#include <sys/sysi86.h>
+#include "sysdep/pci_svr4.c"
+#elif defined (SCO)
+#include "sysdep/pci_sco.c"
+#elif defined (ISC)
+#include "sysdep/pci_isc.c"
+#elif defined (__EMX__)
+#include "sysdep/pci_os2.c"
+#elif defined (_WIN32)
+#include "sysdep/pci_win32.c"
 #endif
+
+#if 0
 #if defined(__SUNPRO_C) || defined(sun) || defined(__sun)
 #include <sys/psw.h>
 #else
@@ -106,186 +99,7 @@
 #endif
 #include <sys/v86.h>
 #endif
-#if defined(__FreeBSD__) || defined(__386BSD__)
-#include <sys/file.h>
-#include <machine/console.h>
-#ifndef GCCUSESGAS
-#define GCCUSESGAS
-#endif
-#endif
-#if defined(__NetBSD__)
-#include <sys/param.h>
-#include <sys/file.h>
-#include <machine/sysarch.h>
-#ifndef GCCUSESGAS
-#define GCCUSESGAS
-#endif
-#endif
-#if defined(__bsdi__)
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#include <i386/isa/pcconsioctl.h>
-#ifndef GCCUSESGAS
-#define GCCUSESGAS
-#endif
-#endif
-#if defined(SCO) || defined(ISC)
-#ifndef ISC
-#include <sys/console.h>
-#endif
-#include <sys/param.h>
-#include <sys/immu.h>
-#include <sys/region.h>
-#include <sys/proc.h>
-#include <sys/tss.h>
-#include <sys/sysi86.h>
-#include <sys/v86.h>
-#endif
-#if defined(Lynx_22)
-#ifndef GCCUSESGAS
-#define GCCUSESGAS
-#endif
-#endif
- 
- 
-#if defined(__WATCOMC__)
- 
-#include <stdlib.h>
-static void outl(unsigned port, unsigned data);
-#pragma aux outl =  "out    dx, eax" parm [dx] [eax];
-static void outb(unsigned port, unsigned data);
-#pragma aux outb = "out    dx, al" parm [dx] [eax];
-static unsigned inl(unsigned port);
-#pragma aux inl = "in     eax, dx" parm [dx];
-static unsigned inb(unsigned port);
-#pragma aux inb = "xor    eax,eax" "in     al, dx" parm [dx];
  
-#else /* __WATCOMC__ */
- 
-#if defined(__GNUC__)
- 
-#if !defined(__alpha__) && !defined(__powerpc__)
-#if defined(GCCUSESGAS)
-#define OUTB_GCC "outb %0,%1"
-#define OUTL_GCC "outl %0,%1"
-#define INB_GCC  "inb %1,%0"
-#define INL_GCC  "inl %1,%0"
-#else
-#define OUTB_GCC "out%B0 (%1)"
-#define OUTL_GCC "out%L0 (%1)"
-#define INB_GCC "in%B0 (%1)"
-#define INL_GCC "in%L0 (%1)"
-#endif /* GCCUSESGAS */
- 
-static void outb(unsigned short port, unsigned char val) {
-     __asm__ __volatile__(OUTB_GCC : :"a" (val), "d" (port)); }
-static void outl(unsigned short port, unsigned long val) {
-     __asm__ __volatile__(OUTL_GCC : :"a" (val), "d" (port)); }
-static unsigned char inb(unsigned short port) { unsigned char ret;
-     __asm__ __volatile__(INB_GCC : "=a" (ret) : "d" (port)); return ret; }
-static unsigned long inl(unsigned short port) { unsigned long ret;
-     __asm__ __volatile__(INL_GCC : "=a" (ret) : "d" (port)); return ret; }
- 
-#endif /* !defined(__alpha__) && !defined(__powerpc__) */
-#else  /* __GNUC__ */
- 
-#if defined(__STDC__) && (__STDC__ == 1)
-# if !defined(NCR)
-#  define asm __asm
-# endif
-#endif
- 
-#if defined(__SUNPRO_C)
-/*
- * This section is a gross hack in if you tell anyone that I wrote it,
- * I'll deny it.  :-)
- * The leave/ret instructions are the big hack to leave %eax alone on return.
- */
-static unsigned char inb(int port) {
-		asm("	movl 8(%esp),%edx");
-		asm("	subl %eax,%eax");
-		asm("	inb  (%dx)");
-		asm("	leave");
-		asm("	ret");
-	}
- 
-static unsigned short inw(int port) {
-		asm("	movl 8(%esp),%edx");
-		asm("	subl %eax,%eax");
-		asm("	inw  (%dx)");
-		asm("	leave");
-		asm("	ret");
-	}
- 
-static unsigned long inl(int port) {
-		asm("	movl 8(%esp),%edx");
-		asm("	inl  (%dx)");
-		asm("	leave");
-		asm("	ret");
-	}
- 
-static void outb(int port, unsigned char value) {
-		asm("	movl 8(%esp),%edx");
-		asm("	movl 12(%esp),%eax");
-		asm("	outb (%dx)");
-	}
- 
-static void outw(int port, unsigned short value) {
-		asm("	movl 8(%esp),%edx");
-		asm("	movl 12(%esp),%eax");
-		asm("	outw (%dx)");
-	}
- 
-static void outl(int port, unsigned long value) {
-		asm("	movl 8(%esp),%edx");
-		asm("	movl 12(%esp),%eax");
-		asm("	outl (%dx)");
-	}
-#else
- 
-#if defined(SVR4)
-# if !defined(__USLC__)
-#  define __USLC__
-# endif
-#endif
- 
-#ifdef __unix__
-#ifndef SCO325
-# include <sys/inline.h>
-#else
-# include "scoasm.h"
-#endif
-#endif
- 
-#endif /* SUNPRO_C */
- 
-#endif /* __GNUC__ */
-#endif /* __WATCOMC__ */
- 
-#undef outb
-#undef outl
-#undef inb
-#undef inl
- 
-#if defined(__GLIBC__) && __GLIBC__ >= 2
-#if defined(linux)
-#ifdef __i386__
-#include <sys/perm.h>
-#else
-#include <sys/io.h>
-#endif
-#endif
-#endif
- 
-#if defined(__alpha__)
-#if defined(linux)
-#include <asm/unistd.h>
-#define BUS(tag) (((tag)>>16)&0xff)
-#define DFN(tag) (((tag)>>8)&0xff)
-#else
-Generate compiler error - scanpci unsupported on non-linux alpha platforms
-#endif /* linux */
-#endif /* __alpha__ */
 #if defined(Lynx) && defined(__powerpc__)
 /* let's mimick the Linux Alpha stuff for LynxOS so we don't have
  * to change too much code
@@ -635,7 +449,6 @@ struct pci_config_reg {
 #define MAX_PCI_DEVICES         64
 #define NF ((void (*)())NULL), { 0.0, 0, 0, NULL }
 #define PCI_MULTIFUNC_DEV	0x80
-#if defined(__alpha__) || defined(__powerpc__)
 #define PCI_ID_REG              0x00
 #define PCI_CMD_STAT_REG        0x04
 #define PCI_CLASS_REG           0x08
@@ -644,7 +457,6 @@ struct pci_config_reg {
 #define PCI_MAP_ROM_REG         0x30
 #define PCI_INTERRUPT_REG       0x3C
 #define PCI_REG_USERCONFIG      0x40
-#endif
  
 static int pcibus=-1, pcicard=-1, pcifunc=-1 ;
 /*static struct pci_device *pcidev=NULL ;*/
@@ -664,6 +476,22 @@ static int pcibus=-1, pcicard=-1, pcifunc=-1 ;
 #else
 #define	PCI_MODE2_FORWARD_REG		0xCFA
 #endif
+
+/* cpu depended stuff */
+#if defined(__alpha__)
+#include "sysdep/pci_alpha.c"
+#elif defined(__ia64__)
+#include "sysdep/pci_ia64.c"
+#elif defined(__sparc__)
+#include "sysdep/pci_sparc.c"
+#elif defined( __arm32__ )
+#include "sysdep/pci_arm32.c"
+#elif defined(__powerpc__)
+#include "sysdep/pci_powerpc.c"
+#else
+#include "sysdep/pci_x86.c"
+#endif
+
  
 static int pcicards=0 ;
 static pciinfo_t *pci_lst;
@@ -693,168 +521,9 @@ static void identify_card(struct pci_config_reg *pcr)
   pcicards++;
 }
 
-static int io_fd;
-#ifdef __EMX__
-static USHORT callgate[3] = {0,0,0};
-#endif
- 
-static void enable_os_io(void)
-{
-    io_fd = -1 ;
-#if defined(SVR4) || defined(SCO) || defined(ISC)
-#if defined(SI86IOPL)
-    sysi86(SI86IOPL, 3);
-#else
-    sysi86(SI86V86, V86SC_IOPL, PS_IOPL);
-#endif
-#endif
-#if defined(linux)
-    iopl(3);
-#endif
-#if defined(__FreeBSD__)  || defined(__386BSD__) || defined(__bsdi__)
-    if ((io_fd = open("/dev/console", O_RDWR, 0)) < 0) {
-        perror("/dev/console");
-        exit(1);
-    }
-#if defined(__FreeBSD__)  || defined(__386BSD__)
-    if (ioctl(io_fd, KDENABIO, 0) < 0) {
-        perror("ioctl(KDENABIO)");
-        exit(1);
-    }
-#endif
-#if defined(__bsdi__)
-    if (ioctl(io_fd, PCCONENABIOPL, 0) < 0) {
-        perror("ioctl(PCCONENABIOPL)");
-        exit(1);
-    }
-#endif
-#endif
-#if defined(__NetBSD__)
-#if !defined(USE_I386_IOPL)
-    if ((io_fd = open("/dev/io", O_RDWR, 0)) < 0) {
-	perror("/dev/io");
-	exit(1);
-    }
-#else
-    if (i386_iopl(1) < 0) {
-	perror("i386_iopl");
-	exit(1);
-    }
-#endif /* USE_I386_IOPL */
-#endif /* __NetBSD__ */
-#if defined(__OpenBSD__)
-    if (i386_iopl(1) < 0) {
-	perror("i386_iopl");
-	exit(1);
-    }
-#endif /* __OpenBSD__ */
-#if defined(MACH386)
-    if ((io_fd = open("/dev/iopl", O_RDWR, 0)) < 0) {
-        perror("/dev/iopl");
-        exit(1);
-    }
-#endif
-#ifdef __EMX__
-    {
-	HFILE hfd;
-	ULONG dlen,action;
-	APIRET rc;
-	static char *ioDrvPath = "/dev/fastio$";
- 
-	if (DosOpen((PSZ)ioDrvPath, (PHFILE)&hfd, (PULONG)&action,
-	   (ULONG)0, FILE_SYSTEM, FILE_OPEN,
-	   OPEN_SHARE_DENYNONE|OPEN_FLAGS_NOINHERIT|OPEN_ACCESS_READONLY,
-	   (ULONG)0) != 0) {
-		fprintf(stderr,"Error opening fastio$ driver...\n");
-		fprintf(stderr,"Please install xf86sup.sys in config.sys!\n");
-		exit(42);
-	}
-	callgate[0] = callgate[1] = 0;
- 
-/* Get callgate from driver for fast io to ports and other stuff */
- 
-	rc = DosDevIOCtl(hfd, (ULONG)0x76, (ULONG)0x64,
-		NULL, 0, NULL,
-		(ULONG*)&callgate[2], sizeof(USHORT), &dlen);
-	if (rc) {
-		fprintf(stderr,"xf86-OS/2: EnableIOPorts failed, rc=%d, dlen=%d; emergency exit\n",
-			rc,dlen);
-		DosClose(hfd);
-		exit(42);
-	}
- 
-/* Calling callgate with function 13 sets IOPL for the program */
- 
-	asm volatile ("movl $13,%%ebx;.byte 0xff,0x1d;.long _callgate"
-			: /*no outputs */
-			: /*no inputs */
-			: "eax","ebx","ecx","edx","cc");
- 
-        DosClose(hfd);
-   }
-#endif
-#if defined(Lynx) && defined(__powerpc__)
-    pciConfBase = (unsigned char *) smem_create("PCI-CONF",
-    	    (char *)0x80800000, 64*1024, SM_READ|SM_WRITE);
-    if (pciConfBase == (void *) -1)
-        exit(1);
-#endif
-}
- 
- 
-static void disable_os_io(void)
-{
-#if defined(SVR4) || defined(SCO) || defined(ISC)
-#if defined(SI86IOPL)
-    sysi86(SI86IOPL, 0);
-#else
-    sysi86(SI86V86, V86SC_IOPL, 0);
-#endif
-#endif
-#if defined(linux)
-    iopl(0);
-#endif
-#if defined(__FreeBSD__)  || defined(__386BSD__)
-    if (ioctl(io_fd, KDDISABIO, 0) < 0) {
-        perror("ioctl(KDDISABIO)");
-	close(io_fd);
-        exit(1);
-    }
-    close(io_fd);
-#endif
-#if defined(__NetBSD__)
-#if !defined(USE_I386_IOPL)
-    close(io_fd);
-#else
-    if (i386_iopl(0) < 0) {
-	perror("i386_iopl");
-	exit(1);
-    }
-#endif /* NetBSD1_1 */
-#endif /* __NetBSD__ */
-#if defined(__bsdi__)
-    if (ioctl(io_fd, PCCONDISABIOPL, 0) < 0) {
-        perror("ioctl(PCCONDISABIOPL)");
-	close(io_fd);
-        exit(1);
-    }
-    close(io_fd);
-#endif
-#if defined(MACH386)
-    close(io_fd);
-#endif
-#if defined(Lynx) && defined(__powerpc__)
-    smem_create(NULL, (char *) pciConfBase, 0, SM_DETACH);
-    smem_remove("PCI-CONF");
-    pciConfBase = NULL;
-#endif
-}
- 
 /*main(int argc, char *argv[])*/
 int pci_scan(pciinfo_t *pci_list,unsigned *num_pci)
 {
-    unsigned long tmplong1, tmplong2, config_cmd;
-    unsigned char tmp1, tmp2;
     unsigned int idx;
     struct pci_config_reg pcr;
     int do_mode1_scan = 0, do_mode2_scan = 0;
@@ -863,