cc3200: Keep overwriting the same image on sequential updates.

Daniel Campora · Daniel Campora · commit 3c4b78e166fa · 2015-09-16T10:10:15.000+02:00
diff --git a/cc3200/ftp/updater.c b/cc3200/ftp/updater.c
@@ -87,8 +87,9 @@ bool updater_check_path (void *path) {
         if (!sl_FsOpen((unsigned char *)IMG_BOOT_INFO, FS_MODE_OPEN_READ, NULL, &fhandle)) {
             ASSERT (sizeof(sBootInfo_t) == sl_FsRead(fhandle, 0, (unsigned char *)&sBootInfo, sizeof(sBootInfo_t)));
             sl_FsClose(fhandle, 0, 0, 0);
+            // if we still have an image pending for verification, keep overwriting it
             if ((sBootInfo.Status == IMG_STATUS_CHECK && sBootInfo.ActiveImg == IMG_ACT_UPDATE2) ||
-                 sBootInfo.ActiveImg == IMG_ACT_UPDATE1) {
+                 (sBootInfo.ActiveImg == IMG_ACT_UPDATE1 && sBootInfo.Status != IMG_STATUS_CHECK)) {
                 updater_data.path = IMG_UPDATE2;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -87,8 +87,9 @@ bool updater_check_path (void *path) {`
`87`	`87`	`if (!sl_FsOpen((unsigned char *)IMG_BOOT_INFO, FS_MODE_OPEN_READ, NULL, &fhandle)) {`
`88`	`88`	`ASSERT (sizeof(sBootInfo_t) == sl_FsRead(fhandle, 0, (unsigned char *)&sBootInfo, sizeof(sBootInfo_t)));`
`89`	`89`	`sl_FsClose(fhandle, 0, 0, 0);`
	`90`	`+ // if we still have an image pending for verification, keep overwriting it`
`90`	`91`	`if ((sBootInfo.Status == IMG_STATUS_CHECK && sBootInfo.ActiveImg == IMG_ACT_UPDATE2) \|\|`
`91`		`- sBootInfo.ActiveImg == IMG_ACT_UPDATE1) {`
	`92`	`+ (sBootInfo.ActiveImg == IMG_ACT_UPDATE1 && sBootInfo.Status != IMG_STATUS_CHECK)) {`
`92`	`93`	`updater_data.path = IMG_UPDATE2;`
`93`	`94`	`}`
`94`	`95`	`}`