Fri Apr 6 17:20:49 CEST 2007

Author: ben
Date: Fri Apr  6 17:20:49 2007
New Revision: 22918

Added:
   trunk/vidix/AsmMacros.h
      - copied unchanged from r22917, /trunk/libdha/AsmMacros.h
   trunk/vidix/bin/
      - copied from r22917, /trunk/libdha/bin/
   trunk/vidix/dhahelperwin/
      - copied from r22917, /trunk/libdha/dhahelperwin/
   trunk/vidix/kernelhelper/
      - copied from r22917, /trunk/libdha/kernelhelper/
   trunk/vidix/libdha.c
      - copied unchanged from r22917, /trunk/libdha/libdha.c
   trunk/vidix/libdha.h
      - copied unchanged from r22917, /trunk/libdha/libdha.h
   trunk/vidix/mtrr.c
      - copied unchanged from r22917, /trunk/libdha/mtrr.c
   trunk/vidix/pci.c
      - copied unchanged from r22917, /trunk/libdha/pci.c
   trunk/vidix/pci.db
      - copied unchanged from r22917, /trunk/libdha/pci.db
   trunk/vidix/pci_db2c.awk
   trunk/vidix/sysdep/
      - copied from r22917, /trunk/libdha/sysdep/
Removed:
   trunk/libdha/AsmMacros.h
   trunk/libdha/bin/
   trunk/libdha/dhahelperwin/
   trunk/libdha/kernelhelper/
   trunk/libdha/libdha.c
   trunk/libdha/libdha.h
   trunk/libdha/mtrr.c
   trunk/libdha/pci.c
   trunk/libdha/pci.db
   trunk/libdha/pci_db2c.awk
   trunk/libdha/sysdep/
Modified:
   trunk/Makefile
   trunk/vidix/Makefile
   trunk/vidix/cyberblade_vid.c
   trunk/vidix/mach64_vid.c
   trunk/vidix/mga_vid.c
   trunk/vidix/nvidia_vid.c
   trunk/vidix/pm3_vid.c
   trunk/vidix/radeon_vid.c
   trunk/vidix/savage_vid.c
   trunk/vidix/sis_bridge.c
   trunk/vidix/sis_vid.c
   trunk/vidix/unichrome_vid.c

Log:
merged libdha and libvidix, moved all files from libdha to vidix directory

Modified: trunk/Makefile
==============================================================================

--- trunk/Makefile	(original)
+++ trunk/Makefile	Fri Apr  6 17:20:49 2007
@@ -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 m
 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])
 

Modified: trunk/vidix/Makefile
==============================================================================
--- trunk/vidix/Makefile	(original)
+++ trunk/vidix/Makefile	Fri Apr  6 17:20:49 2007
@@ -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

Modified: trunk/vidix/cyberblade_vid.c
==============================================================================
--- trunk/vidix/cyberblade_vid.c	(original)
+++ trunk/vidix/cyberblade_vid.c	Fri Apr  6 17:20:49 2007
@@ -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"

Modified: trunk/vidix/mach64_vid.c
==============================================================================
--- trunk/vidix/mach64_vid.c	(original)
+++ trunk/vidix/mach64_vid.c	Fri Apr  6 17:20:49 2007
@@ -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"
 

Modified: trunk/vidix/mga_vid.c
==============================================================================
--- trunk/vidix/mga_vid.c	(original)
+++ trunk/vidix/mga_vid.c	Fri Apr  6 17:20:49 2007
@@ -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

Modified: trunk/vidix/nvidia_vid.c
==============================================================================
--- trunk/vidix/nvidia_vid.c	(original)
+++ trunk/vidix/nvidia_vid.c	Fri Apr  6 17:20:49 2007
@@ -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"

