From 24c35e458da6cd59ba01d83cf07ac94daace2f6c Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Wed, 13 Jul 2011 11:22:03 +0000 Subject: Change "class" parameter name to "devclass" to avoid C++ issues In C++ "class" is a reserved keyword, and as we'll want to use libflashrom from C++ code at some point, let's make sure it doesn't cause issues. Other places in the code already used "devclass" anyway, so it also increases consistency and readability a bit. Corresponding to flashrom svn r1371. Signed-off-by: Uwe Hermann Acked-by: Uwe Hermann --- internal.c | 4 ++-- programmer.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal.c b/internal.c index 32bfb3a8..c59209e9 100644 --- a/internal.c +++ b/internal.c @@ -35,7 +35,7 @@ struct pci_dev *pci_dev_find_filter(struct pci_filter filter) return NULL; } -struct pci_dev *pci_dev_find_vendorclass(uint16_t vendor, uint16_t class) +struct pci_dev *pci_dev_find_vendorclass(uint16_t vendor, uint16_t devclass) { struct pci_dev *temp; struct pci_filter filter; @@ -48,7 +48,7 @@ struct pci_dev *pci_dev_find_vendorclass(uint16_t vendor, uint16_t class) if (pci_filter_match(&filter, temp)) { /* Read PCI class */ tmp2 = pci_read_word(temp, 0x0a); - if (tmp2 == class) + if (tmp2 == devclass) return temp; } diff --git a/programmer.h b/programmer.h index cd82dcb7..6a28dbe7 100644 --- a/programmer.h +++ b/programmer.h @@ -289,7 +289,7 @@ extern int superio_count; #endif #if NEED_PCI == 1 struct pci_dev *pci_dev_find_filter(struct pci_filter filter); -struct pci_dev *pci_dev_find_vendorclass(uint16_t vendor, uint16_t class); +struct pci_dev *pci_dev_find_vendorclass(uint16_t vendor, uint16_t devclass); struct pci_dev *pci_dev_find(uint16_t vendor, uint16_t device); struct pci_dev *pci_card_find(uint16_t vendor, uint16_t device, uint16_t card_vendor, uint16_t card_device); -- cgit v1.2.3