summaryrefslogtreecommitdiffstats
path: root/vidix/sysdep
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2011-01-31 03:44:50 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2011-01-31 16:03:10 +0200
commit6d534cd3cb5ca12d41f53345e92b9ab594971406 (patch)
treeb1c80430a490877234dd6226e5e635823b913b4c /vidix/sysdep
parent902289f2b3754b43e474cf5b5d3b0a4dbb7e7069 (diff)
downloadmpv-6d534cd3cb5ca12d41f53345e92b9ab594971406.tar.bz2
mpv-6d534cd3cb5ca12d41f53345e92b9ab594971406.tar.xz
vidix: drop VIDIX support
By now VIDIX is too obscure to justify the amount of code and complexity it requires in the sources. Although there is no pressing need to drop it just now from a code point of view, I'll rather remove it before release than release with VIDIX support and then drop it later. Some of the manpage mentions of VIDIX were in "this option supported for these VOs" lists that looked outdated and failed to mention vdpau for example. Replace such incorrect lists with a generic "not supported for all VOs" mention.
Diffstat (limited to 'vidix/sysdep')
-rw-r--r--vidix/sysdep/AsmMacros_alpha.h82
-rw-r--r--vidix/sysdep/AsmMacros_arm32.h106
-rw-r--r--vidix/sysdep/AsmMacros_ia64.h71
-rw-r--r--vidix/sysdep/AsmMacros_powerpc.h115
-rw-r--r--vidix/sysdep/AsmMacros_sparc.h108
-rw-r--r--vidix/sysdep/AsmMacros_x86.h342
-rw-r--r--vidix/sysdep/libdha_os2.c161
-rw-r--r--vidix/sysdep/libdha_win32.c113
-rw-r--r--vidix/sysdep/pci_386bsd.c61
-rw-r--r--vidix/sysdep/pci_alpha.c28
-rw-r--r--vidix/sysdep/pci_arm32.c60
-rw-r--r--vidix/sysdep/pci_bsdi.c39
-rw-r--r--vidix/sysdep/pci_freebsd.c61
-rw-r--r--vidix/sysdep/pci_ia64.c60
-rw-r--r--vidix/sysdep/pci_isc.c55
-rw-r--r--vidix/sysdep/pci_linux.c213
-rw-r--r--vidix/sysdep/pci_lynx.c115
-rw-r--r--vidix/sysdep/pci_mach386.c47
-rw-r--r--vidix/sysdep/pci_netbsd.c67
-rw-r--r--vidix/sysdep/pci_openbsd.c49
-rw-r--r--vidix/sysdep/pci_os2.c78
-rw-r--r--vidix/sysdep/pci_powerpc.c30
-rw-r--r--vidix/sysdep/pci_sco.c56
-rw-r--r--vidix/sysdep/pci_sparc.c60
-rw-r--r--vidix/sysdep/pci_svr4.c65
-rw-r--r--vidix/sysdep/pci_win32.c61
-rw-r--r--vidix/sysdep/pci_x86.c60
27 files changed, 0 insertions, 2363 deletions
diff --git a/vidix/sysdep/AsmMacros_alpha.h b/vidix/sysdep/AsmMacros_alpha.h
deleted file mode 100644
index 5ae5e07a82..0000000000
--- a/vidix/sysdep/AsmMacros_alpha.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- This file is based on:
- $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
-*/
-/*
- * (c) Copyright 1993,1994 by David Wexelblat <dwex@xfree86.org>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * DAVID WEXELBLAT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of David Wexelblat shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from David Wexelblat.
- */
-/*
- * Copyright 1997
- * Digital Equipment Corporation. All rights reserved.
- * This software is furnished under license and may be used and copied only in
- * accordance with the following terms and conditions. Subject to these
- * conditions, you may download, copy, install, use, modify and distribute
- * this software in source and/or binary form. No title or ownership is
- * transferred hereby.
- *
- * 1) Any source code used, modified or distributed must reproduce and retain
- * this copyright notice and list of conditions as they appear in the source
- * file.
- *
- * 2) No right is granted to use any trade name, trademark, or logo of Digital
- * Equipment Corporation. Neither the "Digital Equipment Corporation" name
- * nor any trademark or logo of Digital Equipment Corporation may be used
- * to endorse or promote products derived from this software without the
- * prior written permission of Digital Equipment Corporation.
- *
- * 3) This software is provided "AS-IS" and any express or implied warranties,
- * including but not limited to, any implied warranties of merchantability,
- * fitness for a particular purpose, or non-infringement are disclaimed. In
- * no event shall DIGITAL be liable for any damages whatsoever, and in
- * particular, DIGITAL shall not be liable for special, indirect,
- * consequential, or incidental damages or damages for
- * lost profits, loss of revenue or loss of use, whether such damages arise
- * in contract,
- * negligence, tort, under statute, in equity, at law or otherwise, even if
- * advised of the possibility of such damage.
- */
-
-#ifndef MPLAYER_ASMMACROS_ALPHA_H
-#define MPLAYER_ASMMACROS_ALPHA_H
-
-#if defined (__linux__)
-#include <sys/io.h>
-#elif defined (__FreeBSD__)
-#include <sys/types.h>
-void outb(u_int32_t port, u_int8_t val);
-void outw(u_int32_t port, u_int16_t val);
-void outl(u_int32_t port, u_int32_t val);
-u_int8_t inb(u_int32_t port);
-u_int16_t inw(u_int32_t port);
-u_int32_t inl(u_int32_t port);
-#else
-#error This stuff is not ported on your system
-#endif
-
-#define intr_disable()
-#define intr_enable()
-
-#endif /* MPLAYER_ASMMACROS_ALPHA_H */
diff --git a/vidix/sysdep/AsmMacros_arm32.h b/vidix/sysdep/AsmMacros_arm32.h
deleted file mode 100644
index d7973cc48c..0000000000
--- a/vidix/sysdep/AsmMacros_arm32.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- This file is based on:
- $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
-*/
-/*
- * (c) Copyright 1993,1994 by David Wexelblat <dwex@xfree86.org>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * DAVID WEXELBLAT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of David Wexelblat shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from David Wexelblat.
- */
-/*
- * Copyright 1997
- * Digital Equipment Corporation. All rights reserved.
- * This software is furnished under license and may be used and copied only in
- * accordance with the following terms and conditions. Subject to these
- * conditions, you may download, copy, install, use, modify and distribute
- * this software in source and/or binary form. No title or ownership is
- * transferred hereby.
- *
- * 1) Any source code used, modified or distributed must reproduce and retain
- * this copyright notice and list of conditions as they appear in the source
- * file.
- *
- * 2) No right is granted to use any trade name, trademark, or logo of Digital
- * Equipment Corporation. Neither the "Digital Equipment Corporation" name
- * nor any trademark or logo of Digital Equipment Corporation may be used
- * to endorse or promote products derived from this software without the
- * prior written permission of Digital Equipment Corporation.
- *
- * 3) This software is provided "AS-IS" and any express or implied warranties,
- * including but not limited to, any implied warranties of merchantability,
- * fitness for a particular purpose, or non-infringement are disclaimed. In
- * no event shall DIGITAL be liable for any damages whatsoever, and in
- * particular, DIGITAL shall not be liable for special, indirect,
- * consequential, or incidental damages or damages for
- * lost profits, loss of revenue or loss of use, whether such damages arise
- * in contract,
- * negligence, tort, under statute, in equity, at law or otherwise, even if
- * advised of the possibility of such damage.
- */
-
-#ifndef MPLAYER_ASMMACROS_ARM32_H
-#define MPLAYER_ASMMACROS_ARM32_H
-
-unsigned int IOPortBase; /* Memory mapped I/O port area */
-
-static __inline__ void outb(short port,char val)
-{
- if ((unsigned short)port >= 0x400) return;
- *(volatile unsigned char*)(((unsigned short)(port))+IOPortBase) = val;
-}
-
-static __inline__ void outw(short port,short val)
-{
- if ((unsigned short)port >= 0x400) return;
- *(volatile unsigned short*)(((unsigned short)(port))+IOPortBase) = val;
-}
-
-static __inline__ void outl(short port,int val)
-{
- if ((unsigned short)port >= 0x400) return;
- *(volatile unsigned long*)(((unsigned short)(port))+IOPortBase) = val;
-}
-
-static __inline__ unsigned int inb(short port)
-{
- if ((unsigned short)port >= 0x400) return (unsigned int)-1;
- return *(volatile unsigned char*)(((unsigned short)(port))+IOPortBase);
-}
-
-static __inline__ unsigned int inw(short port)
-{
- if ((unsigned short)port >= 0x400) return (unsigned int)-1;
- return *(volatile unsigned short*)(((unsigned short)(port))+IOPortBase);
-}
-
-static __inline__ unsigned int inl(short port)
-{
- if ((unsigned short)port >= 0x400) return (unsigned int)-1;
- return *(volatile unsigned long*)(((unsigned short)(port))+IOPortBase);
-}
-
-#define intr_disable()
-#define intr_enable()
-
-#endif /* MPLAYER_ASMMACROS_ARM32_H */
diff --git a/vidix/sysdep/AsmMacros_ia64.h b/vidix/sysdep/AsmMacros_ia64.h
deleted file mode 100644
index b25cfee4e5..0000000000
--- a/vidix/sysdep/AsmMacros_ia64.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- This file is based on:
- $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
-*/
-/*
- * (c) Copyright 1993,1994 by David Wexelblat <dwex@xfree86.org>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * DAVID WEXELBLAT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of David Wexelblat shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from David Wexelblat.
- */
-/*
- * Copyright 1997
- * Digital Equipment Corporation. All rights reserved.
- * This software is furnished under license and may be used and copied only in
- * accordance with the following terms and conditions. Subject to these
- * conditions, you may download, copy, install, use, modify and distribute
- * this software in source and/or binary form. No title or ownership is
- * transferred hereby.
- *
- * 1) Any source code used, modified or distributed must reproduce and retain
- * this copyright notice and list of conditions as they appear in the source
- * file.
- *
- * 2) No right is granted to use any trade name, trademark, or logo of Digital
- * Equipment Corporation. Neither the "Digital Equipment Corporation" name
- * nor any trademark or logo of Digital Equipment Corporation may be used
- * to endorse or promote products derived from this software without the
- * prior written permission of Digital Equipment Corporation.
- *
- * 3) This software is provided "AS-IS" and any express or implied warranties,
- * including but not limited to, any implied warranties of merchantability,
- * fitness for a particular purpose, or non-infringement are disclaimed. In
- * no event shall DIGITAL be liable for any damages whatsoever, and in
- * particular, DIGITAL shall not be liable for special, indirect,
- * consequential, or incidental damages or damages for
- * lost profits, loss of revenue or loss of use, whether such damages arise
- * in contract,
- * negligence, tort, under statute, in equity, at law or otherwise, even if
- * advised of the possibility of such damage.
- */
-
-#ifndef MPLAYER_ASMMACROS_IA64_H
-#define MPLAYER_ASMMACROS_IA64_H
-
-#if defined(__linux__)
-#include <sys/io.h>
-#else
-#error This stuff is not ported on your system
-#endif
-
-#endif /* MPLAYER_ASMMACROS_IA64_H */
diff --git a/vidix/sysdep/AsmMacros_powerpc.h b/vidix/sysdep/AsmMacros_powerpc.h
deleted file mode 100644
index 7688c6ad9f..0000000000
--- a/vidix/sysdep/AsmMacros_powerpc.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- This file is based on:
- $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
-*/
-/*
- * (c) Copyright 1993,1994 by David Wexelblat <dwex@xfree86.org>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * DAVID WEXELBLAT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of David Wexelblat shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from David Wexelblat.
- */
-/*
- * Copyright 1997
- * Digital Equipment Corporation. All rights reserved.
- * This software is furnished under license and may be used and copied only in
- * accordance with the following terms and conditions. Subject to these
- * conditions, you may download, copy, install, use, modify and distribute
- * this software in source and/or binary form. No title or ownership is
- * transferred hereby.
- *
- * 1) Any source code used, modified or distributed must reproduce and retain
- * this copyright notice and list of conditions as they appear in the source
- * file.
- *
- * 2) No right is granted to use any trade name, trademark, or logo of Digital
- * Equipment Corporation. Neither the "Digital Equipment Corporation" name
- * nor any trademark or logo of Digital Equipment Corporation may be used
- * to endorse or promote products derived from this software without the
- * prior written permission of Digital Equipment Corporation.
- *
- * 3) This software is provided "AS-IS" and any express or implied warranties,
- * including but not limited to, any implied warranties of merchantability,
- * fitness for a particular purpose, or non-infringement are disclaimed. In
- * no event shall DIGITAL be liable for any damages whatsoever, and in
- * particular, DIGITAL shall not be liable for special, indirect,
- * consequential, or incidental damages or damages for
- * lost profits, loss of revenue or loss of use, whether such damages arise
- * in contract,
- * negligence, tort, under statute, in equity, at law or otherwise, even if
- * advised of the possibility of such damage.
- */
-
-#ifndef MPLAYER_ASMMACROS_POWERPC_H
-#define MPLAYER_ASMMACROS_POWERPC_H
-
-#if defined(Lynx) || defined(__OpenBSD__)
-
-extern unsigned char *ioBase;
-
-static __inline__ volatile void eieio(void)
-{
- __asm__ volatile ("eieio");
-}
-
-static __inline__ void outb(short port, unsigned char value)
-{
- *(unsigned char *)(ioBase + port) = value; eieio();
-}
-
-static __inline__ void outw(short port, unsigned short value)
-{
- *(unsigned short *)(ioBase + port) = value; eieio();
-}
-
-static __inline__ void outl(short port, unsigned short value)
-{
- *(unsigned long *)(ioBase + port) = value; eieio();
-}
-
-static __inline__ unsigned char inb(short port)
-{
- unsigned char val;
- val = *((unsigned char *)(ioBase + port)); eieio();
- return val;
-}
-
-static __inline__ unsigned short inw(short port)
-{
- unsigned short val;
- val = *((unsigned short *)(ioBase + port)); eieio();
- return val;
-}
-
-static __inline__ unsigned long inl(short port)
-{
- unsigned long val;
- val = *((unsigned long *)(ioBase + port)); eieio();
- return val;
-}
-
-#define intr_disable()
-#define intr_enable()
-
-#endif
-
-#endif /* MPLAYER_ASMMACROS_POWERPC_H */
diff --git a/vidix/sysdep/AsmMacros_sparc.h b/vidix/sysdep/AsmMacros_sparc.h
deleted file mode 100644
index 8ffdde26e1..0000000000
--- a/vidix/sysdep/AsmMacros_sparc.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- This file is based on:
- $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
-*/
-/*
- * (c) Copyright 1993,1994 by David Wexelblat <dwex@xfree86.org>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * DAVID WEXELBLAT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of David Wexelblat shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from David Wexelblat.
- */
-/*
- * Copyright 1997
- * Digital Equipment Corporation. All rights reserved.
- * This software is furnished under license and may be used and copied only in
- * accordance with the following terms and conditions. Subject to these
- * conditions, you may download, copy, install, use, modify and distribute
- * this software in source and/or binary form. No title or ownership is
- * transferred hereby.
- *
- * 1) Any source code used, modified or distributed must reproduce and retain
- * this copyright notice and list of conditions as they appear in the source
- * file.
- *
- * 2) No right is granted to use any trade name, trademark, or logo of Digital
- * Equipment Corporation. Neither the "Digital Equipment Corporation" name
- * nor any trademark or logo of Digital Equipment Corporation may be used
- * to endorse or promote products derived from this software without the
- * prior written permission of Digital Equipment Corporation.
- *
- * 3) This software is provided "AS-IS" and any express or implied warranties,
- * including but not limited to, any implied warranties of merchantability,
- * fitness for a particular purpose, or non-infringement are disclaimed. In
- * no event shall DIGITAL be liable for any damages whatsoever, and in
- * particular, DIGITAL shall not be liable for special, indirect,
- * consequential, or incidental damages or damages for
- * lost profits, loss of revenue or loss of use, whether such damages arise
- * in contract,
- * negligence, tort, under statute, in equity, at law or otherwise, even if
- * advised of the possibility of such damage.
- */
-
-#ifndef MPLAYER_ASMMACROS_SPARC_H
-#define MPLAYER_ASMMACROS_SPARC_H
-
-#ifndef ASI_PL
-#define ASI_PL 0x88
-#endif
-
-static __inline__ void outb(unsigned long port, char val)
-{
- __asm__ volatile("stba %0, [%1] %2" : : "r" (val), "r" (port), "i" (ASI_PL));
-}
-
-static __inline__ void outw(unsigned long port, char val)
-{
- __asm__ volatile("stha %0, [%1] %2" : : "r" (val), "r" (port), "i" (ASI_PL));
-}
-
-static __inline__ void outl(unsigned long port, char val)
-{
- __asm__ volatile("sta %0, [%1] %2" : : "r" (val), "r" (port), "i" (ASI_PL));
-}
-
-static __inline__ unsigned int inb(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(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(unsigned long port)
-{
- unsigned char ret;
- __asm__ volatile("lda [%1] %2, %0" : "=r" (ret) : "r" (port), "i" (ASI_PL));
- return ret;
-}
-
-#define intr_disable()
-#define intr_enable()
-
-#endif /* MPLAYER_ASMMACROS_SPARC_H */
diff --git a/vidix/sysdep/AsmMacros_x86.h b/vidix/sysdep/AsmMacros_x86.h
deleted file mode 100644
index 35411c92dc..0000000000
--- a/vidix/sysdep/AsmMacros_x86.h
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- This file is based on:
- $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
-*/
-/*
- * (c) Copyright 1993,1994 by David Wexelblat <dwex@xfree86.org>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * DAVID WEXELBLAT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of David Wexelblat shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from David Wexelblat.
- */
-/*
- * Copyright 1997
- * Digital Equipment Corporation. All rights reserved.
- * This software is furnished under license and may be used and copied only in
- * accordance with the following terms and conditions. Subject to these
- * conditions, you may download, copy, install, use, modify and distribute
- * this software in source and/or binary form. No title or ownership is
- * transferred hereby.
- *
- * 1) Any source code used, modified or distributed must reproduce and retain
- * this copyright notice and list of conditions as they appear in the source
- * file.
- *
- * 2) No right is granted to use any trade name, trademark, or logo of Digital
- * Equipment Corporation. Neither the "Digital Equipment Corporation" name
- * nor any trademark or logo of Digital Equipment Corporation may be used
- * to endorse or promote products derived from this software without the
- * prior written permission of Digital Equipment Corporation.
- *
- * 3) This software is provided "AS-IS" and any express or implied warranties,
- * including but not limited to, any implied warranties of merchantability,
- * fitness for a particular purpose, or non-infringement are disclaimed. In
- * no event shall DIGITAL be liable for any damages whatsoever, and in
- * particular, DIGITAL shall not be liable for special, indirect,
- * consequential, or incidental damages or damages for
- * lost profits, loss of revenue or loss of use, whether such damages arise
- * in contract,
- * negligence, tort, under statute, in equity, at law or otherwise, even if
- * advised of the possibility of such damage.
- */
-
-#ifndef MPLAYER_ASMMACROS_X86_H
-#define MPLAYER_ASMMACROS_X86_H
-
-#include "config.h"
-
-#ifdef CONFIG_DHAHELPER
-#include <sys/ioctl.h>
-#include "vidix/dhahelper/dhahelper.h"
-
-extern int dhahelper_fd;
-extern int dhahelper_initialized;
-#endif
-
-#ifdef CONFIG_SVGAHELPER
-#include <sys/ioctl.h>
-#include <svgalib_helper.h>
-
-#ifndef SVGALIB_HELPER_IOC_MAGIC
-/* svgalib 1.9.18+ compatibility ::atmos */
-#define SVGALIB_HELPER_IOCSOUTB SVGAHELPER_OUTB
-#define SVGALIB_HELPER_IOCSOUTW SVGAHELPER_OUTW
-#define SVGALIB_HELPER_IOCSOUTL SVGAHELPER_OUTL
-#define SVGALIB_HELPER_IOCGINB SVGAHELPER_INB
-#define SVGALIB_HELPER_IOCGINW SVGAHELPER_INW
-#define SVGALIB_HELPER_IOCGINL SVGAHELPER_INL
-#endif
-
-extern int svgahelper_fd;
-extern int svgahelper_initialized;
-
-static __inline__ void svga_outb(short port, char value)
-{
- io_t iov;
-
- iov.val = value;
- iov.port = port;
- ioctl(svgahelper_fd, SVGALIB_HELPER_IOCSOUTB, &iov);
-}
-
-static __inline__ void svga_outw(short port, char value)
-{
- io_t iov;
-
- iov.val = value;
- iov.port = port;
- ioctl(svgahelper_fd, SVGALIB_HELPER_IOCSOUTW, &iov);
-}
-
-static __inline__ void svga_outl(short port, unsigned int value)
-{
- io_t iov;
-
- iov.val = value;
- iov.port = port;
- ioctl(svgahelper_fd, SVGALIB_HELPER_IOCSOUTL, &iov);
-}
-
-static __inline__ unsigned int svga_inb(short port)
-{
- io_t iov;
-
- iov.port = port;
- ioctl(svgahelper_fd, SVGALIB_HELPER_IOCGINB, &iov);
-
- return iov.val;
-}
-
-static __inline__ unsigned int svga_inw(short port)
-{
- io_t iov;
-
- iov.port = port;
- ioctl(svgahelper_fd, SVGALIB_HELPER_IOCGINW, &iov);
-
- return iov.val;
-}
-
-static __inline__ unsigned int svga_inl(short port)
-{
- io_t iov;
-
- iov.port = port;
- ioctl(svgahelper_fd, SVGALIB_HELPER_IOCGINL, &iov);
-
- return iov.val;
-}
-#endif /* CONIFG_SVGAHELPER */
-
-static __inline__ void outb(short port,char val)
-{
-#ifdef CONFIG_SVGAHELPER
- if (svgahelper_initialized == 1)
- {
- svga_outb(port, val);
- return;
- }
-#endif
-
-#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_SVGAHELPER
- if (svgahelper_initialized == 1)
- {
- svga_outw(port, val);
- return;
- }
-#endif
-
-#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_SVGAHELPER
- if (svgahelper_initialized == 1)
- {
- svga_outl(port, val);
- return;
- }
-#endif
-
-#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
-