From: INAGAKI Hiroshi <musashino.open@gmail.com>
Date: Sat, 31 Oct 2020 12:45:05 +0000 (+0900)
Subject: firmware-utils: fix mistake and improve logic in nec-enc
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=65f3e7ce1f4ad0abda9f0b98ffb7972960602b41;p=openwrt%2Fstaging%2Flinusw.git

firmware-utils: fix mistake and improve logic in nec-enc

this patch fixes/improves follows:

- PATTERN_LEN is defined as a macro but unused
- redundant logic in count-up for "ptn"

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
---

diff --git a/tools/firmware-utils/Makefile b/tools/firmware-utils/Makefile
index 7f1754a347..81c62d977a 100644
--- a/tools/firmware-utils/Makefile
+++ b/tools/firmware-utils/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME := firmware-utils
-PKG_RELEASE := 4
+PKG_RELEASE := 5
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/kernel.mk
diff --git a/tools/firmware-utils/src/nec-enc.c b/tools/firmware-utils/src/nec-enc.c
index 3c4e38721e..a2be378586 100644
--- a/tools/firmware-utils/src/nec-enc.c
+++ b/tools/firmware-utils/src/nec-enc.c
@@ -47,7 +47,7 @@ static unsigned char buf_pattern[4096], buf[4096];
 
 int main(int argc, char **argv)
 {
-	int k_off = 0, ptn = 0, c, ret = EXIT_SUCCESS;
+	int k_off = 0, ptn = 1, c, ret = EXIT_SUCCESS;
 	char *ifn = NULL, *ofn = NULL, *key = NULL;
 	size_t n, k_len;
 	FILE *out, *in;
@@ -99,11 +99,11 @@ int main(int argc, char **argv)
 
 	while ((n = fread(buf, 1, sizeof(buf), in)) > 0) {
 		for (int i = 0; i < n; i++) {
-			buf_pattern[i] = ptn + 1;
+			buf_pattern[i] = ptn;
 			ptn++;
 
-			if (ptn > 250)
-				ptn = 0;
+			if (ptn > PATTERN_LEN)
+				ptn = 1;
 		}
 
 		k_off = xor_pattern(buf_pattern, n, key, k_len, k_off);