Added: trunk/vidix/pci_db2c.awk
==============================================================================
--- (empty file)
+++ trunk/vidix/pci_db2c.awk	Fri Apr  6 17:20:49 2007
@@ -0,0 +1,275 @@
+# This file converts given pci.db to "C" source and header files
+# For latest version of pci ids see: http://pciids.sf.net
+# Copyright 2002 Nick Kurshev
+#
+# Usage: awk -f pci_db2c.awk pci.db
+#
+# Tested with Gawk v 3.0.x and Mawk 1.3.3
+# But it should work with standard Awk implementations (hopefully).
+# (Nobody tested it with Nawk, but it should work, too).
+#
+
+BEGIN {
+
+    if(ARGC != 2) {
+# check for arguments:
+	print "Usage awk -f pci_db2c.awk pci.db (and make sure pci.db file exists first)";
+	exit(1);
+    }
+    in_file = ARGV[1];
+    vendor_file = "pci_vendors.h";
+    ids_file = "pci_ids.h"
+    name_file = "pci_names.c"
+    name_h_file = "pci_names.h"
+    dev_ids_file = "pci_dev_ids.c"
+    line=0;
+# print out head lines
+    print_head(vendor_file);
+    print_head(ids_file);
+    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
+    print "#ifndef PCI_IDS_INCLUDED" >ids_file
+    print "#define PCI_IDS_INCLUDED 1">ids_file
+    print "" >ids_file
+    print "#include \"pci_vendors.h\"">ids_file
+    print "" >ids_file
+
+    print "#ifndef PCI_NAMES_INCLUDED" >name_h_file
+    print "#define PCI_NAMES_INCLUDED 1">name_h_file
+    print "" >name_h_file
+    print_name_struct(name_h_file);
+    print "#include <stddef.h>">name_file
+    print "#include \"pci_names.h\"">name_file
+    print "#include \"pci_dev_ids.c\"">name_file
+    print "">name_file
+    print "static struct vendor_id_s vendor_ids[] = {">name_file
+    first_pass=1;
+    init_name_db();
+    while(getline <in_file) 
+    {
+# count up lines
+	line++;
+	n=split($0, field, "[\t]");
+	name_field = kill_double_quoting(field[3])
+	if(field[1] == "v" && length(field[3])>0 && field[4] == "0")
+	{
+		init_device_db()
+		svend_name = get_short_vendor_name(field[3])
+		printf("#define VENDOR_%s\t", svend_name) >vendor_file;
+		if(length(svend_name) < 9) printf("\t") >vendor_file;
+		printf("0x%s /*%s*/\n",field[2], name_field) >vendor_file;
+		printf("{ 0x%s, \"%s\", dev_lst_%s },\n",field[2], name_field, field[2]) >name_file;
+		printf("/* Vendor: %s: %s */\n", field[2], name_field) > ids_file
+		if(first_pass == 1) { first_pass=0; }
+		else	{ print "{ 0xFFFF,  NULL }\n};" >dev_ids_file; }
+		printf("static const struct device_id_s dev_lst_%s[]={\n", field[2])>dev_ids_file
+	}
+	if(field[1] == "d" && length(field[3])>0 && field[4] == "0")
+	{
+		sdev_name = get_short_device_name(field[3])
+		full_name = sprintf("#define DEVICE_%s_%s", svend_name, sdev_name);
+		printf("%s\t", full_name) >ids_file
+		if(length(full_name) < 9) printf("\t") >ids_file;
+		if(length(full_name) < 17) printf("\t") >ids_file;
+		if(length(full_name) < 25) printf("\t") >ids_file;
+		if(length(full_name) < 32) printf("\t") >ids_file;
+		if(length(full_name) < 40) printf("\t") >ids_file;
+		if(length(full_name) < 48) printf("\t") >ids_file;
+		printf("0x%s /*%s*/\n", substr(field[2], 5), name_field) >ids_file
+		printf("{ 0x%s, \"%s\" },\n", substr(field[2], 5), name_field) >dev_ids_file
+	}
+	if(field[1] == "s" && length(field[3])>0 && field[4] == "0")
+	{
+		subdev_name = get_short_subdevice_name(field[3])
+		full_name = sprintf("#define SUBDEVICE_%s_%s", svend_name, subdev_name)
+		printf("\t%s\t", full_name) >ids_file
+		if(length(full_name) < 9) printf("\t") >ids_file;
+		if(length(full_name) < 17) printf("\t") >ids_file;
+		if(length(full_name) < 25) printf("\t") >ids_file;
+		if(length(full_name) < 32) printf("\t") >ids_file;
+		if(length(full_name) < 40) printf("\t") >ids_file;
+		printf("0x%s /*%s*/\n", substr(field[2], 9), name_field) >ids_file
+	}
+    }
+    print "Total lines parsed:", line;
+    print "">vendor_file
+    print "#endif/*PCI_VENDORS_INCLUDED*/">vendor_file
+    print "">ids_file
+    print "#endif/*PCI_IDS_INCLUDED*/">ids_file
+    print "">name_h_file
+    print "#endif/*PCI_NAMES_INCLUDED*/">name_h_file
+    print "};">name_file
+    print "{ 0xFFFF,  NULL }" >dev_ids_file;
+    print "};">dev_ids_file
+    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;
+    printf(" * File: %s\n", out_file) >out_file;
+    printf(" * This file was generated automatically. Don't modify it.\n") >out_file;
+    print "*/" >out_file;
+    return;
+}
+
+function print_name_struct(out_file)
+{
+   print "#ifdef __cplusplus" >out_file
+   print "extern \"C\" {" >out_file
+   print "#endif" >out_file
+   print "">out_file
+   print "struct device_id_s" >out_file
+   print "{" >out_file
+   print "\tunsigned short\tid;" >out_file
+   print "\tconst char *\tname;" >out_file
+   print "};" >out_file
+   print "">out_file
+   print "struct vendor_id_s" >out_file
+   print "{" >out_file
+   print "\tunsigned short\tid;" >out_file
+   print "\tconst char *\tname;" >out_file
+   print "\tconst struct device_id_s *\tdev_list;" >out_file
+   print "};" >out_file
+   print "extern const char *pci_vendor_name(unsigned short id);">out_file
+   print "extern const char *pci_device_name(unsigned short vendor_id, unsigned short device_id);">out_file
+   print "">out_file
+   print "#ifdef __cplusplus" >out_file
+   print "}" >out_file
+   print "#endif" >out_file
+   return
+}
+
+function print_func_bodies(out_file)
+{
+   print "">out_file
+   print "const char *pci_vendor_name(unsigned short id)" >out_file
+   print "{" >out_file
+   print "  unsigned i;" >out_file
+   print "  for(i=0;i<sizeof(vendor_ids)/sizeof(struct vendor_id_s);i++)">out_file
+   print "  {" >out_file
+   print "\tif(vendor_ids[i].id == id) return vendor_ids[i].name;" >out_file
+   print "  }" >out_file
+   print "  return NULL;" >out_file
+   print "}">out_file
+   print "" >out_file
+   print "const char *pci_device_name(unsigned short vendor_id, unsigned short device_id)" >out_file
+   print "{" >out_file
+   print "  unsigned i, j;" >out_file
+   print "  for(i=0;i<sizeof(vendor_ids)/sizeof(struct vendor_id_s);i++)">out_file
+   print "  {" >out_file
+   print "\tif(vendor_ids[i].id == vendor_id)" >out_file
+   print "\t{" >out_file
+   print "\t  j=0;" >out_file
+   print "\t  while(vendor_ids[i].dev_list[j].id != 0xFFFF)" >out_file
+   print "\t  {">out_file
+   print "\t\tif(vendor_ids[i].dev_list[j].id == device_id) return vendor_ids[i].dev_list[j].name;">out_file
+   print "\t\tj++;">out_file
+   print "\t  };">out_file
+   print "\t  break;" >out_file
+   print "\t}" >out_file
+   print "  }" >out_file
+   print "  return NULL;">out_file
+   print "}">out_file
+   return
+}
+
+function kill_double_quoting(fld)
+{
+  n=split(fld,phrases, "[\"]");
+  new_fld = phrases[1]
+  for(i=2;i<=n;i++) new_fld = sprintf("%s\\\"%s", new_fld, phrases[i])
+  return new_fld
+}
+
+function init_name_db()
+{
+  vendor_names[1]=""
+}
+
+function init_device_db()
+{
+#  delete device_names
+  for( i in device_names ) delete device_names[i];
+  device_names[1]=""
+#  delete subdevice_names
+  for( i in subdevice_names ) delete subdevice_names[i];
+  subdevice_names[1] = ""
+}
+
+function get_short_vendor_name(from)
+{
+  n=split(from, name, "[ ]");
+  new_name = toupper(name[1]);
+  if(length(new_name)<3) new_name = sprintf("%s_%s", new_name, toupper(name[2]));
+  n=split(new_name, name, "[^0-9A-Za-z]");
+  svendor = name[1];
+  for(i=2;i<=n;i++) svendor=sprintf("%s%s%s", svendor, length(name[i])?"_":"", name[i]);
+  new_name = svendor;
+  vend_suffix = 2;
+# check for unique 
+  while(new_name in vendor_names) 
+  {
+    new_name = sprintf("%s%u", svendor, vend_suffix)
+    vend_suffix = vend_suffix + 1;
+  }
+# Add new name in array of vendor's names
+  vendor_names[new_name] = new_name
+  return new_name;
+}
+
+function get_short_device_name(from_name)
+{
+  n=split(from_name, name, "[ ]");
+  new_name = toupper(name[1]);
+  if(length(name[2])) new_name = sprintf("%s_%s", new_name, toupper(name[2]));
+  if(length(name[3])) new_name = sprintf("%s_%s", new_name, toupper(name[3]));
+  n=split(new_name, name, "[^0-9A-Za-z]");
+  sdevice = name[1];
+  for(i=2;i<=n;i++) sdevice=sprintf("%s%s%s", sdevice, length(name[i])?"_":"", name[i]);
+  new_name = sdevice;
+  dev_suffix = 2;
+# check for unique 
+  while(new_name in device_names) 
+  {
+    new_name = sprintf("%s%u", sdevice, dev_suffix)
+    dev_suffix = dev_suffix + 1;
+  }
+# Add new name in array of device names
+  device_names[new_name] = new_name
+  return new_name;
+}
+
+function get_short_subdevice_name(from_name)
+{
+  n=split(from_name, name, "[ ]");
+  new_name = toupper(name[1]);
+  if(length(name[2])) new_name = sprintf("%s_%s", new_name, toupper(name[2]));
+  if(length(name[3])) new_name = sprintf("%s_%s", new_name, toupper(name[3]));
+  n=split(new_name, name, "[^0-9A-Za-z]");
+  ssdevice = name[1];
+  for(i=2;i<=n;i++) ssdevice=sprintf("%s%s%s", ssdevice, length(name[i])?"_":"", name[i]);
+  new_name = ssdevice;
+  sdev_suffix = 2;
+# check for unique 
+  while(new_name in subdevice_names) 
+  {
+    new_name = sprintf("%s%u", ssdevice, sdev_suffix)
+    sdev_suffix = sdev_suffix + 1;
+  }
+# Add new name in array of subdevice names
+  subdevice_names[new_name] = new_name
+  return new_name;
+}

