diff options
| author | faust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-10-02 14:48:17 +0000 |
|---|---|---|
| committer | faust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-10-02 14:48:17 +0000 |
| commit | ffc103b06affff961287e887662c78ae3ad92082 (patch) | |
| tree | 7c9e1b66f8128ffad2f8bd63b7ab5ffc109ac30f /libdha | |
| parent | 8a74c24c1a820b0c4745883e2993a554a3817d41 (diff) | |
| download | mpv-ffc103b06affff961287e887662c78ae3ad92082.tar.bz2 mpv-ffc103b06affff961287e887662c78ae3ad92082.tar.xz | |
port libdha to mingw
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10981 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libdha')
| -rw-r--r-- | libdha/libdha.c | 3 | ||||
| -rw-r--r-- | libdha/pci.c | 3 | ||||
| -rw-r--r-- | libdha/sysdep/AsmMacros_x86.h | 8 | ||||
| -rw-r--r-- | libdha/sysdep/libdha_win32.c | 6 |
4 files changed, 11 insertions, 9 deletions
diff --git a/libdha/libdha.c b/libdha/libdha.c index 8771147017..fa8efe75ee 100644 --- a/libdha/libdha.c +++ b/libdha/libdha.c @@ -126,7 +126,6 @@ dev_mem_way: mmap: return mmap(0,size,PROT_READ|PROT_WRITE,MAP_SHARED,mem_fd,base); } -#endif /* Generic mmap (not win32, nor os2) */ void unmap_phys_mem(void *ptr, unsigned long size) { @@ -144,6 +143,8 @@ void unmap_phys_mem(void *ptr, unsigned long size) return; } +#endif /* Generic mmap (not win32, nor os2) */ + unsigned char INPORT8(unsigned idx) { return inb(idx); diff --git a/libdha/pci.c b/libdha/pci.c index adf0c5db82..8d43d6c0ae 100644 --- a/libdha/pci.c +++ b/libdha/pci.c @@ -89,6 +89,9 @@ #include "sysdep/pci_os2.c" #elif defined (_WIN32) || defined(__CYGWIN__) #include "sysdep/pci_win32.c" +#ifdef __MINGW32__ +#define ENOTSUP 134 /* Not supported */ +#endif #endif #if 0 diff --git a/libdha/sysdep/AsmMacros_x86.h b/libdha/sysdep/AsmMacros_x86.h index fd6591152c..3259de03f9 100644 --- a/libdha/sysdep/AsmMacros_x86.h +++ b/libdha/sysdep/AsmMacros_x86.h @@ -7,9 +7,9 @@ #ifndef __ASM_MACROS_X86_H #define __ASM_MACROS_X86_H -#if defined (WINNT) -#error This stuff is not ported on your system -#else +//#if defined (WINNT) +//#error This stuff is not ported on your system +//#else #include "config.h" @@ -280,4 +280,4 @@ static __inline__ void intr_enable() #endif -#endif +//#endif diff --git a/libdha/sysdep/libdha_win32.c b/libdha/sysdep/libdha_win32.c index 75c5dfb942..e19a224a4c 100644 --- a/libdha/sysdep/libdha_win32.c +++ b/libdha/sysdep/libdha_win32.c @@ -5,7 +5,6 @@ */ #include <windows.h> - /* This is the request structure that applications use to request services from the MAPDEV VxD. @@ -34,7 +33,7 @@ typedef struct _MapDevRequest ((DeviceType)<<16) | ((Access)<<14) | ((Function)<<2) | (Method) ) /* Memory Map a piece of Real Memory */ -void *map_phys_mem(unsigned base, unsigned size) { +void *map_phys_mem(unsigned long base, unsigned long size) { HANDLE hDevice ; PVOID inBuf[1] ; /* buffer for struct pointer to VxD */ @@ -66,5 +65,4 @@ void *map_phys_mem(unsigned base, unsigned size) { return (void*)req.mdr_LinearAddress ; } -void unmap_phys_mem(void *ptr, unsigned size) { } - +void unmap_phys_mem(void *ptr, unsigned long size) { } |