Am 25.12.2012 12:31 schrieb Stefan Tauner:
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_status.
It is still possible to distinguish between PCI and USB devices indirectly by using the struct programmer's type field.
Signed-off-by: Stefan Tauner stefan.tauner@student.tuwien.ac.at
Apart from the hunk below (print_supported_pcidevs is dead, kill it and don't just move it), this is
Acked-by: Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net
diff --git a/programmer.h b/programmer.h index e2bb3d8..305bd00 100644 --- a/programmer.h +++ b/programmer.h @@ -241,12 +248,6 @@ int rpci_write_word(struct pci_dev *dev, int reg, uint16_t data); int rpci_write_long(struct pci_dev *dev, int reg, uint32_t data); #endif
-/* print.c */ -#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_NICINTEL+CONFIG_NICINTEL_SPI+CONFIG_OGP_SPI+CONFIG_SATAMV >= 1 -/* Not needed for CONFIG_INTERNAL, but for all other PCI-based programmers. */ -void print_supported_pcidevs(const struct pcidev_status *devs); -#endif
struct usbdev_status { uint16_t vendor_id; uint16_t device_id; @@ -262,6 +263,12 @@ struct pcidev_status { const char *device_name; };
+/* print.c */ +#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_NICINTEL+CONFIG_NICINTEL_SPI+CONFIG_OGP_SPI+CONFIG_SATAMV >= 1 +/* Not needed for CONFIG_INTERNAL, but for all other PCI-based programmers. */ +void print_supported_pcidevs(const struct pcidev_status *devs); +#endif
#if CONFIG_INTERNAL == 1 /* board_enable.c */ int board_parse_parameter(const char *boardstring, const char **vendor, const char **model);
Regards, Carl-Daniel