Syslinux - Mar 2009 - [RESEND][PATCH] pci: rename get_module_name_from_pci_ids

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

Index: syslinux-3.74-pre5-2-gbf366cd/com32/include/sys/pci.h
==================================================================---
syslinux-3.74-pre5-2-gbf366cd.orig/com32/include/sys/pci.h
+++ syslinux-3.74-pre5-2-gbf366cd/com32/include/sys/pci.h
@@ -132,7 +132,7 @@ void free_pci_domain(struct pci_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);
 
 #endif /* _SYS_PCI_H */
Index: syslinux-3.74-pre5-2-gbf366cd/com32/lib/pci/scan.c
==================================================================---
syslinux-3.74-pre5-2-gbf366cd.orig/com32/lib/pci/scan.c
+++ syslinux-3.74-pre5-2-gbf366cd/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
Index: syslinux-3.74-pre5-2-gbf366cd/com32/modules/pcitest.c
==================================================================---
syslinux-3.74-pre5-2-gbf366cd.orig/com32/modules/pcitest.c
+++ syslinux-3.74-pre5-2-gbf366cd/com32/modules/pcitest.c
@@ -131,7 +131,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");
Index: syslinux-3.74-pre5-2-gbf366cd/com32/hdt/hdt-common.c
==================================================================---
syslinux-3.74-pre5-2-gbf366cd.orig/com32/hdt/hdt-common.c
+++ syslinux-3.74-pre5-2-gbf366cd/com32/hdt/hdt-common.c
@@ -217,7 +217,7 @@ void detect_pci(struct s_hardware *hardw
 
   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,hardware->modules_pcimap_path);
+ 
hardware->modules_pcimap_return_code=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
*/
   detect_pxe(hardware);

Sebastian Herbszt wrote:
> 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.
>   
Solved by:
http://git.zytor.com/?p=users/erwan/hdt.git;a=commit;h=c4ddb8c11aadc695940715be3420c1a97364935a

Thanks,
Erwan