diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-30 00:14:20 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-30 00:14:20 +0200 |
commit | dc7f1830224e1953fb07ffcc045735b2b15af310 (patch) | |
tree | 3028341d6fd07c19b8b7c78fdfd7c411cbdce573 /vidix | |
parent | 0f81e5f9732d143ab47c9b03dfd528f3a0af4aea (diff) | |
parent | a0601ed2566d132fec57dcf163372f9f341f3c13 (diff) | |
download | mpv-dc7f1830224e1953fb07ffcc045735b2b15af310.tar.bz2 mpv-dc7f1830224e1953fb07ffcc045735b2b15af310.tar.xz |
Merge svn changes up to r30104
Ignore the broken correct-pts change in r30100.
Diffstat (limited to 'vidix')
-rwxr-xr-x | vidix/pci_db2c.awk | 366 | ||||
-rw-r--r-- | vidix/pci_names.c | 50 | ||||
-rw-r--r-- | vidix/pci_names.h | 38 |
3 files changed, 236 insertions, 218 deletions
diff --git a/vidix/pci_db2c.awk b/vidix/pci_db2c.awk index 039bf0f55a..976dd76640 100755 --- a/vidix/pci_db2c.awk +++ b/vidix/pci_db2c.awk @@ -25,266 +25,196 @@ BEGIN { - if(ARGC != 3) { -# check for arguments: - print "Usage ./pci_db2c.awk pci.db (and make sure pci.db file exists first)"; - exit(1); + if (ARGC != 3) { + # check for arguments: + print "Usage ./pci_db2c.awk pci.db (and make sure pci.db file exists first)"; + exit(1); } in_file = ARGV[1]; with_pci_db = ARGV[2]; - vendor_file = "vidix/pci_vendors.h"; - ids_file = "vidix/pci_ids.h" - name_file = "vidix/pci_names.c" - name_h_file = "vidix/pci_names.h" - dev_ids_file = "vidix/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 MPLAYER_PCI_VENDORS_H" >vendor_file - print "#define MPLAYER_PCI_VENDORS_H">vendor_file - print "" >vendor_file - print "#ifndef MPLAYER_PCI_IDS_H" >ids_file - print "#define MPLAYER_PCI_IDS_H">ids_file - print "" >ids_file - print "#include \"pci_vendors.h\"">ids_file - print "" >ids_file + dev_ids_c_file = "vidix/pci_dev_ids.c" + ids_h_file = "vidix/pci_ids.h" + vendor_ids_h_file = "vidix/pci_vendor_ids.h" + vendors_h_file = "vidix/pci_vendors.h"; + # print out head lines + print_head(vendors_h_file); + print_head(ids_h_file); + print_head(vendor_ids_h_file); + print_head(dev_ids_c_file); + print "#include <stdlib.h>" > dev_ids_c_file; + print "#include \"pci_names.h\"" > dev_ids_c_file; - print "#ifndef MPLAYER_PCI_NAMES_H" >name_h_file - print "#define MPLAYER_PCI_NAMES_H">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_guards_start(vendors_h_file); + print_guards_start(ids_h_file); + print "#include \"pci_vendors.h\"" > ids_h_file + print "" > ids_h_file + + print "#include <stddef.h>" > vendor_ids_h_file + print "#include \"pci_names.h\"" > vendor_ids_h_file if (with_pci_db) { - print "#include \"pci_dev_ids.c\"">name_file - print "">name_file - print "static struct vendor_id_s vendor_ids[] = {">name_file + print "#include \"pci_dev_ids.c\"" > vendor_ids_h_file + print "" > vendor_ids_h_file + print "static struct vendor_id_s vendor_ids[] = {" > vendor_ids_h_file } - first_pass=1; + 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; - if (with_pci_db) 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 - } + while (getline < in_file) { + 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) > vendors_h_file; + if (length(svend_name) < 9) printf("\t") > vendors_h_file; + printf("0x%s /*%s*/\n", field[2], name_field) > vendors_h_file; + if (with_pci_db) printf("{ 0x%s, \"%s\", dev_lst_%s },\n", field[2], name_field, field[2]) > vendor_ids_h_file; + printf("/* Vendor: %s: %s */\n", field[2], name_field) > ids_h_file + if (first_pass == 1) first_pass = 0; + else print "{ 0xFFFF, NULL }\n};" > dev_ids_c_file; + printf("static const struct device_id_s dev_lst_%s[] = {\n", field[2])> dev_ids_c_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_h_file + if (length(full_name) < 9) printf("\t") > ids_h_file; + if (length(full_name) < 17) printf("\t") > ids_h_file; + if (length(full_name) < 25) printf("\t") > ids_h_file; + if (length(full_name) < 32) printf("\t") > ids_h_file; + if (length(full_name) < 40) printf("\t") > ids_h_file; + if (length(full_name) < 48) printf("\t") > ids_h_file; + printf("0x%s /*%s*/\n", substr(field[2], 5), name_field) > ids_h_file + printf("{ 0x%s, \"%s\" },\n", substr(field[2], 5), name_field) > dev_ids_c_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_h_file + if (length(full_name) < 9) printf("\t") > ids_h_file; + if (length(full_name) < 17) printf("\t") > ids_h_file; + if (length(full_name) < 25) printf("\t") > ids_h_file; + if (length(full_name) < 32) printf("\t") > ids_h_file; + if (length(full_name) < 40) printf("\t") > ids_h_file; + printf("0x%s /*%s*/\n", substr(field[2], 9), name_field) > ids_h_file + } } - #print "Total lines parsed:", line; - print "">vendor_file - print "#endif /* MPLAYER_PCI_VENDORS_H */">vendor_file - print "">ids_file - print "#endif /* MPLAYER_PCI_IDS_H */">ids_file - print "">name_h_file - print "#endif /* MPLAYER_PCI_NAMES_H */">name_h_file - if (with_pci_db) print "};">name_file - print "{ 0xFFFF, NULL }" >dev_ids_file; - print "};">dev_ids_file - print_func_bodies(name_file); + print_guards_end(vendors_h_file); + print_guards_end(ids_h_file); + if (with_pci_db) print "};" > vendor_ids_h_file + print "{ 0xFFFF, NULL }" > dev_ids_c_file; + print "};" > dev_ids_c_file } -function print_includes(out_file) +function construct_guard_name(out_file) { - print "#include <stdlib.h>" >out_file; - print "#include \"pci_names.h\"" >out_file; - return; + split(out_file, path_components, "/"); + sub(".h","_h", path_components[2]); + return "MPLAYER_" toupper(path_components[2]); } -function print_head( out_file) +function print_guards_start(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; + guard_name = construct_guard_name(out_file); + printf("#ifndef %s\n", guard_name) > out_file + printf("#define %s\n", guard_name) > out_file + print "" > out_file } -function print_name_struct(out_file) +function print_guards_end(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 "const char *pci_vendor_name(unsigned short id);">out_file - print "const char *pci_device_name(unsigned short vendor_id, unsigned short device_id);">out_file - print "">out_file - return + guard_name = construct_guard_name(out_file); + print "" > out_file + printf("#endif /* %s */\n", guard_name) > out_file } -function print_func_bodies(out_file) +function print_head(out_file) { - print "">out_file - print "const char *pci_vendor_name(unsigned short id)" >out_file - print "{" >out_file - if (with_pci_db) { - 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 - if (with_pci_db) { - 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 + printf("/* File: %s\n", out_file) > out_file; + printf(" * This file was generated automatically. Don't modify it. */\n") > out_file; + print "" > out_file } 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 + 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]="" + 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] = "" + # 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; + 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; + 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; + 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; } diff --git a/vidix/pci_names.c b/vidix/pci_names.c new file mode 100644 index 0000000000..d7348446ac --- /dev/null +++ b/vidix/pci_names.c @@ -0,0 +1,50 @@ +/* + * VIDIX - VIDeo Interface for *niX. + * + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <stddef.h> +#include "pci_names.h" +#include "pci_vendor_ids.h" + +const char *pci_vendor_name(unsigned short id) +{ + unsigned i; + for (i = 0; i < sizeof(vendor_ids) / sizeof(struct vendor_id_s); i++) { + if (vendor_ids[i].id == id) + return vendor_ids[i].name; + } + return NULL; +} + +const char *pci_device_name(unsigned short vendor_id, unsigned short device_id) +{ + unsigned i, j; + for (i = 0; i < sizeof(vendor_ids) / sizeof(struct vendor_id_s); i++) { + if (vendor_ids[i].id == vendor_id) { + j = 0; + while (vendor_ids[i].dev_list[j].id != 0xFFFF) { + if (vendor_ids[i].dev_list[j].id == device_id) + return vendor_ids[i].dev_list[j].name; + j++; + }; + break; + } + } + return NULL; +} diff --git a/vidix/pci_names.h b/vidix/pci_names.h new file mode 100644 index 0000000000..cc91fb5642 --- /dev/null +++ b/vidix/pci_names.h @@ -0,0 +1,38 @@ +/* + * VIDIX - VIDeo Interface for *niX. + * + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPLAYER_PCI_NAMES_H +#define MPLAYER_PCI_NAMES_H + +struct device_id_s { + unsigned short id; + const char *name; +}; + +struct vendor_id_s { + unsigned short id; + const char *name; + const struct device_id_s *dev_list; +}; +const char *pci_vendor_name(unsigned short id); +const char *pci_device_name(unsigned short vendor_id, + unsigned short device_id); + +#endif /* MPLAYER_PCI_NAMES_H */ |