[MPlayer-cvslog] r27451 - in trunk/vidix: AsmMacros.h dha.c pci.c sysdep/pci_linux.c

[ben]

Author: ben
Date: Tue Aug 12 01:04:03 2008
New Revision: 27451

Log:
Add proper VIDIX support for SuperH architecture.
Patch by Magnus Damm <magnus dot damm at gmail dot com>.



Modified:
   trunk/vidix/AsmMacros.h
   trunk/vidix/dha.c
   trunk/vidix/pci.c
   trunk/vidix/sysdep/pci_linux.c

Modified: trunk/vidix/AsmMacros.h
==============================================================================
--- trunk/vidix/AsmMacros.h	(original)
+++ trunk/vidix/AsmMacros.h	Tue Aug 12 01:04:03 2008
@@ -77,6 +77,8 @@
 #include "sysdep/AsmMacros_arm32.h"
 #elif defined(__powerpc__)
 #include "sysdep/AsmMacros_powerpc.h"
+#elif defined(__sh__)
+#include <sys/io.h>
 #else
 #include "sysdep/AsmMacros_x86.h"
 #endif

Modified: trunk/vidix/dha.c
==============================================================================
--- trunk/vidix/dha.c	(original)
+++ trunk/vidix/dha.c	Tue Aug 12 01:04:03 2008
@@ -185,7 +185,7 @@ void unmap_phys_mem(void *ptr, unsigned 
 
 #endif /* Generic mmap (not win32, nor os2) */
 
-#if !defined(__alpha__) && !defined(__powerpc__)
+#if !defined(__alpha__) && !defined(__powerpc__) && !defined(__sh__)
 unsigned char INPORT8(unsigned idx)
 {
   return inb(idx);

Modified: trunk/vidix/pci.c
==============================================================================
--- trunk/vidix/pci.c	(original)
+++ trunk/vidix/pci.c	Tue Aug 12 01:04:03 2008
@@ -484,7 +484,7 @@ static int pcibus=-1, pcicard=-1, pcifun
 #include "sysdep/pci_arm32.c"
 #elif defined(__powerpc__)
 #include "sysdep/pci_powerpc.c"
-#elif defined(__x86_64__)
+#elif defined(__x86_64__) || defined(__sh__)
 /* Nothing here right now */
 #else
 #include "sysdep/pci_x86.c"
@@ -628,7 +628,7 @@ int pci_scan(pciinfo_t *pci_list,unsigne
     } while (++pcr._pcibusidx < pcr._pcinumbus);
     }
 
-#if !defined(__alpha__) && !defined(__powerpc__)
+#if !defined(__alpha__) && !defined(__powerpc__) && !defined(__sh__)
     /* Now try pci config 2 probe (deprecated) */
  
     if ((pcr._configtype == 2) || do_mode2_scan) {
@@ -689,7 +689,7 @@ int pci_scan(pciinfo_t *pci_list,unsigne
     outb(PCI_MODE2_ENABLE_REG, 0x00);
     }
  
-#endif /* !__alpha__ && !__powerpc__ */
+#endif /* !__alpha__ && !__powerpc__ && !__sh__ */
  
     disable_os_io();
  

Modified: trunk/vidix/sysdep/pci_linux.c
==============================================================================
--- trunk/vidix/sysdep/pci_linux.c	(original)
+++ trunk/vidix/sysdep/pci_linux.c	Tue Aug 12 01:04:03 2008
@@ -36,6 +36,10 @@ int iopl();
 #endif
 #endif
 
+#ifdef __sh__
+#define iopl(x) 1
+#endif
+
 #include "config.h"
 
 #ifdef CONFIG_DHAHELPER
@@ -141,7 +145,7 @@ static __inline__ int disable_os_io(void
 }
 
 #if (defined(__powerpc__) || defined(__sparc__) || defined(__sparc64__) \
-    || defined(__x86_64__)) && defined(__linux__) && !defined(CONFIG_SVGAHELPER)
+    || defined(__x86_64__) || defined(__sh__)) && defined(__linux__) && !defined(CONFIG_SVGAHELPER)
 #define CONFIG_PCI_LINUX_PROC
 #endif