projects
/
openwrt
/
staging
/
yousong.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b8d60bb
)
firmware-utils/trx: Endianness fixes
author
Michael Büsch
<mb@bu3sch.de>
Thu, 29 Jul 2010 18:14:10 +0000
(18:14 +0000)
committer
Michael Büsch
<mb@bu3sch.de>
Thu, 29 Jul 2010 18:14:10 +0000
(18:14 +0000)
SVN-Revision: 22414
tools/firmware-utils/src/trx.c
patch
|
blob
|
history
diff --git
a/tools/firmware-utils/src/trx.c
b/tools/firmware-utils/src/trx.c
index 4af17cf1c52d967d11a8fbe88dfd489e326219e8..426a6b58343e3eac985189d5cb1c198bd5feb5d4 100644
(file)
--- 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)
#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)
#elif __BYTE_ORDER == __LITTLE_ENDIAN
#define STORE32_LE(X) (X)
+#define LOAD32_LE(X) (X)
#else
#error unkown endianness!
#endif
#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) {
/* 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;
}
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,
}
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->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) {
/* 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)) {
}
if (!fwrite(buf, cur_len, 1, out) || fflush(out)) {