# HG changeset patch
# User nick
# Date 1019234044 0
# Node ID 567de708ab3ae298ace36249db2e43d17fb52775
# Parent  67f0194f3a8c42bf1f8b6c9e906dd458cf1afa32
sync with mplayerxp

diff -r 67f0194f3a8c -r 567de708ab3a libdha/libdha.c
--- a/libdha/libdha.c	Fri Apr 19 10:56:26 2002 +0000
+++ b/libdha/libdha.c	Fri Apr 19 16:34:04 2002 +0000
@@ -27,6 +27,9 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#ifdef ARCH_ALPHA
+#include <sys/io.h>
+#endif
 #include <unistd.h>
 
 /* instead exit() use libdha_exit, and do the 'mother-application' deinit
@@ -67,8 +70,12 @@
 #include "kernelhelper/dhahelper.h"
 
 static int mem=-1;
-void *map_phys_mem(unsigned base, unsigned size)
+void *map_phys_mem(unsigned long base, unsigned long size)
 {
+#ifdef ARCH_ALPHA
+/* TODO: move it into sysdep */
+  base += bus_base();
+#endif
   if ( (mem = open("/dev/dhahelper",O_RDWR)) < 0)
   {
     if ( (mem = open(DEV_MEM,O_RDWR)) == -1) {
@@ -95,8 +102,12 @@
 #else
 
 static int mem=-1;
-void *map_phys_mem(unsigned base, unsigned size)
+void *map_phys_mem(unsigned long base, unsigned long size)
 {    
+#ifdef ARCH_ALPHA
+/* TODO: move it into sysdep */
+  base += bus_base();
+#endif
   if ( (mem = open(DEV_MEM,O_RDWR)) == -1) {
     perror("libdha: open(/dev/mem) failed") ; exit(1) ;
   }
@@ -104,7 +115,7 @@
 }
 #endif /* CONFIG_DHAHELPER */
 
-void unmap_phys_mem(void *ptr, unsigned size)
+void unmap_phys_mem(void *ptr, unsigned long size)
 {
   int res=munmap(ptr,size) ;
   if (res == -1) { perror("libdha: munmap() failed") ; exit(1) ; }
diff -r 67f0194f3a8c -r 567de708ab3a libdha/libdha.h
--- a/libdha/libdha.h	Fri Apr 19 10:56:26 2002 +0000
+++ b/libdha/libdha.h	Fri Apr 19 16:34:04 2002 +0000
@@ -55,8 +55,8 @@
 extern void          OUTPORT32(unsigned idx,unsigned val);
 #define OUTPORT(idx,val) OUTPORT32(idx,val)
 
-extern void *  map_phys_mem(unsigned base, unsigned size);
-extern void    unmap_phys_mem(void *ptr, unsigned size);
+extern void *  map_phys_mem(unsigned long base, unsigned long size);
+extern void    unmap_phys_mem(void *ptr, unsigned long size);
 
 /*  These are the region types  */
 #define MTRR_TYPE_UNCACHABLE 0
@@ -70,4 +70,4 @@
 }
 #endif
 
-#endif
\ No newline at end of file
+#endif
diff -r 67f0194f3a8c -r 567de708ab3a libdha/pci.c
--- a/libdha/pci.c	Fri Apr 19 10:56:26 2002 +0000
+++ b/libdha/pci.c	Fri Apr 19 16:34:04 2002 +0000
@@ -736,4 +736,4 @@
 int disable_app_io( void )
 {
   return disable_os_io();
-}
\ No newline at end of file
+}
diff -r 67f0194f3a8c -r 567de708ab3a libdha/sysdep/pci_alpha.c
--- a/libdha/sysdep/pci_alpha.c	Fri Apr 19 10:56:26 2002 +0000
+++ b/libdha/sysdep/pci_alpha.c	Fri Apr 19 16:34:04 2002 +0000
@@ -11,7 +11,7 @@
           unsigned char dev,
           int func)
 {
-    int retval;
+    unsigned long retval;
     pciconfig_read(bus, dev<<3, PCI_ID_REG, 4, &retval);
     return retval;
 }
@@ -22,7 +22,7 @@
           int func, 
           unsigned cmd)
 {
-    long retval;
+    unsigned long retval;
     pciconfig_read(bus, dev<<3, cmd, 4, &retval);
     return retval;
 }