From e9404668a19701ace750148624378461bc9fece5 Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Sat, 9 Jan 2010 02:24:17 +0000 Subject: Use the register mapping feature bit All functions which just call probe_jedec and then map flash registers are replaced by probe_jedec. All functions which call probe_jedec, map flash registers and do something else can at least eliminate mapping flash registers. Fix logic inversion in probe_jedec to map flash registers on success instead of on failure. Change a few TIMING_IGNORED to TIMING_FIXME where probe_jedec is used. Total savings: One probe function simplified, three probe functions eliminated. Corresponding to flashrom svn r839. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Michael Karcher Acked-by: Sean Nelson --- jedec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'jedec.c') diff --git a/jedec.c b/jedec.c index e1bd12f1..3a215393 100644 --- a/jedec.c +++ b/jedec.c @@ -189,13 +189,13 @@ int probe_jedec_common(struct flashchip *flash, printf_debug(", id2 is normal flash content"); printf_debug("\n"); - if (largeid1 == flash->manufacture_id && largeid2 == flash->model_id) - return 1; + if (largeid1 != flash->manufacture_id || largeid2 != flash->model_id) + return 0; if (flash->feature_bits & FEATURE_REGISTERMAP) map_flash_registers(flash); - return 0; + return 1; } int erase_sector_jedec_common(struct flashchip *flash, unsigned int page, -- cgit v1.2.3