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 --- ft2232_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ft2232_spi.c') diff --git a/ft2232_spi.c b/ft2232_spi.c index dc17d00..81be051 100644 --- a/ft2232_spi.c +++ b/ft2232_spi.c @@ -57,7 +57,7 @@ #define OLIMEX_ARM_OCD_H_PID 0x002B #define OLIMEX_ARM_TINY_H_PID 0x002A -const struct usbdev_status devs_ft2232spi[] = { +const struct dev_entry devs_ft2232spi[] = { {FTDI_VID, FTDI_FT2232H_PID, OK, "FTDI", "FT2232H"}, {FTDI_VID, FTDI_FT4232H_PID, OK, "FTDI", "FT4232H"}, {FTDI_VID, FTDI_FT232H_PID, OK, "FTDI", "FT232H"}, -- cgit v1.1