Changeset 1479

Timestamp:

12/23/11 00:27:03 (5 months ago)

Author:

mkarcher

Message:

Fix programmer-centric probe (patch v2)

As reported by Stefan Tauner on IRC, the new programmer-centric logic
is broken by re-using occupied members of the flashes array when changing
to the next programmer. This fixes it.

patch v2:

prevent probing one chip per programmer even if the array is full. Using
a do-while loop was a bad idea.

Signed-off-by: Michael Karcher <flashrom@…>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@…>

File:

• trunk/cli_classic.c (modified) (1 diff)

trunk/cli_classic.c

@@ -452 +452 @@
         for (j = 0; j < registered_programmer_count; j++) {
                 startchip = 0;
-                for (i = 0; i < ARRAY_SIZE(flashes); i++) {
+                while (chipcount < ARRAY_SIZE(flashes)) {
                         startchip = probe_flash(&registered_programmers[j],
-                                                startchip, &flashes[i], 0);
+                                                startchip, 
+                                                &flashes[chipcount], 0);
                         if (startchip == -1)
                                 break;