From c49c09879f54f56fd72a614db637b8d7c140f206 Mon Sep 17 00:00:00 2001 From: strawmanbobi Date: Fri, 24 Oct 2025 17:13:49 +0800 Subject: [PATCH] removed support for CC25XX SOC --- decoder/jni/java/net/irext/decode/sdk/IRDecode.java | 2 +- decoder/src/include/ir_defs.h | 9 --------- decoder/src/include/ir_tv_control.h | 4 ++-- decoder/src/ir_decode.c | 2 +- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/decoder/jni/java/net/irext/decode/sdk/IRDecode.java b/decoder/jni/java/net/irext/decode/sdk/IRDecode.java index dd26e43..a8ab461 100644 --- a/decoder/jni/java/net/irext/decode/sdk/IRDecode.java +++ b/decoder/jni/java/net/irext/decode/sdk/IRDecode.java @@ -46,12 +46,12 @@ public class IRDecode { } return mInstance; } + private IRDecode() { String libPath = "/data/irext/libirdecode_jni.so"; System.out.println("loading decode library " + libPath); System.load(libPath); } - public String getVersion() { return irGetVersion(); } diff --git a/decoder/src/include/ir_defs.h b/decoder/src/include/ir_defs.h index 9a9d8f6..dc471ec 100644 --- a/decoder/src/include/ir_defs.h +++ b/decoder/src/include/ir_defs.h @@ -29,10 +29,6 @@ extern "C" #define LOG_TAG "ir_decode" #endif -#if defined BOARD_CC26XX -#include "OSAL.h" -#endif - #define TRUE 1 #define FALSE 0 @@ -55,13 +51,8 @@ typedef int BOOL; void noprint(const char *fmt, ...); -#if defined BOARD_CC26XX -#define ir_malloc(A) ICall_malloc(A) -#define ir_free(A) ICall_free(A) -#else #define ir_malloc(A) malloc(A) #define ir_free(A) free(A) -#endif #define ir_memcpy(A, B, C) memcpy(A, B, C) #define ir_memset(A, B, C) memset(A, B, C) diff --git a/decoder/src/include/ir_tv_control.h b/decoder/src/include/ir_tv_control.h index 94f04ae..83f5bd4 100644 --- a/decoder/src/include/ir_tv_control.h +++ b/decoder/src/include/ir_tv_control.h @@ -78,7 +78,7 @@ typedef struct ir_data UINT8 index; } t_ir_data; -#if !defined BOARD_51 && !defined BOARD_STM8 +#if !defined BOARD_SOC #pragma pack(1) #endif typedef struct ir_cycles @@ -88,7 +88,7 @@ typedef struct ir_cycles UINT16 space; } t_ir_cycles; -#if !defined BOARD_51 && !defined BOARD_STM8 +#if !defined BOARD_SOC #pragma pack() #endif diff --git a/decoder/src/ir_decode.c b/decoder/src/ir_decode.c index 659cf8b..0865f42 100644 --- a/decoder/src/ir_decode.c +++ b/decoder/src/ir_decode.c @@ -105,7 +105,7 @@ const char* get_lib_version() return version; } -#if (!defined BOARD_51 && !defined BOARD_CC26XX) +#if (!defined BOARD_SOC) INT8 ir_file_open(const UINT8 category, const UINT8 sub_category, const char* file_name) { INT8 ret = 0;