X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c460c800baa1f5fd402249448728ea459dc9b3e3..e5e2a4f7fb33f7df9b5d1aed44811e60dc571f36:/tools/firmware-utils/src/trx.c

diff --git a/tools/firmware-utils/src/trx.c b/tools/firmware-utils/src/trx.c
index 44bd06a06..7a64cfd1a 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");
 
@@ -114,7 +115,6 @@ int main(int argc, char **argv)
 
 	p->magic = STORE32_LE(TRX_MAGIC);
 	cur_len = sizeof(struct trx_header) - 4; /* assume v1 header */
-	p->flag_version = STORE32_LE((trx_version << 16));
 
 	in = NULL;
 	i = 0;
@@ -214,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;
@@ -229,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;
@@ -243,6 +243,7 @@ int main(int argc, char **argv)
 				usage();
 		}
 	}
+	p->flag_version = STORE32_LE((trx_version << 16));
 
 	if (!in) {
 		fprintf(stderr, "we require atleast one filename\n");
@@ -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;