aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Büsch <mb@bu3sch.de>2010-07-29 18:14:10 +0000
committerMichael Büsch <mb@bu3sch.de>2010-07-29 18:14:10 +0000
commit02549b044817d7baae4981991b82e91e2794c860 (patch)
treeedaa0ae7ea23468ccebf5c13e0189044be5a6794
parentb8d60bb9d489ac508614f3463c2e523fc8780794 (diff)
downloadupstream-02549b044817d7baae4981991b82e91e2794c860.tar.gz
upstream-02549b044817d7baae4981991b82e91e2794c860.tar.bz2
upstream-02549b044817d7baae4981991b82e91e2794c860.zip
firmware-utils/trx: Endianness fixes
SVN-Revision: 22414
-rw-r--r--tools/firmware-utils/src/trx.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/tools/firmware-utils/src/trx.c b/tools/firmware-utils/src/trx.c
index 4af17cf1c5..426a6b5834 100644
--- a/tools/firmware-utils/src/trx.c
+++ b/tools/firmware-utils/src/trx.c
@@ -53,8 +53,10 @@
#if __BYTE_ORDER == __BIG_ENDIAN
#define STORE32_LE(X) bswap_32(X)
+#define LOAD32_LE(X) bswap_32(X)
#elif __BYTE_ORDER == __LITTLE_ENDIAN
#define STORE32_LE(X) (X)
+#define LOAD32_LE(X) (X)
#else
#error unkown endianness!
#endif
@@ -262,12 +264,12 @@ int main(int argc, char **argv)
/* 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)) {
+ if(cur_len - LOAD32_LE(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 */
+ memcpy(binheader, buf + LOAD32_LE(p->offsets[3]), sizeof(binheader)); /* save header */
+ memset(buf + LOAD32_LE(p->offsets[3]) + 22, 0xFF, 8); /* set stable and try1-3 to 0xFF */
}
p->crc32 = crc32buf((char *) &p->flag_version,
@@ -275,10 +277,11 @@ int main(int argc, char **argv)
p->crc32 = STORE32_LE(p->crc32);
p->len = (fsmark)?fsmark:cur_len - offsetof(struct trx_header, flag_version);
+ p->len = STORE32_LE(p->len);
/* restore TRXv2 bin-header */
if (trx_version == 2) {
- memcpy(buf + p->offsets[3], binheader, sizeof(binheader));
+ memcpy(buf + LOAD32_LE(p->offsets[3]), binheader, sizeof(binheader));
}
if (!fwrite(buf, cur_len, 1, out) || fflush(out)) {