58 files changed, 58 insertions, 35 deletions

diff --git a/Makefile b/Makefile
index e683d9e805..12e18a1775 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,7 @@ LIBS_MPLAYER = libvo/libvo.a \
                libao2/libao2.a \
                input/libinput.a \
 
-LIBS_MPLAYER-$(VIDIX)             += vidix/libvidix.a libdha/libdha.a
+LIBS_MPLAYER-$(VIDIX)             += vidix/libvidix.a
 LIBS_MPLAYER-$(GUI)               += Gui/libgui.a
 LIBS_MPLAYER-$(LIBMENU)           += libmenu/libmenu.a
 
@@ -134,7 +134,6 @@ PARTS = libmpdemux \
         libmpeg2 \
         libfaad2 \
         tremor \
-        libdha \
         vidix \
         dvdread \
         libdvdcss \
@@ -211,10 +210,7 @@ mp3lib/libmp3.a:
 tremor/libvorbisidec.a:
 	$(MAKE) -C tremor
 
-libdha/libdha.a:
-	$(MAKE) -C libdha
-
-vidix/libvidix.a: libdha/libdha.a
+vidix/libvidix.a:
 	$(MAKE) -C vidix
 
 Gui/libgui.a:
@@ -407,7 +403,6 @@ mp3lib/libmp3.a: .norecurse $(wildcard mp3lib/*.[ch])
 libfaad2/libfaad2.a: .norecurse $(wildcard libfaad2/*.[ch] libfaad2/*/*.[ch])
 
 loader/libloader.a: .norecurse $(wildcard loader/*.[chSs])
-libdha/libdha.a: .norecurse $(wildcard libdha/*.[ch])
 vidix/libvidix.a: .norecurse $(wildcard vidix/*.[ch])
 Gui/libgui.a: .norecurse $(wildcard Gui/*.[ch] Gui/*/*.[ch] Gui/*/*/*.[ch])
 
diff --git a/libdha/AsmMacros.h b/vidix/AsmMacros.h
index 5e4e1addc4..5e4e1addc4 100644
--- a/libdha/AsmMacros.h
+++ b/vidix/AsmMacros.h
diff --git a/vidix/Makefile b/vidix/Makefile
index b05b3b4fe2..a97666fe26 100644
--- a/vidix/Makefile
+++ b/vidix/Makefile
@@ -3,11 +3,25 @@ include ../config.mak
 LIBNAME_MPLAYER = libvidix.a
 
 SRCS_MPLAYER    = vidixlib.c \
+		  libdha.c \
+		  mtrr.c \
+		  pci.c \
+		  pci_names.c \
+		  pci_dev_ids.c \
                   $(wildcard *.c)
 
 OBJS_MPLAYER    = mga_crtc2_vid.o \
                   rage128_vid.o \
 
+# If you want libdha to use svgalib_helper for hardware access,
+# uncomment this statement, and change the -I to the correct directory
+# that includes svgalib_helper.o:
+#CFLAGS += -DDEV_SVGA=\"/dev/svga\" -DCONFIG_SVGAHELPER -Isvgalib_helper/
+
+libs: pci_names.c
+
+dep depend:: pci_names.c
+
 include ../mpcommon.mak
 
 mga_crtc2_vid.o: mga_vid.c
@@ -15,3 +29,9 @@ mga_crtc2_vid.o: mga_vid.c
 
 rage128_vid.o: radeon_vid.c
 	$(CC) -c $(CFLAGS) -DRAGE128 -o $@ $<
+
+pci_names.c pci_dev_ids.c: pci.db
+	LC_ALL=C $(AWK) -f pci_db2c.awk $<
+
+clean::
+	rm -f pci_*.c pci_*.h
diff --git a/libdha/bin/README b/vidix/bin/README
index fe4bfa6f34..fe4bfa6f34 100644
--- a/libdha/bin/README
+++ b/vidix/bin/README
diff --git a/libdha/bin/mapdev.copyright b/vidix/bin/mapdev.copyright
index b22433d291..b22433d291 100644
--- a/libdha/bin/mapdev.copyright
+++ b/vidix/bin/mapdev.copyright
diff --git a/libdha/bin/mapdev.vxd b/vidix/bin/mapdev.vxd
index e09194b842..e09194b842 100644
--- a/libdha/bin/mapdev.vxd
+++ b/vidix/bin/mapdev.vxd
diff --git a/vidix/cyberblade_vid.c b/vidix/cyberblade_vid.c
index f0109bf81f..ebb4869226 100644
--- a/vidix/cyberblade_vid.c
+++ b/vidix/cyberblade_vid.c
@@ -46,9 +46,9 @@
 #include "vidix.h"
 #include "vidixlib.h"
 #include "fourcc.h"
