summaryrefslogtreecommitdiffstats
path: root/pcidev.c
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2009-05-17 22:57:34 +0000
committerUwe Hermann <uwe@hermann-uwe.de>2009-05-17 22:57:34 +0000
commiteaefb48ee5137db9c508acbb8b5a59c6f8fa1a94 (patch)
tree07041ee05a931c6a5fda882d9ac44632e94663ea /pcidev.c
parent525339c32b6ec965117442bcc188b3261fb006ff (diff)
downloadflashrom-eaefb48ee5137db9c508acbb8b5a59c6f8fa1a94.tar.gz
flashrom-eaefb48ee5137db9c508acbb8b5a59c6f8fa1a94.tar.bz2
flashrom-eaefb48ee5137db9c508acbb8b5a59c6f8fa1a94.zip
Various smaller flashrom improvements
- Document new 'satasii' programmer in -L output and manpage. - Drop PCI_IO_BASE_ADDRESS, pci.h has such #defines already. - Beautify flashrom output and make it more consistent. - Same for the 'make' output (reordered some $CC parameters). Build-tested on i386, shouldn't break any builds, I think. - Some variable renaming and other cosmetic fixes. Corresponding to flashrom svn r529. Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de> Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
Diffstat (limited to 'pcidev.c')
-rw-r--r--pcidev.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/pcidev.c b/pcidev.c
index 5dab83f08..ccbcba7eb 100644
--- a/pcidev.c
+++ b/pcidev.c
@@ -42,16 +42,16 @@ uint32_t pcidev_validate(struct pci_dev *dev, struct pcidev_status *devs)
continue;
/* Don't use dev->base_addr[0], won't work on older libpci. */
- addr = pci_read_long(dev, PCI_IO_BASE_ADDRESS) & ~0x03;
+ addr = pci_read_long(dev, PCI_BASE_ADDRESS_0) & ~0x03;
- printf("Found \"%s %s\" (%04x:%04x, BDF %02x:%02x.%x)\n",
+ printf("Found \"%s %s\" (%04x:%04x, BDF %02x:%02x.%x).\n",
devs[i].vendor_name, devs[i].device_name, dev->vendor_id,
dev->device_id, dev->bus, dev->dev, dev->func);
if (devs[i].status == PCI_NT) {
- printf("===\nThis PCI device is UNTESTED. Please email "
- "a report including the 'flashrom -p xxxxxx'\n"
- "output to flashrom@coreboot.org if it works "
+ printf("===\nThis PCI device is UNTESTED. Please "
+ "report the 'flashrom -p xxxx' output \n"
+ "to flashrom@coreboot.org if it works "
"for you. Thank you for your help!\n===\n");
}
@@ -98,7 +98,7 @@ uint32_t pcidev_init(uint16_t vendor_id, struct pcidev_status *devs)
exit(1);
} else if (found > 1) {
fprintf(stderr, "Error: Multiple supported PCI devices found. "
- "Please use 'flashrom -p xxxxxx=bb:dd.f' \n"
+ "Use 'flashrom -p xxxx=bb:dd.f' \n"
"to explicitly select the card with the given BDF "
"(PCI bus, device, function).\n");
exit(1);