Mercurial > ecos

changeset 1679:b548ac5af76c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/flash.c (find_free): fix endless loop when removing a collapsed chunk from chunk table. Found by Laurent Gonzalez (fis_load): Fixed a compiler warning.
author asl
date Fri, 25 Jun 2004 15:49:43 +0000
parents 446d9e7e1db7
children 68e5dffc36e4
files packages/redboot/current/ChangeLog packages/redboot/current/src/flash.c
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/packages/redboot/current/ChangeLog
+++ b/packages/redboot/current/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-25  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* src/flash.c (find_free): fix endless loop when removing a
+	collapsed chunk from chunk table. Found by Laurent Gonzalez
+	(fis_load): Fixed a compiler warning.
+
 2004-05-31  Jani Monoses <jani@iv.ro>
 
 	* src/main.c:
--- a/packages/redboot/current/src/flash.c
+++ b/packages/redboot/current/src/flash.c
@@ -547,6 +547,7 @@ find_free(struct free_chunk *chunks)
                             // This free chunk has collapsed
                             while (idx < (num_chunks-1)) {
                                 chunks[idx] = chunks[idx+1];
+                                idx++;
                             }
                             num_chunks--;
                         }
@@ -1076,7 +1077,7 @@ fis_load(int argc, char *argv[])
         if (cksum != img->file_cksum) {
             diag_printf("** Warning - checksum failure.  stored: 0x%08lx, computed: 0x%08lx\n",
                         img->file_cksum, cksum);
-            entry_address = NO_MEMORY;
+            entry_address = (unsigned long)NO_MEMORY;
         }
     }
 #endif