From: Rafał Miłecki <zajec5@gmail.com>
Date: Wed, 27 May 2015 17:58:11 +0000 (+0000)
Subject: firmware-utils: asustrx: support setting firmware version
X-Git-Tag: reboot~2959
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=63cac50d24c8c32ef6e78de168c0eaba29ac7231;p=openwrt%2Fstaging%2Fjogo.git

firmware-utils: asustrx: support setting firmware version

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 45791
---

diff --git a/tools/firmware-utils/src/asustrx.c b/tools/firmware-utils/src/asustrx.c
index 20fd1ed520..80b6b1dfcc 100644
--- a/tools/firmware-utils/src/asustrx.c
+++ b/tools/firmware-utils/src/asustrx.c
@@ -48,6 +48,7 @@ struct asustrx_tail {
 char *in_path = NULL;
 char *out_path = NULL;
 char *productid = NULL;
+uint8_t version[4] = { };
 
 static const uint32_t crc32_tbl[] = {
 	0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
@@ -119,7 +120,7 @@ static const uint32_t crc32_tbl[] = {
 static void parse_options(int argc, char **argv) {
 	int c;
 
-	while ((c = getopt(argc, argv, "i:o:p:")) != -1) {
+	while ((c = getopt(argc, argv, "i:o:p:v:")) != -1) {
 		switch (c) {
 		case 'i':
 			in_path = optarg;
@@ -130,6 +131,10 @@ static void parse_options(int argc, char **argv) {
 		case 'p':
 			productid = optarg;
 			break;
+		case 'v':
+			if (sscanf(optarg, "%hu.%hu.%hu.%hu", &version[0], &version[1], &version[2], &version[3]) != 4)
+				fprintf(stderr, "Version %s doesn't match suppored 4-digits format\n", optarg);
+			break;
 		}
 	}
 }
@@ -137,8 +142,9 @@ static void parse_options(int argc, char **argv) {
 static void usage() {
 	printf("Usage:\n");
 	printf("\t-i file\t\t\t\tinput TRX file\n");
-	printf("\t-o offset\t\t\toutput Asus TRX file\n");
+	printf("\t-o file\t\t\t\toutput Asus TRX file\n");
 	printf("\t-p productid\t\t\tproduct (device) ID\n");
+	printf("\t-v version\t\t\tfirmware version formatted with 4 digits like: 1.2.3.4\n");
 }
 
 int main(int argc, char **argv) {
@@ -161,6 +167,10 @@ int main(int argc, char **argv) {
 	}
 
 	/* Fill Asus tail */
+	tail.version[0] = version[0];
+	tail.version[1] = version[1];
+	tail.version[2] = version[2];
+	tail.version[3] = version[3];
 	strncpy(tail.productid, productid, sizeof(tail.productid));
 
 	/* Open files */