-#include "../libdha/libdha.h"
-#include "../libdha/pci_ids.h"
-#include "../libdha/pci_names.h"
+#include "libdha.h"
+#include "pci_ids.h"
+#include "pci_names.h"
 #include "../config.h"
 
 #include "cyberblade_regs.h"
diff --git a/libdha/dhahelperwin/MAKEFILE b/vidix/dhahelperwin/MAKEFILE
index 58189757d6..58189757d6 100644
--- a/libdha/dhahelperwin/MAKEFILE
+++ b/vidix/dhahelperwin/MAKEFILE
diff --git a/libdha/dhahelperwin/SOURCES b/vidix/dhahelperwin/SOURCES
index e44aa06971..e44aa06971 100644
--- a/libdha/dhahelperwin/SOURCES
+++ b/vidix/dhahelperwin/SOURCES
diff --git a/libdha/dhahelperwin/dhahelper.c b/vidix/dhahelperwin/dhahelper.c
index 230d44a372..230d44a372 100644
--- a/libdha/dhahelperwin/dhahelper.c
+++ b/vidix/dhahelperwin/dhahelper.c
diff --git a/libdha/dhahelperwin/dhahelper.h b/vidix/dhahelperwin/dhahelper.h
index a93b6ebc67..a93b6ebc67 100644
--- a/libdha/dhahelperwin/dhahelper.h
+++ b/vidix/dhahelperwin/dhahelper.h
diff --git a/libdha/dhahelperwin/dhasetup.c b/vidix/dhahelperwin/dhasetup.c
index 7113499961..7113499961 100644
--- a/libdha/dhahelperwin/dhasetup.c
+++ b/vidix/dhahelperwin/dhasetup.c
diff --git a/libdha/kernelhelper/Makefile b/vidix/kernelhelper/Makefile
index acc4bcee03..acc4bcee03 100644
--- a/libdha/kernelhelper/Makefile
+++ b/vidix/kernelhelper/Makefile
diff --git a/libdha/kernelhelper/dhahelper.c b/vidix/kernelhelper/dhahelper.c
index f5b6fe825c..f5b6fe825c 100644
--- a/libdha/kernelhelper/dhahelper.c
+++ b/vidix/kernelhelper/dhahelper.c
diff --git a/libdha/kernelhelper/dhahelper.h b/vidix/kernelhelper/dhahelper.h
index fa6c141adb..fa6c141adb 100644
--- a/libdha/kernelhelper/dhahelper.h
+++ b/vidix/kernelhelper/dhahelper.h
diff --git a/libdha/kernelhelper/test.c b/vidix/kernelhelper/test.c
index 3dca94c748..3dca94c748 100644
--- a/libdha/kernelhelper/test.c
+++ b/vidix/kernelhelper/test.c
diff --git a/libdha/libdha.c b/vidix/libdha.c
index 35a9ecf4e3..35a9ecf4e3 100644
--- a/libdha/libdha.c
+++ b/vidix/libdha.c
diff --git a/libdha/libdha.h b/vidix/libdha.h
index 3135b34b76..3135b34b76 100644
--- a/libdha/libdha.h
+++ b/vidix/libdha.h
diff --git a/vidix/mach64_vid.c b/vidix/mach64_vid.c
index aacf04e03c..c52a8fbbe5 100644
--- a/vidix/mach64_vid.c
+++ b/vidix/mach64_vid.c
@@ -19,9 +19,9 @@
 #include "vidix.h"
 #include "vidixlib.h"
 #include "fourcc.h"
-#include "../libdha/libdha.h"
-#include "../libdha/pci_ids.h"
-#include "../libdha/pci_names.h"
+#include "libdha.h"
+#include "pci_ids.h"
+#include "pci_names.h"
 
 #include "mach64.h"
 
diff --git a/vidix/mga_vid.c b/vidix/mga_vid.c
index 5d8277af04..c3bb3421c6 100644
--- a/vidix/mga_vid.c
+++ b/vidix/mga_vid.c
@@ -57,9 +57,9 @@
 #include "vidix.h"
 #include "vidixlib.h"
 #include "fourcc.h"
