From 461dc0645d19f388966a854273493b5291c0490d Mon Sep 17 00:00:00 2001 From: Kichan Kwon Date: Fri, 3 Nov 2017 19:02:50 +0900 Subject: [PATCH] Modify ua.h to ua_types.h for integrating header with tota-ua - ua_types.h : structure (both packages use) - ua.h : macro, error code (only tota-ua uses) Change-Id: Id7fa9900236ade160c0e9a2bfbbb63f851bb55c4 Signed-off-by: Kichan Kwon --- CMakeLists.txt | 1 + packaging/libtota.spec | 1 + ss_engine/SS_Common.c | 2 +- ss_engine/SS_Common.h | 2 +- ss_engine/SS_FSUpdate.c | 2 +- ss_engine/SS_Nand.c | 2 +- ss_engine/SS_PatchDelta.c | 2 +- ss_engine/SS_UPI.c | 4 ++-- ss_engine/fota_tar.c | 2 +- ss_engine/{ua.h => ua_types.h} | 44 ++++++++++++++---------------------------- 10 files changed, 24 insertions(+), 38 deletions(-) rename ss_engine/{ua.h => ua_types.h} (65%) diff --git a/CMakeLists.txt b/CMakeLists.txt index fe4c89d..d437011 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,6 +25,7 @@ SET(HEADERS ss_engine/SS_MultiProcessUpdate.h ss_engine/SS_Nand.h ss_engine/SS_UPI.h + ss_engine/ua_types.h ) #SET(EXEC_PREFIX "\${prefix}") SET(PREFIX ${CMAKE_INSTALL_PREFIX}) diff --git a/packaging/libtota.spec b/packaging/libtota.spec index a277a09..a79c8f2 100755 --- a/packaging/libtota.spec +++ b/packaging/libtota.spec @@ -76,6 +76,7 @@ cp libtota.a %{buildroot}%{_libdir}/libtota.a %{_includedir}/SS_MultiProcessUpdate.h %{_includedir}/SS_Nand.h %{_includedir}/SS_UPI.h +%{_includedir}/ua_types.h %files -n tota-bsdiff %{_bindir}/ss_bsdiff diff --git a/ss_engine/SS_Common.c b/ss_engine/SS_Common.c index a169dd6..cf7714d 100755 --- a/ss_engine/SS_Common.c +++ b/ss_engine/SS_Common.c @@ -29,7 +29,7 @@ #include "SS_Engine_Errors.h" #include "SS_Common.h" -#include "ua.h" +#include "ua_types.h" #include "fota_tar.h" #include "fota_common.h" diff --git a/ss_engine/SS_Common.h b/ss_engine/SS_Common.h index d7175ba..453b61b 100755 --- a/ss_engine/SS_Common.h +++ b/ss_engine/SS_Common.h @@ -24,7 +24,7 @@ #include "SS_Engine_Errors.h" #include "SS_Engine_Update.h" -#include "ua.h" +#include "ua_types.h" #define MAX_PATH 256 diff --git a/ss_engine/SS_FSUpdate.c b/ss_engine/SS_FSUpdate.c index fd0b52a..0e004c8 100755 --- a/ss_engine/SS_FSUpdate.c +++ b/ss_engine/SS_FSUpdate.c @@ -36,7 +36,7 @@ #include "SS_Common.h" #include "fota_common.h" -#include "ua.h" +#include "ua_types.h" static int feature_support_capability; diff --git a/ss_engine/SS_Nand.c b/ss_engine/SS_Nand.c index 21d1e65..9fcb51d 100755 --- a/ss_engine/SS_Nand.c +++ b/ss_engine/SS_Nand.c @@ -32,7 +32,7 @@ #include "SS_ImageUpdate.h" #include "SS_Engine_Errors.h" #include "SS_Common.h" -#include "ua.h" +#include "ua_types.h" #include "fota_common.h" static int local_pid; diff --git a/ss_engine/SS_PatchDelta.c b/ss_engine/SS_PatchDelta.c index 1294a09..d0f5eab 100755 --- a/ss_engine/SS_PatchDelta.c +++ b/ss_engine/SS_PatchDelta.c @@ -26,7 +26,7 @@ #include #include #include -#include "ua.h" +#include "ua_types.h" #include "sha1.h" #include "SS_PatchDelta.h" #include "fota_common.h" diff --git a/ss_engine/SS_UPI.c b/ss_engine/SS_UPI.c index db19b99..290ba58 100755 --- a/ss_engine/SS_UPI.c +++ b/ss_engine/SS_UPI.c @@ -32,7 +32,7 @@ Function Prototypes Mandatory #include #include #include -#include "ua.h" +#include "ua_types.h" #include "SS_Common.h" #include "fota_common.h" #include "SS_UPI.h" @@ -1665,7 +1665,7 @@ int SS_FSVerifyPartition(ua_dataSS_t * ua_dataSS, int part_idx) SS_GetPartition_LocDetails(ua_dataSS); LOGL(LOG_SSENGINE, "FS Verification Start PartIndex:[%d]\n", part_idx); if (ua_dataSS->ua_operation == UI_OP_SCOUT) - gvalid_session = TRUE; // (shd b true if called during verification) + gvalid_session = 1; // (shd b true if called during verification) headptr_list[part_idx] = SS_FSBuildNodes(ua_dataSS); #ifdef TIME_PROFILING LOGL(LOG_SSENGINE, "fast_tar_get_item_size_time :[%lf]\n", fast_tar_get_item_size_time); diff --git a/ss_engine/fota_tar.c b/ss_engine/fota_tar.c index 6f82cec..7f8ba30 100755 --- a/ss_engine/fota_tar.c +++ b/ss_engine/fota_tar.c @@ -28,7 +28,7 @@ #include "SS_FSUpdate.h" #include "fota_common.h" #include "fota_tar.h" -#include "ua.h" +#include "ua_types.h" /* tar Header Block, from POSIX 1003.1-1990. for reference */ #if 0 diff --git a/ss_engine/ua.h b/ss_engine/ua_types.h similarity index 65% rename from ss_engine/ua.h rename to ss_engine/ua_types.h index 7d2971f..c7d70b1 100755 --- a/ss_engine/ua.h +++ b/ss_engine/ua_types.h @@ -16,38 +16,22 @@ * limitations under the License. */ -#ifndef __UA_H__ -#define __UA_H__ +#ifndef __UA_TYPES_H__ +#define __UA_TYPES_H__ #include #define MAX_FILE_PATH 512 -#define MAX_PART_NAME 32 /* * FOTA Adaptaion header */ -#define ERROR -1 // 0XFFFFFFFF - -#define INVALID 0 -#define VALID 1 -#define TRUE 1 -#define FALSE 0 -#define OK 0 -#define SUCCESS 0 -#define FAIL 1 -#define RESTORING 2 #define UA_PARTI_MAX 20 //currently supporting max 20 partitions -#define DEFAULT_DELTA_NAME "delta.tar" -#define UPDATTE_CFG_FILE "update.cfg" #define UI_OP_SCOUT_UPDATE 0 #define UI_OP_SCOUT 1 #define UI_OP_UPDATE 3 -//SS_ENGINE && BSDIFF -#define SS_RECOVERYRAMDISK - typedef enum { FULL_IMG, @@ -68,18 +52,18 @@ typedef struct _ua_update_data_t { unsigned int exist_check; unsigned int verify_check; unsigned int update_check; - unsigned int weight; // the sum of weight should be 100 + unsigned int weight; // the sum of weight should be 100 unsigned int weight_offset; // start offset - unsigned int data_size; // byte - char *ua_delta_path; // it will be allocated to copy delta file path, need to free memory - char *ua_temp_path; // it will be allocated to copy delta file path, need to free memory + unsigned int data_size; // byte + char *ua_delta_path; // it will be allocated to copy delta file path, need to free memory + char *ua_temp_path; // it will be allocated to copy delta file path, need to free memory } ua_update_data_t; typedef struct _ua_update_cfg_t { unsigned int update_type; int skip_verify; int skip_update; - int soure_img_size; //TOTA + int soure_img_size; //TOTA int target_img_size; char *soure_sha1; char *target_sha1; @@ -93,15 +77,15 @@ typedef struct _ua_part_info_t { } ua_part_info_t; // User data structure -typedef struct _ua_data_t { // partition operations +typedef struct _ua_data_t { // partition operations ua_part_info_t *parti_info; ua_update_cfg_t *update_cfg; ua_update_data_t *update_data; unsigned long ua_operation; - int (*ua_op_read_block) (void *, unsigned char *, unsigned long, unsigned long); - int (*ua_op_write_block) (void *, unsigned char *, unsigned long); - void (*ui_progress) (void *, unsigned long); + int (*ua_op_read_block)(void *, unsigned char *, unsigned long, unsigned long); + int (*ua_op_write_block)(void *, unsigned char *, unsigned long); + void (*ui_progress)(void *, unsigned long); } ua_data_t; typedef struct _ua_delta_info_t { @@ -111,14 +95,14 @@ typedef struct _ua_delta_info_t { char ua_attrib_path[MAX_FILE_PATH]; } ua_delta_info_t; -typedef struct _ua_dataSS_t { // partition operations +typedef struct _ua_dataSS_t { // partition operations ua_part_info_t *parti_info; ua_update_cfg_t *update_cfg; ua_update_data_t *update_data; ua_delta_info_t *update_delta; unsigned long ua_operation; - void (*ui_progress) (void *, unsigned long); - int (*write_data_to_blkdev) (char *, int, int, char *); + void (*ui_progress)(void *, unsigned long); + int (*write_data_to_blkdev)(char *, int, int, char *); } ua_dataSS_t; #endif -- 2.7.4