[syslinux] [PATCH] pci: rename get_module_name_from_pci_ids

Sebastian Herbszt herbszt at gmx.de
Sat Aug 23 13:17:39 PDT 2008


Rename get_module_name_from_pci_ids to get_module_name_from_pcimap since
the module names are read from the modules.pcimap and not pci.ids file.

- Sebastian

diff --git a/com32/include/sys/pci.h b/com32/include/sys/pci.h
index 1de095a..048841c 100644
--- a/com32/include/sys/pci.h
+++ b/com32/include/sys/pci.h
@@ -118,6 +118,6 @@ void free_pci_domain(struct pci_domain *domain);
 struct match * find_pci_device(const struct pci_domain *pci_domain,
 			       struct match *list);
 int get_name_from_pci_ids(struct pci_domain *pci_domain);
-int get_module_name_from_pci_ids(struct pci_domain *pci_domain);
+int get_module_name_from_pcimap(struct pci_domain *pci_domain);
 
 #endif /* _SYS_PCI_H */
diff --git a/com32/lib/pci/scan.c b/com32/lib/pci/scan.c
index 98df0dd..8b242ef 100644
--- a/com32/lib/pci/scan.c
+++ b/com32/lib/pci/scan.c
@@ -73,7 +73,7 @@ static int hex_to_int(char *hexa)
 
 /* Try to match any pci device to the appropriate kernel module */
 /* it uses the modules.pcimap from the boot device */
-int get_module_name_from_pci_ids(struct pci_domain *domain)
+int get_module_name_from_pcimap(struct pci_domain *domain)
 {
   char line[MAX_LINE];
   char module_name[21]; // the module name field is 21 char long
diff --git a/com32/modules/pcitest.c b/com32/modules/pcitest.c
index 240f19f..b79b29f 100644
--- a/com32/modules/pcitest.c
+++ b/com32/modules/pcitest.c
@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
   get_name_from_pci_ids(pci_domain);
 
   /* Detecting which kernel module should match each device */
-  get_module_name_from_pci_ids(pci_domain);
+  get_module_name_from_pcimap(pci_domain);
 
   /* display the pci devices we found */
   display_pci_devices(pci_domain);




More information about the Syslinux mailing list