big vidix driver update by James Stembridge

CVS patchset: 3907
CVS date: 2003/01/13 23:36:01

1 files changed, 1 insertions, 91 deletions

diff --git a/src/video_out/libdha/sysdep/AsmMacros_x86.h b/src/video_out/libdha/sysdep/AsmMacros_x86.h
index c10f24f2d..97dcaae16 100644
--- a/src/video_out/libdha/sysdep/AsmMacros_x86.h
+++ b/src/video_out/libdha/sysdep/AsmMacros_x86.h
@@ -8,75 +8,25 @@
 #define __ASM_MACROS_X86_H
 
 #if defined (WINNT)
-#error This stuff is not ported on your system
+#include "sysdep/AsmMacros_generic.h"
 #else
 
 #include "config.h"
 
-#ifdef CONFIG_DHAHELPER
-#include <sys/ioctl.h>
-#include "../kernelhelper/dhahelper.h"
-
-extern int dhahelper_fd;
-extern int dhahelper_initialized;
-#endif
-
 static __inline__ void outb(short port,char val)
 {
-#ifdef CONFIG_DHAHELPER
-    if (dhahelper_initialized == 1)
-    {
-	dhahelper_port_t _port;
-	
-	_port.operation = PORT_OP_WRITE;
-	_port.addr = port;
-	_port.size = 1;
-	_port.value = val;
-        if (ioctl(dhahelper_fd, DHAHELPER_PORT, &_port) == 0)
-	    return;
-    }
-    else
-#endif
    __asm__ __volatile__("outb %0,%1" : :"a" (val), "d" (port));
     return;
 }
 
 static __inline__ void outw(short port,short val)
 {
-#ifdef CONFIG_DHAHELPER
-    if (dhahelper_initialized == 1)
-    {
-	dhahelper_port_t _port;
-	
-	_port.operation = PORT_OP_WRITE;
-	_port.addr = port;
-	_port.size = 2;
-	_port.value = val;
-        if (ioctl(dhahelper_fd, DHAHELPER_PORT, &_port) == 0)
-	    return;
-    }
-    else
-#endif
    __asm__ __volatile__("outw %0,%1" : :"a" (val), "d" (port));
     return;
 }
 
 static __inline__ void outl(short port,unsigned int val)
 {
-#ifdef CONFIG_DHAHELPER
-    if (dhahelper_initialized == 1)
-    {
-	dhahelper_port_t _port;
-	
-	_port.operation = PORT_OP_WRITE;
-	_port.addr = port;
-	_port.size = 4;
-	_port.value = val;
-        if (ioctl(dhahelper_fd, DHAHELPER_PORT, &_port) == 0)
-	    return;
-    }
-    else
-#endif
    __asm__ __volatile__("outl %0,%1" : :"a" (val), "d" (port));
     return;
 }
@@ -84,19 +34,6 @@ static __inline__ void outl(short port,unsigned int val)
 static __inline__ unsigned int inb(short port)
 {
    unsigned char ret;
-#ifdef CONFIG_DHAHELPER
-    if (dhahelper_initialized == 1)
-    {
-	dhahelper_port_t _port;
-	
-	_port.operation = PORT_OP_READ;
-	_port.addr = port;
-	_port.size = 1;
-        if (ioctl(dhahelper_fd, DHAHELPER_PORT, &_port) == 0)
-	    return _port.value;
-    }
-    else
-#endif
    __asm__ __volatile__("inb %1,%0" :
        "=a" (ret) :
        "d" (port));
@@ -106,19 +43,6 @@ static __inline__ unsigned int inb(short port)
 static __inline__ unsigned int inw(short port)
 {
    unsigned short ret;
-#ifdef CONFIG_DHAHELPER
-    if (dhahelper_initialized == 1)
-    {
-	dhahelper_port_t _port;
-	
-	_port.operation = PORT_OP_READ;
-	_port.addr = port;
-	_port.size = 2;
-        if (ioctl(dhahelper_fd, DHAHELPER_PORT, &_port) == 0)
-	    return _port.value;
-    }
-    else
-#endif
    __asm__ __volatile__("inw %1,%0" :
        "=a" (ret) :
        "d" (port));
@@ -128,19 +52,6 @@ static __inline__ unsigned int inw(short port)
 static __inline__ unsigned int inl(short port)
 {
    unsigned int ret;
-#ifdef CONFIG_DHAHELPER
-    if (dhahelper_initialized == 1)
-    {
-	dhahelper_port_t _port;
-	
-	_port.operation = PORT_OP_READ;
-	_port.addr = port;
-	_port.size = 4;
-        if (ioctl(dhahelper_fd, DHAHELPER_PORT, &_port) == 0)
-	    return _port.value;
-    }
-    else
-#endif
    __asm__ __volatile__("inl %1,%0" :
        "=a" (ret) :
        "d" (port));
@@ -158,5 +69,4 @@ static __inline__ void intr_enable()
 }
 
 #endif
-
 #endif