path: root/nicintel.c
diff options
authorStefan Tauner <>2012-12-27 18:40:36 +0000
committerStefan Tauner <>2012-12-27 18:40:36 +0000
commit4b24a2d70b79f3288370fd5b4f472bdf218f16e8 (patch)
treeb4ba0971a1d5ff2f8e1693ae66b33e8c8cda1843 /nicintel.c
parentaf358d6af23b21f93f6e27278e76eec21a3d148f (diff)
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 <>
Diffstat (limited to 'nicintel.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/nicintel.c b/nicintel.c
index 4399377..d210d78 100644
--- a/nicintel.c
+++ b/nicintel.c
@@ -27,7 +27,7 @@
uint8_t *nicintel_bar;
uint8_t *nicintel_control_bar;
-const struct pcidev_status nics_intel[] = {
+const struct dev_entry nics_intel[] = {
{PCI_VENDOR_ID_INTEL, 0x1209, NT, "Intel", "8255xER/82551IT Fast Ethernet Controller"},
{PCI_VENDOR_ID_INTEL, 0x1229, OK, "Intel", "82557/8/9/0/1 Ethernet Pro 100"},
OpenPOWER on IntegriCloud