aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErwan Velu <erwan.velu@free.fr>2009-03-29 21:28:23 +0200
committerErwan Velu <erwan.velu@free.fr>2009-03-29 21:28:23 +0200
commitc4ddb8c11aadc695940715be3420c1a97364935a (patch)
treeb59ecd8f13880893098e539fab5406f4b8357b0c
parentfdc0486c5d47ca692c755b8a03550e42f5f14257 (diff)
downloadsyslinux-c4ddb8c11aadc695940715be3420c1a97364935a.tar.gz
syslinux-c4ddb8c11aadc695940715be3420c1a97364935a.tar.xz
syslinux-c4ddb8c11aadc695940715be3420c1a97364935a.zip
pci: Rename get_module_name_from_pci_idssyslinux-3.74-pre13syslinux-3.74-pre12
Impact: none 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. Signed-off-by: Sebastian Herbszt (herbszt@gmx.de)
-rw-r--r--com32/hdt/hdt-common.c2
-rw-r--r--com32/include/sys/pci.h2
-rw-r--r--com32/lib/pci/scan.c2
-rw-r--r--com32/modules/pcitest.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/com32/hdt/hdt-common.c b/com32/hdt/hdt-common.c
index 8ab0f120..12dc22ac 100644
--- a/com32/hdt/hdt-common.c
+++ b/com32/hdt/hdt-common.c
@@ -391,7 +391,7 @@ void detect_pci(struct s_hardware *hardware)
printf("PCI: Resolving module names\n");
/* Detecting which kernel module should match each device */
hardware->modules_pcimap_return_code =
- get_module_name_from_pci_ids(hardware->pci_domain,
+ get_module_name_from_pcimap(hardware->pci_domain,
hardware->modules_pcimap_path);
/* We try to detect the pxe stuff to populate the PXE: field of pci devices */
diff --git a/com32/include/sys/pci.h b/com32/include/sys/pci.h
index 18e97548..2e1871ed 100644
--- a/com32/include/sys/pci.h
+++ b/com32/include/sys/pci.h
@@ -134,7 +134,7 @@ 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, char *pciids_path);
-int get_module_name_from_pci_ids(struct pci_domain *pci_domain, char *modules_pcimap_path);
+int get_module_name_from_pcimap(struct pci_domain *pci_domain, char *modules_pcimap_path);
int get_class_name_from_pci_ids(struct pci_domain *pci_domain, char *pciids_path);
void gather_additional_pci_config(struct pci_domain *domain);
#endif /* _SYS_PCI_H */
diff --git a/com32/lib/pci/scan.c b/com32/lib/pci/scan.c
index adfec596..39f743b5 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, char *modules_pcimap_path)
+int get_module_name_from_pcimap(struct pci_domain *domain, char *modules_pcimap_path)
{
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 d13c3a6f..8b97fbea 100644
--- a/com32/modules/pcitest.c
+++ b/com32/modules/pcitest.c
@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
printf("PCI: Looking for Kernel modules\n");
/* Detecting which kernel module should match each device */
- return_code=get_module_name_from_pci_ids(pci_domain,"modules.pcimap");
+ return_code=get_module_name_from_pcimap(pci_domain,"modules.pcimap");
if (return_code == -ENOMODULESPCIMAP) {
printf("PCI: ERROR !\n");
printf("PCI: Unable to open modules.pcimap in the same directory as pcitest.c32.\n");