diff options
| author | hailfinger <hailfinger@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1> | 2011-03-07 01:08:09 +0000 |
|---|---|---|
| committer | hailfinger <hailfinger@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1> | 2011-03-07 01:08:09 +0000 |
| commit | ecd28131d7ba98c29438f6d78756e894f3177b7b (patch) | |
| tree | 381d046fea47f794966eae15695917e0f19c0eba /programmer.h | |
| parent | d451cad61905ab88d63fb35e89384f0b30c4b2b9 (diff) | |
| download | flashrom-ecd28131d7ba98c29438f6d78756e894f3177b7b.tar.gz | |
Simplify pcidev_init by killing the vendorid parameter which was pretty
useless anyway since it was present in the pcidevs parameter as well.
This also allows us to handle multiple programmers with different vendor
IDs in the same driver.
Fix compilation of flashrom with only the nicrealtek driver.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@1274 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'programmer.h')
| -rw-r--r-- | programmer.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/programmer.h b/programmer.h index 7a497f8..47b3e4a 100644 --- a/programmer.h +++ b/programmer.h @@ -36,7 +36,6 @@ enum programmer { #endif #if CONFIG_NICREALTEK == 1 PROGRAMMER_NICREALTEK, - PROGRAMMER_NICREALTEK2, #endif #if CONFIG_NICNATSEMI == 1 PROGRAMMER_NICNATSEMI, @@ -220,7 +219,7 @@ struct pcidev_status { const char *device_name; }; uintptr_t pcidev_validate(struct pci_dev *dev, int bar, const struct pcidev_status *devs); -uintptr_t pcidev_init(uint16_t vendor_id, int bar, const struct pcidev_status *devs); +uintptr_t pcidev_init(int bar, const struct pcidev_status *devs); /* rpci_write_* are reversible writes. The original PCI config space register * contents will be restored on shutdown. */ @@ -384,12 +383,10 @@ extern const struct pcidev_status drkaiser_pcidev[]; /* nicrealtek.c */ #if CONFIG_NICREALTEK == 1 int nicrealtek_init(void); -int nicsmc1211_init(void); int nicrealtek_shutdown(void); void nicrealtek_chip_writeb(uint8_t val, chipaddr addr); uint8_t nicrealtek_chip_readb(const chipaddr addr); extern const struct pcidev_status nics_realtek[]; -extern const struct pcidev_status nics_realteksmc1211[]; #endif /* nicnatsemi.c */ |