diff options
| author | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2011-11-09 23:40:00 +0000 |
|---|---|---|
| committer | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2011-11-09 23:40:00 +0000 |
| commit | eaacd2d4e7485d747e4e0bbd54b7bb44cf3fd179 (patch) | |
| tree | 5e023363074cbe351bc6ded9f20c3f116e6c6f1c /internal.c | |
| parent | f382e352ac63108ec0f912ff52b538c99f46c340 (diff) | |
| download | flashrom-eaacd2d4e7485d747e4e0bbd54b7bb44cf3fd179.tar.gz flashrom-eaacd2d4e7485d747e4e0bbd54b7bb44cf3fd179.tar.bz2 flashrom-eaacd2d4e7485d747e4e0bbd54b7bb44cf3fd179.zip | |
Register Parallel/LPC/FWH programmers the same way SPI programmers are registered
All programmers are now calling programmer registration functions and
direct manipulations of buses_supported are not needed/possible anymore.
Note: Programmers without parallel/LPC/FWH chip support should not call
register_par_programmer().
Additional fixes:
Set max_rom_decode.parallel for drkaiser.
Remove abuse of programmer_map_flash_region in it85spi.
Annotate several FIXMEs in it85spi.
Corresponding to flashrom svn r1463.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
Diffstat (limited to 'internal.c')
| -rw-r--r-- | internal.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/internal.c b/internal.c index fc9d9e4b6..215ce6f36 100644 --- a/internal.c +++ b/internal.c @@ -127,6 +127,19 @@ int register_superio(struct superio s) int is_laptop = 0; int laptop_ok = 0; +static const struct par_programmer par_programmer_internal = { + .chip_readb = internal_chip_readb, + .chip_readw = internal_chip_readw, + .chip_readl = internal_chip_readl, + .chip_readn = internal_chip_readn, + .chip_writeb = internal_chip_writeb, + .chip_writew = internal_chip_writew, + .chip_writel = internal_chip_writel, + .chip_writen = fallback_chip_writen, +}; + +enum chipbustype internal_buses_supported = BUS_NONE; + static int internal_shutdown(void *data) { release_io_perms(); @@ -191,9 +204,10 @@ int internal_init(void) return 1; /* Default to Parallel/LPC/FWH flash devices. If a known host controller - * is found, the init routine sets the buses_supported bitfield. + * is found, the host controller init routine sets the + * internal_buses_supported bitfield. */ - buses_supported = BUS_NONSPI; + internal_buses_supported = BUS_NONSPI; /* Initialize PCI access for flash enables */ pacc = pci_alloc(); /* Get the pci_access structure */ @@ -287,6 +301,7 @@ int internal_init(void) * Besides that, we don't check the board enable return code either. */ #if defined(__i386__) || defined(__x86_64__) || defined (__mips) + register_par_programmer(&par_programmer_internal, internal_buses_supported); return 0; #else msg_perr("Your platform is not supported yet for the internal " |