Modified: trunk/vidix/pm3_vid.c
==============================================================================
--- trunk/vidix/pm3_vid.c	(original)
+++ trunk/vidix/pm3_vid.c	Fri Apr  6 17:20:49 2007
@@ -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"

Modified: trunk/vidix/radeon_vid.c
==============================================================================
--- trunk/vidix/radeon_vid.c	(original)
+++ trunk/vidix/radeon_vid.c	Fri Apr  6 17:20:49 2007
@@ -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

Modified: trunk/vidix/savage_vid.c
==============================================================================
--- trunk/vidix/savage_vid.c	(original)
+++ trunk/vidix/savage_vid.c	Fri Apr  6 17:20:49 2007
@@ -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"

Modified: trunk/vidix/sis_bridge.c
==============================================================================
--- trunk/vidix/sis_bridge.c	(original)
+++ trunk/vidix/sis_bridge.c	Fri Apr  6 17:20:49 2007
@@ -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"
 

Modified: trunk/vidix/sis_vid.c
==============================================================================
--- trunk/vidix/sis_vid.c	(original)
+++ trunk/vidix/sis_vid.c	Fri Apr  6 17:20:49 2007
@@ -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"

Modified: trunk/vidix/unichrome_vid.c
==============================================================================
--- trunk/vidix/unichrome_vid.c	(original)
+++ trunk/vidix/unichrome_vid.c	Fri Apr  6 17:20:49 2007
@@ -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"