-#include "../libdha/libdha.h"
-#include "../libdha/pci_ids.h"
-#include "../libdha/pci_names.h"
+#include "libdha.h"
+#include "pci_ids.h"
+#include "pci_names.h"
 
 #ifdef __MINGW32__
 #define ENOTSUP 134
diff --git a/libdha/mtrr.c b/vidix/mtrr.c
index 04f4d5ac3b..04f4d5ac3b 100644
--- a/libdha/mtrr.c
+++ b/vidix/mtrr.c
diff --git a/vidix/nvidia_vid.c b/vidix/nvidia_vid.c
index 25b6b8f8f6..2e37806b09 100644
--- a/vidix/nvidia_vid.c
+++ b/vidix/nvidia_vid.c
@@ -21,9 +21,9 @@
 #include "vidix.h"
 #include "vidixlib.h"
 #include "fourcc.h"
-#include "../libdha/libdha.h"
-#include "../libdha/pci_ids.h"
-#include "../libdha/pci_names.h"
+#include "libdha.h"
+#include "pci_ids.h"
+#include "pci_names.h"
 #include "../config.h"
 #include "../libavutil/common.h"
 #include "../mpbswap.h"
diff --git a/libdha/pci.c b/vidix/pci.c
index 72f8a62505..72f8a62505 100644
--- a/libdha/pci.c
+++ b/vidix/pci.c
diff --git a/libdha/pci.db b/vidix/pci.db
index 18299bd480..18299bd480 100644
--- a/libdha/pci.db
+++ b/vidix/pci.db
diff --git a/libdha/pci_db2c.awk b/vidix/pci_db2c.awk
index feaa1c7a1e..3d487d1c78 100644
--- a/libdha/pci_db2c.awk
+++ b/vidix/pci_db2c.awk
@@ -29,6 +29,7 @@ BEGIN {
     print_head(name_file);
     print_head(name_h_file);
     print_head(dev_ids_file);
+    print_includes(dev_ids_file);
     print "#ifndef PCI_VENDORS_INCLUDED" >vendor_file
     print "#define PCI_VENDORS_INCLUDED 1">vendor_file
     print "" >vendor_file
@@ -108,6 +109,13 @@ BEGIN {
     print_func_bodies(name_file);
 }
 
+function print_includes(out_file)
+{
+    print "#include <stdlib.h>" >out_file;
+    print "#include \"pci_names.h\"" >out_file;
+    return;
+}
+
 function print_head( out_file)
 {
     print "/*" >out_file;
diff --git a/vidix/pm3_vid.c b/vidix/pm3_vid.c
index 2a9c84947e..c361da972c 100644
--- a/vidix/pm3_vid.c
+++ b/vidix/pm3_vid.c
@@ -28,9 +28,9 @@
 #include "vidix.h"
 #include "vidixlib.h"
 #include "fourcc.h"
-#include "../libdha/libdha.h"
-#include "../libdha/pci_ids.h"
-#include "../libdha/pci_names.h"
+#include "libdha.h"
+#include "pci_ids.h"
+#include "pci_names.h"
 #include "../config.h"
 
 #include "pm3_regs.h"
diff --git a/vidix/radeon_vid.c b/vidix/radeon_vid.c
index d89cc38972..3eb227f61a 100644
--- a/vidix/radeon_vid.c
+++ b/vidix/radeon_vid.c
@@ -19,12 +19,12 @@
 #include "../config.h"
 #include "../libavutil/common.h"
 #include "../mpbswap.h"
-#include "../libdha/pci_ids.h"
-#include "../libdha/pci_names.h"
+#include "pci_ids.h"
+#include "pci_names.h"
 #include "vidix.h"
 #include "vidixlib.h"
 #include "fourcc.h"
-#include "../libdha/libdha.h"
+#include "libdha.h"
 #include "radeon.h"
 
 #ifdef HAVE_X11
diff --git a/vidix/savage_vid.c b/vidix/savage_vid.c
index b0a897055a..dc78c82cc8 100644
--- a/vidix/savage_vid.c
+++ b/vidix/savage_vid.c
@@ -41,9 +41,9 @@
 #include "vidix.h"
 #include "vidixlib.h"
 #include "fourcc.h"
-#include "../libdha/libdha.h"
-#include "../libdha/pci_ids.h"
-#include "../libdha/pci_names.h"
+#include "libdha.h"
+#include "pci_ids.h"
+#include "pci_names.h"
 #include "../config.h"
 
 #include "savage_regs.h"
diff --git a/vidix/sis_bridge.c b/vidix/sis_bridge.c
index 01a20002e3..8533bb3032 100644
--- a/vidix/sis_bridge.c
+++ b/vidix/sis_bridge.c
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "../libdha/libdha.h"
+#include "libdha.h"
 #include "sis_regs.h"
 #include "sis_defs.h"
 
diff --git a/vidix/sis_vid.c b/vidix/sis_vid.c
index 40f6ebd859..5fbb832317 100644
--- a/vidix/sis_vid.c
+++ b/vidix/sis_vid.c
@@ -33,9 +33,9 @@
 #include "vidix.h"
 #include "vidixlib.h"
 #include "fourcc.h"
-#include "../libdha/libdha.h"
-#include "../libdha/pci_ids.h"
-#include "../libdha/pci_names.h"
+#include "libdha.h"
+#include "pci_ids.h"
+#include "pci_names.h"
 #include "../config.h"
 
 #include "sis_regs.h"
diff --git a/libdha/sysdep/AsmMacros_alpha.h b/vidix/sysdep/AsmMacros_alpha.h
index 482b59000e..482b59000e 100644
--- a/libdha/sysdep/AsmMacros_alpha.h
+++ b/vidix/sysdep/AsmMacros_alpha.h
diff --git a/libdha/sysdep/AsmMacros_arm32.h b/vidix/sysdep/AsmMacros_arm32.h
index e618d32ee0..e618d32ee0 100644
--- a/libdha/sysdep/AsmMacros_arm32.h
+++ b/vidix/sysdep/AsmMacros_arm32.h
diff --git a/libdha/sysdep/AsmMacros_ia64.h b/vidix/sysdep/AsmMacros_ia64.h
index e59732fda5..e59732fda5 100644
--- a/libdha/sysdep/AsmMacros_ia64.h
+++ b/vidix/sysdep/AsmMacros_ia64.h
diff --git a/libdha/sysdep/AsmMacros_powerpc.h b/vidix/sysdep/AsmMacros_powerpc.h
index 2e1edee2ae..2e1edee2ae 100644
--- a/libdha/sysdep/AsmMacros_powerpc.h
+++ b/vidix/sysdep/AsmMacros_powerpc.h
diff --git a/libdha/sysdep/AsmMacros_sparc.h b/vidix/sysdep/AsmMacros_sparc.h
index f6717b4bb7..f6717b4bb7 100644
--- a/libdha/sysdep/AsmMacros_sparc.h
+++ b/vidix/sysdep/AsmMacros_sparc.h
diff --git a/libdha/sysdep/AsmMacros_x86.h b/vidix/sysdep/AsmMacros_x86.h
index c2ab1dc217..c2ab1dc217 100644
--- a/libdha/sysdep/AsmMacros_x86.h
+++ b/vidix/sysdep/AsmMacros_x86.h
diff --git a/libdha/sysdep/libdha_os2.c b/vidix/sysdep/libdha_os2.c
index 041f6be71c..041f6be71c 100644
--- a/libdha/sysdep/libdha_os2.c
+++ b/vidix/sysdep/libdha_os2.c
diff --git a/libdha/sysdep/libdha_win32.c b/vidix/sysdep/libdha_win32.c
index 0a151b0637..0a151b0637 100644
--- a/libdha/sysdep/libdha_win32.c
+++ b/vidix/sysdep/libdha_win32.c
diff --git a/libdha/sysdep/pci_386bsd.c b/vidix/sysdep/pci_386bsd.c
index d00ecb0785..d00ecb0785 100644
--- a/libdha/sysdep/pci_386bsd.c
+++ b/vidix/sysdep/pci_386bsd.c
diff --git a/libdha/sysdep/pci_alpha.c b/vidix/sysdep/pci_alpha.c
index e968b3e121..e968b3e121 100644
--- a/libdha/sysdep/pci_alpha.c
+++ b/vidix/sysdep/pci_alpha.c
diff --git a/libdha/sysdep/pci_arm32.c b/vidix/sysdep/pci_arm32.c
index a631887da3..a631887da3 100644
--- a/libdha/sysdep/pci_arm32.c
+++ b/vidix/sysdep/pci_arm32.c
diff --git a/libdha/sysdep/pci_bsdi.c b/vidix/sysdep/pci_bsdi.c
index b6b142054d..b6b142054d 100644
--- a/libdha/sysdep/pci_bsdi.c
+++ b/vidix/sysdep/pci_bsdi.c
diff --git a/libdha/sysdep/pci_freebsd.c b/vidix/sysdep/pci_freebsd.c
index dd0c68ef75..dd0c68ef75 100644
--- a/libdha/sysdep/pci_freebsd.c
+++ b/vidix/sysdep/pci_freebsd.c
diff --git a/libdha/sysdep/pci_ia64.c b/vidix/sysdep/pci_ia64.c
index a631887da3..a631887da3 100644
--- a/libdha/sysdep/pci_ia64.c
+++ b/vidix/sysdep/pci_ia64.c
diff --git a/libdha/sysdep/pci_isc.c b/vidix/sysdep/pci_isc.c
index 5b5a591824..5b5a591824 100644
--- a/libdha/sysdep/pci_isc.c
+++ b/vidix/sysdep/pci_isc.c
diff --git a/libdha/sysdep/pci_linux.c b/vidix/sysdep/pci_linux.c
index ea667f6ee6..ea667f6ee6 100644
--- a/libdha/sysdep/pci_linux.c
+++ b/vidix/sysdep/pci_linux.c
diff --git a/libdha/sysdep/pci_lynx.c b/vidix/sysdep/pci_lynx.c
index b698f63083..b698f63083 100644
--- a/libdha/sysdep/pci_lynx.c
+++ b/vidix/sysdep/pci_lynx.c
diff --git a/libdha/sysdep/pci_mach386.c b/vidix/sysdep/pci_mach386.c
index 31621862b8..31621862b8 100644
--- a/libdha/sysdep/pci_mach386.c
+++ b/vidix/sysdep/pci_mach386.c
diff --git a/libdha/sysdep/pci_netbsd.c b/vidix/sysdep/pci_netbsd.c
index 793944beba..793944beba 100644
--- a/libdha/sysdep/pci_netbsd.c
+++ b/vidix/sysdep/pci_netbsd.c
diff --git a/libdha/sysdep/pci_openbsd.c b/vidix/sysdep/pci_openbsd.c
index 89c85eab69..89c85eab69 100644
--- a/libdha/sysdep/pci_openbsd.c
+++ b/vidix/sysdep/pci_openbsd.c
diff --git a/libdha/sysdep/pci_os2.c b/vidix/sysdep/pci_os2.c
index ddfc0c0ea6..ddfc0c0ea6 100644
--- a/libdha/sysdep/pci_os2.c
+++ b/vidix/sysdep/pci_os2.c
diff --git a/libdha/sysdep/pci_powerpc.c b/vidix/sysdep/pci_powerpc.c
index 94529037b6..94529037b6 100644
--- a/libdha/sysdep/pci_powerpc.c
+++ b/vidix/sysdep/pci_powerpc.c
diff --git a/libdha/sysdep/pci_sco.c b/vidix/sysdep/pci_sco.c
index 9cb2282ada..9cb2282ada 100644
--- a/libdha/sysdep/pci_sco.c
+++ b/vidix/sysdep/pci_sco.c
diff --git a/libdha/sysdep/pci_sparc.c b/vidix/sysdep/pci_sparc.c
index a631887da3..a631887da3 100644
--- a/libdha/sysdep/pci_sparc.c
+++ b/vidix/sysdep/pci_sparc.c
diff --git a/libdha/sysdep/pci_svr4.c b/vidix/sysdep/pci_svr4.c
index bcce5c901d..bcce5c901d 100644
--- a/libdha/sysdep/pci_svr4.c
+++ b/vidix/sysdep/pci_svr4.c
diff --git a/libdha/sysdep/pci_win32.c b/vidix/sysdep/pci_win32.c
index 5dc1841d24..5dc1841d24 100644
--- a/libdha/sysdep/pci_win32.c
+++ b/vidix/sysdep/pci_win32.c
diff --git a/libdha/sysdep/pci_x86.c b/vidix/sysdep/pci_x86.c
index a631887da3..a631887da3 100644
--- a/libdha/sysdep/pci_x86.c
+++ b/vidix/sysdep/pci_x86.c
diff --git a/vidix/unichrome_vid.c b/vidix/unichrome_vid.c
index d3033b65c0..5c85f70e52 100644
--- a/vidix/unichrome_vid.c
+++ b/vidix/unichrome_vid.c
@@ -42,9 +42,9 @@
 #include "vidix.h"
 #include "vidixlib.h"
 #include "fourcc.h"
-#include "../libdha/libdha.h"
-#include "../libdha/pci_ids.h"
-#include "../libdha/pci_names.h"
+#include "libdha.h"
+#include "pci_ids.h"
+#include "pci_names.h"
 #include "../config.h"
 
 #include "unichrome_regs.h"