# HG changeset patch # User asl # Date 1120074106 0 # Node ID adbedd54ee7b5710db4b6cd19c27b95b52d7dcda # Parent 21764aa405ca7f496cb81ac89dfb6ee91ea1e165 * src/flash.c (find_free): Maintain sort order when splitting chunks. diff --git a/packages/redboot/current/ChangeLog b/packages/redboot/current/ChangeLog --- a/packages/redboot/current/ChangeLog +++ b/packages/redboot/current/ChangeLog @@ -1,3 +1,8 @@ +2005-06-29 Peter Korsgaard + + * src/flash.c (find_free): Maintain sort order when splitting + chunks. + 2005-06-27 Andrew Lunn * src/net/enet.c (ntohs): Return type is a short. diff --git a/packages/redboot/current/src/flash.c b/packages/redboot/current/src/flash.c --- a/packages/redboot/current/src/flash.c +++ b/packages/redboot/current/src/flash.c @@ -591,8 +591,12 @@ find_free(struct free_chunk *chunks) } else { // Split chunk into two parts if ((img->flash_base+img->size) < (CYG_ADDRESS)fis_end) { - chunks[num_chunks].start = img->flash_base + img->size; - chunks[num_chunks].end = chunks[idx].end; + int j; + // make room for new chunk + for (j = num_chunks; j > (idx+1); j--) + chunks[j] = chunks[j-1]; + chunks[idx+1].start = img->flash_base + img->size; + chunks[idx+1].end = chunks[idx].end; if (++num_chunks == CYGDAT_REDBOOT_FIS_MAX_FREE_CHUNKS) { diag_printf("Warning: too many free chunks\n"); return num_chunks;