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
commitff71f10390c6c27e04e631cff4d699632d5b3ddd (patch)
treee3f10c97b4cc545382d21234d2fd45f4df1c568c
parent6fa5b6c5558eda233f1a1b6362f77c4b1696f93d (diff)
downloadupstream-ff71f10390c6c27e04e631cff4d699632d5b3ddd.tar.gz
upstream-ff71f10390c6c27e04e631cff4d699632d5b3ddd.tar.bz2
upstream-ff71f10390c6c27e04e631cff4d699632d5b3ddd.zip
firmware-utils/trx: Endianness fixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22414 3c298f89-4303-0410-b956-a3cf2f4a3e73
-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)) {