merged libdha and libvidix, moved all files from libdha to vidix directory
authorben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>
Fri, 6 Apr 2007 15:20:49 +0000 (15:20 +0000)
committerben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>
Fri, 6 Apr 2007 15:20:49 +0000 (15:20 +0000)
git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@22918 b3059339-0415-0410-9bf9-f77b7e298cf2

58 files changed:
Makefile
vidix/AsmMacros.h [moved from libdha/AsmMacros.h with 100% similarity]
vidix/Makefile
vidix/bin/README [moved from libdha/bin/README with 100% similarity]
vidix/bin/mapdev.copyright [moved from libdha/bin/mapdev.copyright with 100% similarity]
vidix/bin/mapdev.vxd [moved from libdha/bin/mapdev.vxd with 100% similarity]
vidix/cyberblade_vid.c
vidix/dhahelperwin/MAKEFILE [moved from libdha/dhahelperwin/MAKEFILE with 100% similarity]
vidix/dhahelperwin/SOURCES [moved from libdha/dhahelperwin/SOURCES with 100% similarity]
vidix/dhahelperwin/dhahelper.c [moved from libdha/dhahelperwin/dhahelper.c with 100% similarity]
vidix/dhahelperwin/dhahelper.h [moved from libdha/dhahelperwin/dhahelper.h with 100% similarity]
vidix/dhahelperwin/dhasetup.c [moved from libdha/dhahelperwin/dhasetup.c with 100% similarity]
vidix/kernelhelper/Makefile [moved from libdha/kernelhelper/Makefile with 100% similarity]
vidix/kernelhelper/dhahelper.c [moved from libdha/kernelhelper/dhahelper.c with 100% similarity]
vidix/kernelhelper/dhahelper.h [moved from libdha/kernelhelper/dhahelper.h with 100% similarity]
vidix/kernelhelper/test.c [moved from libdha/kernelhelper/test.c with 100% similarity]
vidix/libdha.c [moved from libdha/libdha.c with 100% similarity]
vidix/libdha.h [moved from libdha/libdha.h with 100% similarity]
vidix/mach64_vid.c
vidix/mga_vid.c
vidix/mtrr.c [moved from libdha/mtrr.c with 100% similarity]
vidix/nvidia_vid.c
vidix/pci.c [moved from libdha/pci.c with 100% similarity]
vidix/pci.db [moved from libdha/pci.db with 100% similarity]
vidix/pci_db2c.awk [moved from libdha/pci_db2c.awk with 98% similarity]
vidix/pm3_vid.c
vidix/radeon_vid.c
vidix/savage_vid.c
vidix/sis_bridge.c
vidix/sis_vid.c
vidix/sysdep/AsmMacros_alpha.h [moved from libdha/sysdep/AsmMacros_alpha.h with 100% similarity]
vidix/sysdep/AsmMacros_arm32.h [moved from libdha/sysdep/AsmMacros_arm32.h with 100% similarity]
vidix/sysdep/AsmMacros_ia64.h [moved from libdha/sysdep/AsmMacros_ia64.h with 100% similarity]
vidix/sysdep/AsmMacros_powerpc.h [moved from libdha/sysdep/AsmMacros_powerpc.h with 100% similarity]
vidix/sysdep/AsmMacros_sparc.h [moved from libdha/sysdep/AsmMacros_sparc.h with 100% similarity]
vidix/sysdep/AsmMacros_x86.h [moved from libdha/sysdep/AsmMacros_x86.h with 100% similarity]
vidix/sysdep/libdha_os2.c [moved from libdha/sysdep/libdha_os2.c with 100% similarity]
vidix/sysdep/libdha_win32.c [moved from libdha/sysdep/libdha_win32.c with 100% similarity]
vidix/sysdep/pci_386bsd.c [moved from libdha/sysdep/pci_386bsd.c with 100% similarity]
vidix/sysdep/pci_alpha.c [moved from libdha/sysdep/pci_alpha.c with 100% similarity]
vidix/sysdep/pci_arm32.c [moved from libdha/sysdep/pci_arm32.c with 100% similarity]
vidix/sysdep/pci_bsdi.c [moved from libdha/sysdep/pci_bsdi.c with 100% similarity]
vidix/sysdep/pci_freebsd.c [moved from libdha/sysdep/pci_freebsd.c with 100% similarity]
vidix/sysdep/pci_ia64.c [moved from libdha/sysdep/pci_ia64.c with 100% similarity]
vidix/sysdep/pci_isc.c [moved from libdha/sysdep/pci_isc.c with 100% similarity]
vidix/sysdep/pci_linux.c [moved from libdha/sysdep/pci_linux.c with 100% similarity]
vidix/sysdep/pci_lynx.c [moved from libdha/sysdep/pci_lynx.c with 100% similarity]
vidix/sysdep/pci_mach386.c [moved from libdha/sysdep/pci_mach386.c with 100% similarity]
vidix/sysdep/pci_netbsd.c [moved from libdha/sysdep/pci_netbsd.c with 100% similarity]
vidix/sysdep/pci_openbsd.c [moved from libdha/sysdep/pci_openbsd.c with 100% similarity]
vidix/sysdep/pci_os2.c [moved from libdha/sysdep/pci_os2.c with 100% similarity]
vidix/sysdep/pci_powerpc.c [moved from libdha/sysdep/pci_powerpc.c with 100% similarity]
vidix/sysdep/pci_sco.c [moved from libdha/sysdep/pci_sco.c with 100% similarity]
vidix/sysdep/pci_sparc.c [moved from libdha/sysdep/pci_sparc.c with 100% similarity]
vidix/sysdep/pci_svr4.c [moved from libdha/sysdep/pci_svr4.c with 100% similarity]
vidix/sysdep/pci_win32.c [moved from libdha/sysdep/pci_win32.c with 100% similarity]
vidix/sysdep/pci_x86.c [moved from libdha/sysdep/pci_x86.c with 100% similarity]
vidix/unichrome_vid.c

index e683d9e..12e18a1 100644 (file)
--- 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])
 
similarity index 100%
rename from libdha/AsmMacros.h
rename to vidix/AsmMacros.h
index b05b3b4..a97666f 100644 (file)
@@ -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
similarity index 100%
rename from libdha/bin/README
rename to vidix/bin/README
similarity index 100%
rename from libdha/bin/mapdev.vxd
rename to vidix/bin/mapdev.vxd
index f0109bf..ebb4869 100644 (file)
@@ -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"
similarity index 100%
rename from libdha/libdha.c
rename to vidix/libdha.c
similarity index 100%
rename from libdha/libdha.h
rename to vidix/libdha.h
index aacf04e..c52a8fb 100644 (file)
@@ -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"
 
index 5d8277a..c3bb342 100644 (file)
@@ -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
similarity index 100%
rename from libdha/mtrr.c
rename to vidix/mtrr.c
index 25b6b8f..2e37806 100644 (file)
@@ -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"
similarity index 100%
rename from libdha/pci.c
rename to vidix/pci.c
similarity index 100%
rename from libdha/pci.db
rename to vidix/pci.db
similarity index 98%
rename from libdha/pci_db2c.awk
rename to vidix/pci_db2c.awk
index feaa1c7..3d487d1 100644 (file)
@@ -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;
index 2a9c849..c361da9 100644 (file)
@@ -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"
index d89cc38..3eb227f 100644 (file)
 #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
index b0a8970..dc78c82 100644 (file)
@@ -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"
index 01a2000..8533bb3 100644 (file)
@@ -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"
 
index 40f6ebd..5fbb832 100644 (file)
@@ -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"
index d3033b6..5c85f70 100644 (file)
@@ -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"