diff options
| -rw-r--r-- | board_enable.c | 14 | ||||
| -rw-r--r-- | internal.c | 19 | ||||
| -rw-r--r-- | pcidev.c | 19 | ||||
| -rw-r--r-- | programmer.h | 3 |
4 files changed, 27 insertions, 28 deletions
diff --git a/board_enable.c b/board_enable.c index 0ac522e5..22db4928 100644 --- a/board_enable.c +++ b/board_enable.c @@ -2645,17 +2645,17 @@ static const struct board_match *board_match_pci_ids(enum board_match_phase phas if (board->phase != phase) continue; - if (!pci_card_find(board->first_vendor, board->first_device, - board->first_card_vendor, - board->first_card_device)) + if (!pcidev_card_find(board->first_vendor, board->first_device, + board->first_card_vendor, + board->first_card_device)) continue; if (board->second_vendor) { if (board->second_card_vendor) { - if (!pci_card_find(board->second_vendor, - board->second_device, - board->second_card_vendor, - board->second_card_device)) + if (!pcidev_card_find(board->second_vendor, + board->second_device, + board->second_card_vendor, + board->second_card_device)) continue; } else { if (!pci_dev_find(board->second_vendor, @@ -45,25 +45,6 @@ struct pci_dev *pci_dev_find(uint16_t vendor, uint16_t device) return pcidev_scandev(&filter, NULL); } -struct pci_dev *pci_card_find(uint16_t vendor, uint16_t device, - uint16_t card_vendor, uint16_t card_device) -{ - struct pci_dev *temp = NULL; - struct pci_filter filter; - - pci_filter_init(NULL, &filter); - filter.vendor = vendor; - filter.device = device; - - while ((temp = pcidev_scandev(&filter, temp))) { - if ((card_vendor == pci_read_word(temp, PCI_SUBSYSTEM_VENDOR_ID)) - && (card_device == pci_read_word(temp, PCI_SUBSYSTEM_ID))) - return temp; - } - - return NULL; -} - #if defined(__i386__) || defined(__x86_64__) void probe_superio(void) { @@ -157,6 +157,25 @@ struct pci_dev *pcidev_scandev(struct pci_filter *filter, struct pci_dev *start) return NULL; } +struct pci_dev *pcidev_card_find(uint16_t vendor, uint16_t device, + uint16_t card_vendor, uint16_t card_device) +{ + struct pci_dev *temp = NULL; + struct pci_filter filter; + + pci_filter_init(NULL, &filter); + filter.vendor = vendor; + filter.device = device; + + while ((temp = pcidev_scandev(&filter, temp))) { + if ((card_vendor == pci_read_word(temp, PCI_SUBSYSTEM_VENDOR_ID)) + && (card_device == pci_read_word(temp, PCI_SUBSYSTEM_ID))) + return temp; + } + + return NULL; +} + struct pci_dev *pcidev_getdevfn(struct pci_dev *dev, const int func) { #if !defined(OLD_PCI_GET_DEV) diff --git a/programmer.h b/programmer.h index 6a0c3fa0..50753cf4 100644 --- a/programmer.h +++ b/programmer.h @@ -128,6 +128,7 @@ struct pci_dev *pcidev_init(const struct dev_entry *devs, int bar); struct pci_dev *pcidev_scandev(struct pci_filter *filter, struct pci_dev *start); struct pci_dev *pcidev_getdevfn(struct pci_dev *dev, const int func); struct pci_dev *pcidev_find_vendorclass(uint16_t vendor, uint16_t devclass); +struct pci_dev *pcidev_card_find(uint16_t vendor, uint16_t device, uint16_t card_vendor, uint16_t card_device); /* rpci_write_* are reversible writes. The original PCI config space register * contents will be restored on shutdown. * To clone the pci_dev instances internally, the `pacc` global @@ -262,8 +263,6 @@ extern int superio_count; #endif #if NEED_PCI == 1 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); #endif #if CONFIG_INTERNAL == 1 extern int is_laptop; |