Преглед на файлове

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 <[email protected]>
INAGAKI Hiroshi преди 5 години
родител
ревизия
65f3e7ce1f
променени са 2 файла, в които са добавени 5 реда и са изтрити 5 реда
  1. 1 1
      tools/firmware-utils/Makefile
  2. 4 4
      tools/firmware-utils/src/nec-enc.c

+ 1 - 1
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

+ 4 - 4
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);