From 4b24a2d70b79f3288370fd5b4f472bdf218f16e8 Mon Sep 17 00:00:00 2001 From: Stefan Tauner Date: Thu, 27 Dec 2012 18:40:36 +0000 Subject: Unify usbdev_status and pcidev_status into dev_entry Once upon a time usbdev_status was created for the ft2232 programmer. Its IDs are semantically different to pcidev_status because they indicate USB instead of PCI IDs, but apart from that both data structures are equal. This change makes life easier for everything involved in handling and printing the status of devices that is noted in those structures by combining them into dev_entry. It is still possible to distinguish between PCI and USB devices indirectly by using the struct programmer's type field. Also, add a programmer column to the PCI and USB devices lists. Corresponding to flashrom svn r1632. Signed-off-by: Stefan Tauner Acked-by: Carl-Daniel Hailfinger --- pcidev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pcidev.c') diff --git a/pcidev.c b/pcidev.c index bfc8a5d..1a26e99 100644 --- a/pcidev.c +++ b/pcidev.c @@ -154,7 +154,7 @@ uintptr_t pcidev_readbar(struct pci_dev *dev, int bar) return (uintptr_t)addr; } -uintptr_t pcidev_init(int bar, const struct pcidev_status *devs) +uintptr_t pcidev_init(int bar, const struct dev_entry *devs) { struct pci_dev *dev; struct pci_filter filter; -- cgit v1.1