caskd/openwrt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

firmware-utils/trx: Endianness fixes

Browse Source 
SVN-Revision: 22414
This commit is contained in:
Michael Büsch 2010-07-29 18:14:10 +00:00
parent b8d60bb9d4
commit 02549b0448
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/firmware-utils/src/trx.c
View File

@ -53,8 +53,10 @@
#if __BYTE_ORDER == __BIG_ENDIAN #if __BYTE_ORDER == __BIG_ENDIAN
#define STORE32_LE(X) bswap_32(X) #define STORE32_LE(X) bswap_32(X)
#define LOAD32_LE(X) bswap_32(X)
#elif __BYTE_ORDER == __LITTLE_ENDIAN #elif __BYTE_ORDER == __LITTLE_ENDIAN
#define STORE32_LE(X) (X) #define STORE32_LE(X) (X)
#define LOAD32_LE(X) (X)
#else #else
#error unkown endianness! #error unkown endianness!
#endif #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 */ /* for TRXv2 set bin-header Flags to 0xFF for CRC calculation like CFE does */
if (trx_version == 2) { 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"); fprintf(stderr, "TRXv2 binheader too small!\n");
return EXIT_FAILURE; return EXIT_FAILURE;
} }
memcpy(binheader, buf + p->offsets[3], sizeof(binheader)); /* save header */ memcpy(binheader, buf + LOAD32_LE(p->offsets[3]), sizeof(binheader)); /* save header */
memset(buf + p->offsets[3] + 22, 0xFF, 8); /* set stable and try1-3 to 0xFF */ memset(buf + LOAD32_LE(p->offsets[3]) + 22, 0xFF, 8); /* set stable and try1-3 to 0xFF */
} }
p->crc32 = crc32buf((char *) &p->flag_version, p->crc32 = crc32buf((char *) &p->flag_version,
@ -275,10 +277,11 @@ int main(int argc, char **argv)
p->crc32 = STORE32_LE(p->crc32); p->crc32 = STORE32_LE(p->crc32);
p->len = (fsmark)?fsmark:cur_len - offsetof(struct trx_header, flag_version); p->len = (fsmark)?fsmark:cur_len - offsetof(struct trx_header, flag_version);
p->len = STORE32_LE(p->len);
/* restore TRXv2 bin-header */ /* restore TRXv2 bin-header */
if (trx_version == 2) { 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)) { if (!fwrite(buf, cur_len, 1, out) || fflush(out)) {