summaryrefslogtreecommitdiffstats
path: root/ogp_spi.c
diff options
context:
space:
mode:
authorCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2013-01-05 23:52:45 +0000
committerCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2013-01-05 23:52:45 +0000
commita2faddf7d38e4651ce6654c62b668ab02b909b58 (patch)
tree1a13a2aa0134dbede16c017dd102efc81eb97ee0 /ogp_spi.c
parentc6fa32d2b5c08d2fcc92fee2974a3fc02a3ca1f7 (diff)
downloadast2050-flashrom-a2faddf7d38e4651ce6654c62b668ab02b909b58.zip
ast2050-flashrom-a2faddf7d38e4651ce6654c62b668ab02b909b58.tar.gz
Decouple BAR reading from pci device init, handle errors gracefully
Pcidev_init() now returns struct pci_device * instead of a BAR stored in PCI config space. This allows for real error checking instead of having exit(1) everywhere in pcidev.c. Thanks to Niklas Söderlund for coming up with the original error handling patch which was slightly modified and folded into this patch. Move the declaration of struct pci_device in programmer.h before the first user. Corresponding to flashrom svn r1644. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Diffstat (limited to 'ogp_spi.c')
-rw-r--r--ogp_spi.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/ogp_spi.c b/ogp_spi.c
index 6fb1a77..0c09d6a 100644
--- a/ogp_spi.c
+++ b/ogp_spi.c
@@ -105,6 +105,7 @@ static int ogp_spi_shutdown(void *data)
int ogp_spi_init(void)
{
+ struct pci_dev *dev = NULL;
char *type;
type = extract_programmer_param("rom");
@@ -131,8 +132,11 @@ int ogp_spi_init(void)
if (rget_io_perms())
return 1;
- io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, ogp_spi);
+ dev = pcidev_init(ogp_spi, PCI_BASE_ADDRESS_0);
+ if (!dev)
+ return 1;
+ io_base_addr = pcidev_readbar(dev, PCI_BASE_ADDRESS_0);
ogp_spibar = physmap("OGP registers", io_base_addr, 4096);
if (register_shutdown(ogp_spi_shutdown, NULL))
OpenPOWER on IntegriCloud