modernize backfire 10.03 so it can be operational again

[openwrt-10.03/.git] / package / mtd / src / fis.c

diff --git a/package/mtd/src/fis.c b/package/mtd/src/fis.c
index b285d24db4735aa77c6caf127ab2cb7ca3f3b92d..f825f590c96a50141849d24c63b9d652ab146808 100644 (file)
--- a/package/mtd/src/fis.c
+++ b/package/mtd/src/fis.c
@@ -77,7 +77,7 @@ fis_open(void)
                goto error;
 
        fis_erasesize = erasesize;
-       desc = mmap(NULL, erasesize, PROT_READ|PROT_WRITE, MAP_SHARED, fis_fd, 0);
+       desc = mmap(NULL, erasesize, PROT_READ|PROT_WRITE, MAP_SHARED|MAP_LOCKED, fis_fd, 0);
        if (desc == MAP_FAILED)
                goto error;
 
@@ -143,6 +143,8 @@ fis_remap(struct fis_part *old, int n_old, struct fis_part *new, int n_new)
        struct fis_image_desc *redboot = NULL;
        struct fis_image_desc *first = NULL;
        struct fis_image_desc *last = NULL;
+       struct fis_image_desc *first_fb = NULL;
+       struct fis_image_desc *last_fb = NULL;
        struct fis_image_desc *desc;
        struct fis_part *part;
        uint32_t offset = 0, size = 0;
@@ -184,13 +186,21 @@ fis_remap(struct fis_part *old, int n_old, struct fis_part *new, int n_new)
        }
        desc--;
 
+       first_fb = first;
+       last_fb = last;
+
+       if (first_fb->hdr.flash_base > last_fb->hdr.flash_base) {
+               first_fb = last;
+               last_fb = first;
+       }
+
        /* determine size of available space */
        desc = (struct fis_image_desc *) start;
        while ((char *) desc < end) {
                if (!desc->hdr.name[0] || (desc->hdr.name[0] == 0xff))
                        break;
 
-               if (desc->hdr.flash_base > last->hdr.flash_base &&
+               if (desc->hdr.flash_base > last_fb->hdr.flash_base &&
                    desc->hdr.flash_base < offset)
                        offset = desc->hdr.flash_base;
 
@@ -198,7 +208,7 @@ fis_remap(struct fis_part *old, int n_old, struct fis_part *new, int n_new)
        }
        desc--;
 
-       size = offset - first->hdr.flash_base;
+       size = offset - first_fb->hdr.flash_base;
 
 #ifdef notyet
        desc = first - 1;
@@ -214,7 +224,7 @@ fis_remap(struct fis_part *old, int n_old, struct fis_part *new, int n_new)
 
        last++;
        desc = first + n_new;
-       offset = first->hdr.flash_base;
+       offset = first_fb->hdr.flash_base;
 
        if (desc != last) {
                if (desc > last)