diff options
| author | Markus Wigge <markus@cultcom.de> | 2010-07-01 10:40:22 +0000 |
|---|---|---|
| committer | Markus Wigge <markus@cultcom.de> | 2010-07-01 10:40:22 +0000 |
| commit | 785ebf7bf3e05244254530f445d12335caa9d4eb (patch) | |
| tree | fd2420b34c18e9087b6249403edf1e948b47588a /tools/firmware-utils/src/trx.c | |
| parent | 364325f08e5ab54217f3a7e1f2f0c9bb062d21ba (diff) | |
| download | master-187ad058-785ebf7bf3e05244254530f445d12335caa9d4eb.tar.gz master-187ad058-785ebf7bf3e05244254530f445d12335caa9d4eb.tar.bz2 master-187ad058-785ebf7bf3e05244254530f445d12335caa9d4eb.zip | |
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
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22012 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/firmware-utils/src/trx.c')
| -rw-r--r-- | tools/firmware-utils/src/trx.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/tools/firmware-utils/src/trx.c b/tools/firmware-utils/src/trx.c index fbae789ed9..7a64cfd1a9 100644 --- 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; |