preset stable and try* flags for TRX2 headers

* changed addpattern.c to preset the stable and try flags used in TRXv2 images
to dupe CFE and pretend a stable image.
* changed trx.c to calculate TRXv2 CRC with stable and try flags set to 0xFF
like CFE does on startup
* fixed compile warnings in trx.c by explicit casting

SVN-Revision: 22012

diff --git a/tools/firmware-utils/src/addpattern.c b/tools/firmware-utils/src/addpattern.c
index 6eccb1bd9922402c55fef98175cbb1339aa0fc0a..da6797c9ced2187cffa554097b3b9bf38c7f81ed 100644 (file)
--- a/tools/firmware-utils/src/addpattern.c
+++ b/tools/firmware-utils/src/addpattern.c
@@ -205,8 +205,10 @@ int main(int argc, char **argv)
                                break;
                        case '5':
                                /* V5 is appended to trxV2 image */
-                               hdr->stable[0] = hdr->stable[1] = 0xFF;
-                               hdr->try1[0]   = hdr->try1[1]   = 0xFF;
+                               hdr->stable[0] = 0x73; // force image to be stable
+                               hdr->stable[1] = 0x00;
+                               hdr->try1[0]   = 0x74; // force try1 to be set
+                               hdr->try1[1]   = 0x00;
                                hdr->try2[0]   = hdr->try2[1]   = 0xFF;
                                hdr->try3[0]   = hdr->try3[1]   = 0xFF;
                                break;

diff --git a/tools/firmware-utils/src/trx.c b/tools/firmware-utils/src/trx.c
index fbae789ed9685fef109e2bb85fc33b3853d1d898..7a64cfd1a9cc58a5282fa28aac78221df7c12e41 100644 (file)
--- a/tools/firmware-utils/src/trx.c
+++ b/tools/firmware-utils/src/trx.c
@@ -102,6 +102,7 @@ int main(int argc, char **argv)
        unsigned long maxlen = TRX_MAX_LEN;
        struct trx_header *p;
        char trx_version = 1;
+       unsigned char binheader[32];
 
        fprintf(stderr, "mjn3's trx replacement - v0.81.1\n");
 
@@ -213,7 +214,7 @@ int main(int argc, char **argv)
                                        usage();
                                }
                                if (n < cur_len) {
-                                       fprintf(stderr, "WARNING: current length exceeds -b %d offset\n",n);
+                                       fprintf(stderr, "WARNING: current length exceeds -b %d offset\n",(int) n);
                                } else {
                                        memset(buf + cur_len, 0, n - cur_len);
                                        cur_len = n;
@@ -228,7 +229,7 @@ int main(int argc, char **argv)
                                }
                                if (n2 < 0) {
                                        if (-n2 > cur_len) {
-                                               fprintf(stderr, "WARNING: current length smaller then -x %d offset\n",n2);
+                                               fprintf(stderr, "WARNING: current length smaller then -x %d offset\n",(int) n2);
                                                cur_len = 0;
                                        } else
                                                cur_len += n2;
@@ -257,12 +258,27 @@ int main(int argc, char **argv)
                cur_len += ROUND - n;
        }
 
+       /* for TRXv2 set bin-header Flags to 0xFF for CRC calculation like CFE does */ 
+       if (trx_version == 2) {
+               if(cur_len - p->offsets[3] < sizeof(binheader)) {
+                       fprintf(stderr, "TRXv2 binheader too small!\n");
+                       return EXIT_FAILURE;
+               }
+               memcpy(binheader, buf + p->offsets[3], sizeof(binheader)); /* save header */
+               memset(buf + p->offsets[3] + 22, 0xFF, 8); /* set stable and try1-3 to 0xFF */
+       }
+
        p->crc32 = crc32buf((char *) &p->flag_version,
                                                cur_len - offsetof(struct trx_header, flag_version));
        p->crc32 = STORE32_LE(p->crc32);
 
        p->len = STORE32_LE(cur_len);
 
+       /* restore TRXv2 bin-header */
+       if (trx_version == 2) {
+               memcpy(buf + p->offsets[3], binheader, sizeof(binheader));
+       }
+
        if (!fwrite(buf, cur_len, 1, out) || fflush(out)) {
                fprintf(stderr, "fwrite failed\n");
                return EXIT_FAILURE;