diff options
| author | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2013-01-05 23:52:45 +0000 |
|---|---|---|
| committer | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2013-01-05 23:52:45 +0000 |
| commit | b1c04297f1f115cdb904644ae48f1234a3cbc16e (patch) | |
| tree | 1a13a2aa0134dbede16c017dd102efc81eb97ee0 /drkaiser.c | |
| parent | e50ae6b37e1e49359254ac64bc6052744128f569 (diff) | |
| download | flashrom-b1c04297f1f115cdb904644ae48f1234a3cbc16e.zip flashrom-b1c04297f1f115cdb904644ae48f1234a3cbc16e.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.
Binary file (standard input) matches
Corresponding to flashrom svn r1644.
Diffstat (limited to 'drkaiser.c')
| -rw-r--r-- | drkaiser.c | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -64,17 +64,20 @@ static int drkaiser_shutdown(void *data) int drkaiser_init(void) { + struct pci_dev *dev = NULL; uint32_t addr; if (rget_io_perms()) return 1; - /* No need to check for errors, pcidev_init() will not return in case of errors. */ - addr = pcidev_init(PCI_BASE_ADDRESS_2, drkaiser_pcidev); + dev = pcidev_init(drkaiser_pcidev, PCI_BASE_ADDRESS_2); + if (!dev) + return 1; + + addr = pcidev_readbar(dev, PCI_BASE_ADDRESS_2); /* Write magic register to enable flash write. */ - rpci_write_word(pcidev_dev, PCI_MAGIC_DRKAISER_ADDR, - PCI_MAGIC_DRKAISER_VALUE); + rpci_write_word(dev, PCI_MAGIC_DRKAISER_ADDR, PCI_MAGIC_DRKAISER_VALUE); /* Map 128kB flash memory window. */ drkaiser_bar = physmap("Dr. Kaiser PC-Waechter flash memory", |
