update 2016-11-10 b1

1. merged unused encoder for irext

src/ir_decoder/Android.mk

@@ -6,12 +6,12 @@ LOCAL_CFLAGS    := -DBOARD_ANDROID
 LOCAL_MODULE    := libirdecode
 LOCAL_SRC_FILES := irda_decode_jni.c \
                    irda_decode.c \
-                   irda_tv_parse.c \
-                   irda_apply.c \
-                   irda_irframe.c \
-                   irda_parse_ac_parameter.c \
-                   irda_parse_forbidden_info.c \
-                   irda_parse_frame_parameter.c \
+                   irda_tv_parse_protocol.c \
+                   irda_ac_apply.c \
+                   irda_ac_build_frame.c \
+                   irda_ac_parse_parameter.c \
+                   irda_ac_parse_forbidden_info.c \
+                   irda_ac_parse_frame_parameter.c \
                    irda_utils.c \
 
 LOCAL_LDLIBS += -L$(SYSROOT)/usr/lib -llog

src/ir_decoder/CMakeLists.txt

@@ -7,19 +7,19 @@ add_definitions(-DBOARD_PC)
 set(SOURCE_FILES_EXECUTABLE
         irda_decode.c
         include/irda_decode.h
-        irda_tv_parse.c
-        include/irda_tv_parse.h
-        irda_apply.c
-        include/irda_apply.h
+        irda_tv_parse_protocol.c
+        include/irda_tv_parse_protocol.h
+        irda_ac_apply.c
+        include/irda_ac_apply.h
         include/irda_defs.h
-        irda_irframe.c
-        include/irda_irframe.h
-        irda_parse_ac_parameter.c
-        include/irda_parse_ac_parameter.h
-        irda_parse_forbidden_info.c
-        include/irda_parse_forbidden_info.h
-        irda_parse_frame_parameter.c
-        include/irda_parse_frame_parameter.h
+        irda_ac_build_frame.c
+        include/irda_ac_build_frame.h
+        irda_ac_parse_parameter.c
+        include/irda_ac_parse_parameter.h
+        irda_ac_parse_forbidden_info.c
+        include/irda_ac_parse_forbidden_info.h
+        irda_ac_parse_frame_parameter.c
+        include/irda_ac_parse_frame_parameter.h
         irda_utils.c
         include/irda_utils.h
         irda_main.c
@@ -28,19 +28,19 @@ set(SOURCE_FILES_EXECUTABLE
 set(SOURCE_FILES_SHARED_LIB
         irda_decode.c
         include/irda_decode.h
-        irda_tv_parse.c
-        include/irda_tv_parse.h
-        irda_apply.c
-        include/irda_apply.h
+        irda_tv_parse_protocol.c
+        include/irda_tv_parse_protocol.h
+        irda_ac_apply.c
+        include/irda_ac_apply.h
         include/irda_defs.h
-        irda_irframe.c
-        include/irda_irframe.h
-        irda_parse_ac_parameter.c
-        include/irda_parse_ac_parameter.h
-        irda_parse_forbidden_info.c
-        include/irda_parse_forbidden_info.h
-        irda_parse_frame_parameter.c
-        include/irda_parse_frame_parameter.h
+        irda_ac_build_frame.c
+        include/irda_ac_build_frame.h
+        irda_ac_parse_parameter.c
+        include/irda_ac_parse_parameter.h
+        irda_ac_parse_forbidden_info.c
+        include/irda_ac_parse_forbidden_info.h
+        irda_ac_parse_frame_parameter.c
+        include/irda_ac_parse_frame_parameter.h
         irda_utils.c
         include/irda_utils.h)
 

src/ir_decoder/irda_ac_apply.c

@@ -14,7 +14,7 @@ Revision log:
 
 #include "./include/irda_utils.h"
 #include "./include/irda_decode.h"
-#include "./include/irda_apply.h"
+#include "include/irda_ac_apply.h"
 
 /*
  * global vars
@@ -611,4 +611,3 @@ INT8 apply_checksum(struct ac_protocol *protocol)
 
     return IR_DECODE_SUCCEEDED;
 }
-

src/ir_decoder/irda_ac_build_frame.c

@@ -10,7 +10,7 @@ Revision log:
 **************************************************************************************************/
 #include <stdio.h>
 
-#include "./include/irda_irframe.h"
+#include "include/irda_ac_build_frame.h"
 #include "./include/irda_decode.h"
 
 extern protocol* context;

src/ir_decoder/irda_ac_parse_forbidden_info.c

@@ -18,7 +18,7 @@ Revision log:
 
 #include "./include/irda_decode.h"
 #include "./include/irda_utils.h"
-#include "./include/irda_parse_forbidden_info.h"
+#include "include/irda_ac_parse_forbidden_info.h"
 /*
  * global vars
  */

src/ir_decoder/irda_ac_parse_frame_parameter.c

@@ -17,7 +17,7 @@ Revision log:
 #include <string.h>
 
 #include "./include/irda_utils.h"
-#include "./include/irda_parse_frame_parameter.h"
+#include "include/irda_ac_parse_frame_parameter.h"
 #include "./include/irda_decode.h"
 
 /*

src/ir_decoder/irda_ac_parse_parameter.c

@@ -16,7 +16,7 @@ Revision log:
 #include <string.h>
 
 #include "./include/irda_utils.h"
-#include "./include/irda_parse_ac_parameter.h"
+#include "include/irda_ac_parse_parameter.h"
 #include "./include/irda_decode.h"
 
 /*

src/ir_decoder/irda_decode.c

@@ -15,12 +15,12 @@ Revision log:
 
 #include "./include/irda_decode.h"
 #include "./include/irda_utils.h"
-#include "./include/irda_parse_frame_parameter.h"
-#include "./include/irda_parse_ac_parameter.h"
-#include "./include/irda_parse_forbidden_info.h"
-#include "./include/irda_irframe.h"
-#include "./include/irda_apply.h"
-#include "include/irda_tv_parse.h"
+#include "include/irda_ac_parse_frame_parameter.h"
+#include "include/irda_ac_parse_parameter.h"
+#include "include/irda_ac_parse_forbidden_info.h"
+#include "include/irda_ac_build_frame.h"
+#include "include/irda_ac_apply.h"
+#include "include/irda_tv_parse_protocol.h"
 
 struct ir_bin_buffer binaryfile;
 struct ir_bin_buffer *pirda_buffer = &binaryfile;

src/ir_decoder/irda_main.c

@@ -19,7 +19,7 @@ Revision log:
 #include "./include/irda_main.h"
 
 // global variable definition
-UINT16 binary_length = 0;
+long binary_length = 0;
 UINT8 *binary_content = NULL;
 
 INT8 irda_ac_file_open(const char* file_name);
@@ -58,7 +58,7 @@ INT8 irda_ac_file_open(const char* file_name)
     return IR_DECODE_SUCCEEDED;
 }
 
-UINT8 decode_as_ac(const char* file_name)
+INT8 decode_as_ac(const char* file_name)
 {
     // keyboard input
     int in_char = 0;
@@ -238,7 +238,7 @@ INT8 irda_tv_file_open(const char* file_name)
     return IR_DECODE_SUCCEEDED;
 }
 
-UINT8 decode_as_tv(char *file_name, UINT8 irda_hex_encode)
+INT8 decode_as_tv(char *file_name, UINT8 irda_hex_encode)
 {
     // keyboard input
     int in_char = 0;

src/ir_decoder/irda_tv_parse_protocol.c

@@ -17,7 +17,7 @@ Revision log:
 #include <string.h>
 
 #include "./include/irda_defs.h"
-#include "./include/irda_tv_parse.h"
+#include "include/irda_tv_parse_protocol.h"
 #include "./include/irda_decode.h"
 
 /**************************************************************************************************
@@ -226,7 +226,7 @@ static BOOL get_irda_keymap(void)
     remote_p = (irda_data_tv_t *) (pbuffer->data + pbuffer->offset);
     pbuffer->offset += sizeof(irda_data_tv_t);
 
-    if (strncmp(remote_p->magic, "ykir", 4) == 0)
+    if (strncmp(remote_p->magic, "irda", 4) == 0)
     {
         remote_pdata = pbuffer->data + pbuffer->offset;
         return TRUE;