[MPlayer-cvslog] r30094 - in trunk: Makefile vidix vidix/pci_db2c.awk vidix/pci_names.c
diego
subversion at mplayerhq.hu
Sun Dec 20 22:11:40 CET 2009
Author: diego
Date: Sun Dec 20 22:11:39 2009
New Revision: 30094
Log:
Do not auto-generate the C code to handle PCI vendor and device names.
This part of the code does not change so there is no point in generating it.
Added:
trunk/vidix/pci_names.c
Modified:
trunk/Makefile
trunk/vidix/ (props changed)
trunk/vidix/pci_db2c.awk
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile Sun Dec 20 21:57:44 2009 (r30093)
+++ trunk/Makefile Sun Dec 20 22:11:39 2009 (r30094)
@@ -895,7 +895,7 @@ tremor/%: CFLAGS += $(CFLAGS_TREMOR_LOW)
vidix/%: CFLAGS += $(CFLAGS_DHAHELPER) $(CFLAGS_SVGALIB_HELPER)
-VIDIX_PCI_FILES = vidix/pci_dev_ids.c vidix/pci_ids.h vidix/pci_names.c \
+VIDIX_PCI_FILES = vidix/pci_dev_ids.c vidix/pci_ids.h vidix/pci_vendor_ids.h \
vidix/pci_vendors.h
$(VIDIX_PCI_FILES): vidix/pci_db2c.awk vidix/pci.db
Modified: trunk/vidix/pci_db2c.awk
==============================================================================
--- trunk/vidix/pci_db2c.awk Sun Dec 20 21:57:44 2009 (r30093)
+++ trunk/vidix/pci_db2c.awk Sun Dec 20 22:11:39 2009 (r30094)
@@ -34,12 +34,12 @@ BEGIN {
with_pci_db = ARGV[2];
dev_ids_c_file = "vidix/pci_dev_ids.c"
ids_h_file = "vidix/pci_ids.h"
- names_c_file = "vidix/pci_names.c"
+ 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(names_c_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;
@@ -49,12 +49,12 @@ BEGIN {
print "#include \"pci_vendors.h\"" > ids_h_file
print "" > ids_h_file
- print "#include <stddef.h>" > names_c_file
- print "#include \"pci_names.h\"" > names_c_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\"" > names_c_file
- print "" > names_c_file
- print "static struct vendor_id_s vendor_ids[] = {" > names_c_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;
init_name_db();
@@ -67,7 +67,7 @@ BEGIN {
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]) > names_c_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;
@@ -100,10 +100,9 @@ BEGIN {
}
print_guards_end(vendors_h_file);
print_guards_end(ids_h_file);
- if (with_pci_db) print "};" > names_c_file
+ if (with_pci_db) print "};" > vendor_ids_h_file
print "{ 0xFFFF, NULL }" > dev_ids_c_file;
print "};" > dev_ids_c_file
- print_func_bodies(names_c_file);
}
function construct_guard_name(out_file)
@@ -135,41 +134,6 @@ function print_head(out_file)
print "" > out_file
}
-function print_func_bodies(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 " if (vendor_ids[i].id == id)" > out_file
- print " 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 " if (vendor_ids[i].id == vendor_id) {" > out_file
- print " j = 0;" > out_file
- print " while (vendor_ids[i].dev_list[j].id != 0xFFFF) {" > out_file
- print " if (vendor_ids[i].dev_list[j].id == device_id)" > out_file
- print " return vendor_ids[i].dev_list[j].name;" > out_file
- print " j++;" > out_file
- print " };" > out_file
- print " break;" > out_file
- print " }" > out_file
- print " }" > out_file
- }
- print " return NULL;" > out_file
- print "}" > out_file
-}
-
function kill_double_quoting(fld)
{
n = split(fld, phrases, "[\"]");
Added: trunk/vidix/pci_names.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/vidix/pci_names.c Sun Dec 20 22:11:39 2009 (r30094)
@@ -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;
+}
More information about the MPlayer-cvslog
mailing list