diff options
| author | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2012-10-20 09:13:16 +0000 |
|---|---|---|
| committer | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2012-10-20 09:13:16 +0000 |
| commit | d7d423bbc1d2564c60daaecd9ab1dca3843c5fea (patch) | |
| tree | bc9d591677afbe3dae8f9a01a70f95f9487982a7 /nicrealtek.c | |
| parent | 99f947ddc8156eb37b5dafc076480f405c9be0b6 (diff) | |
| download | flashrom-d7d423bbc1d2564c60daaecd9ab1dca3843c5fea.tar.gz flashrom-d7d423bbc1d2564c60daaecd9ab1dca3843c5fea.tar.bz2 flashrom-d7d423bbc1d2564c60daaecd9ab1dca3843c5fea.zip | |
Add a bunch of new/tested stuff and various small changes 15
Tested Mainboards:
OK:
- Foxconn P55MX
http://www.flashrom.org/pipermail/flashrom/2012-October/010002.html
Tested flash chips:
- Eon EN25F64 to PR (+PR)
http://paste.flashrom.org/view.php?id=1426
- Macronix MX25L1005 to PREW (+PREW)
http://www.flashrom.org/pipermail/flashrom/2012-October/010004.html
- Set SST39VF512 to PREW (+W)
http://www.flashrom.org/pipermail/flashrom/2012-September/009958.html
Tested chipsets:
- Z77 (only reading was really tested)
Miscellaneous:
- Fix ft2232_spi's parameter parsing.
- Fix nicrealtek's init (always segfaulted since r1586 oops).
- Add another T60 variant to the laptop whitelist.
- Improve message shown when image file size does not match flash chip
- Refine messages regarding the flash descriptor override strap according
to the findings by Vladislav Bykov on his P55MX.
- Fix the ID of EN25F64.
- Demote and clarify debug message in serprog_delay().
- Minor other cleanups.
Corresponding to flashrom svn r1613.
Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Diffstat (limited to 'nicrealtek.c')
| -rw-r--r-- | nicrealtek.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nicrealtek.c b/nicrealtek.c index 779d0233a..92f48a8c4 100644 --- a/nicrealtek.c +++ b/nicrealtek.c @@ -60,6 +60,14 @@ static int nicrealtek_shutdown(void *data) int nicrealtek_init(void) { + if (rget_io_perms()) + return 1; + + io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, nics_realtek); + + if (register_shutdown(nicrealtek_shutdown, NULL)) + return 1; + /* Beware, this ignores the vendor ID! */ switch (pcidev_dev->device_id) { case 0x8139: /* RTL8139 */ @@ -74,14 +82,6 @@ int nicrealtek_init(void) break; } - if (rget_io_perms()) - return 1; - - io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, nics_realtek); - - if (register_shutdown(nicrealtek_shutdown, NULL)) - return 1; - register_par_programmer(&par_programmer_nicrealtek, BUS_PARALLEL); return 0; |