diff options
author | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-10-22 13:23:13 +0900 |
---|---|---|
committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-10-22 13:23:13 +0900 |
commit | 2e0f6d8db328960ff8b865aa796efa245cebe672 (patch) | |
tree | 3e81885fb2eda6d44872e49da797852b4b9a3fd9 | |
parent | 1fe48fdaa1ebd52ef20c764e606fe257e52cad85 (diff) |
ss-config branch 0.1
16 files changed, 39 insertions, 677 deletions
diff --git a/config/Makefile.client b/config/Makefile.client index 5a8b514e..0a186c5b 100644 --- a/config/Makefile.client +++ b/config/Makefile.client @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2017-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2017-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/config/library/Makefile b/config/library/Makefile index 918ba3d6..f326127d 100644 --- a/config/library/Makefile +++ b/config/library/Makefile @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2017-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2017-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/config/library/system_manager_config/Makefile b/config/library/system_manager_config/Makefile index 29795d70..fbb09d7c 100644 --- a/config/library/system_manager_config/Makefile +++ b/config/library/system_manager_config/Makefile @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/config/library/system_manager_config/include/system_service/ss_access_if_private.h b/config/library/system_manager_config/include/system_service/ss_access_if_private.h index 85a92865..1753bf03 100644 --- a/config/library/system_manager_config/include/system_service/ss_access_if_private.h +++ b/config/library/system_manager_config/include/system_service/ss_access_if_private.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/config/library/system_manager_config/include/system_service/ss_package.h b/config/library/system_manager_config/include/system_service/ss_package.h index cec4c6b2..788fd2cc 100644 --- a/config/library/system_manager_config/include/system_service/ss_package.h +++ b/config/library/system_manager_config/include/system_service/ss_package.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,60 +32,33 @@ #define CONFIG_LIBRARY_SYSTEM_MANAGER_CONFIG_INCLUDE_SYSTEM_SERVICE_SS_PACKAGE_H_ // _CWORD71_ package name list - -#define SS_PKG_SPI_LOADER "SPI_LOADER" // define SPI_LOADER for spi_loader -#define SS_PKG_UBOOT "UBOOT" // define UBOOT for uboot -#define SS_PKG_SECURE_LOADER "SECURE_LOADER" // define SECURE_LOADER for secure_loader - -#define SS_PKG_SYS_UCOM "SYS_UCOM" // define SYS_UCOM for sys_ucom -#define SS_PKG_CAN_UCOM "CAN_UCOM" // define CAN_UCOM for can_ucom -#define SS_PKG__CWORD52__UCOM "_CWORD52__UCOM" // define _CWORD52__UCOM for _CWORD52__ucom -#define SS_PKG__CWORD52__DATA "_CWORD52__DATA" // define _CWORD52__DATA for _CWORD52__data -#define SS_PKG__CWORD52__FIXEQ "_CWORD52__FIXEQ" // define _CWORD52__FIXEQ for _CWORD52__fixeq - #define SS_PKG_MAIN_EMMC "MAIN_EMMC" // define MAIN_EMMC for main_emmc -#define SS_PKG_TARGETBOARD "TARGETBOARD" // define TARGETBOARD for target boar - #define SS_PKG_MAIN_PRODUCT_SI "MAIN_PRODUCT_SI" // define MAIN_PRODUCT_SI for main_product_si -#define SS_PKG_MAIN_COMP_SI "MAIN_COMP_SI" // define MAIN_COMP_SI for main_comp_si +#define SS_PKG_TARGETBOARD "TARGETBOARD" // define TARGETBOARD for target boar #define SS_PKG_MAIN_LPF_SI "MAIN_LPF_SI" // define MAIN_LPF_SI for main_lpf_si -#define SS_PKG_FACTORY_FROM "FACTORY_FROM" // define FACTORY_FROM for factory_from -#define SS_PKG_FACTORY_FROM2 "FACTORY_FROM2" // define FACTORY_FROM2 for factory_from2 -#define SS_PKG_FACTORY_EEPROM "FACTORY_EEPROM" // define FACTORY_EEPROM for factory_eeprom -#define SS_PKG_DECK "DECK" // define DECK for deck -#define SS_PKG_REAGION_CODE "REAGION_CODE" // define REAGION_CODE for reagion_code -#define SS_PKG__CWORD8__DB "_CWORD8__DB" // define _CWORD8__DB for _CWORD8__db -#define SS_PKG_CAPACITIVE_TP "CAPACITIVE_TP" // define CAPACITIVE_TP for capacitive_tp -#define SS_PKG__CWORD52___CWORD32_ "_CWORD52___CWORD32_" // define _CWORD52___CWORD32_ for _CWORD52___CWORD32_ -#define SS_PKG_RADIO_PARAMETER "RADIO_PARAMETER" // define RADIO_PARAMETER for radio_parameter -#define SS_PKG_VR_DATA "VR_DATA" // define VR_DATA for vr_data -#define SS_PKG_NAVI_GPS "NAVI_GPS" // define NAVI_GPS for navi_gps -#define SS_PKG_DTV_MAIN "DTV_MAIN" // define DTV_MAIN for dtv_main -#define SS_PKG_DTV_EEPROM "DTV_EEPROM" // define DTV_EEPROM for dtv_eeprom -#define SS_PKG_DTV_BOOT "DTV_BOOT" // define DTV_BOOT for dtv_boot -#define SS_PKG_DTV_STATION_DB "DTV_STATION_DB" // define DTV_STATION_DB for dtv_station_db -#define SS_PKG_XM_TYPE_ID "XM_TYPE_ID" // define XM_TYPE_ID for xm_type_id -#define SS_PKG_XM_HW "XM_HW" // define XM_HW for xm_hw -#define SS_PKG_XM_SW "XM_SW" // define XM_SW for xm_sw -#define SS_PKG_XM_SXI "XM_SXI" // define XM_SXI for xm_sxi -#define SS_PKG_XM_BB "XM_BB" // define XM_BB for xm_bb -#define SS_PKG_XM_HDEC "XM_HDEC" // define XM_HDEC for xm_hdec -#define SS_PKG_XM_RF "XM_RF" // define XM_RF for xm_rf -#define SS_PKG_XM_SPL "XM_SPL" // define XM_SPL for xm_spl -#define SS_PKG_XM_AREA "XM_AREA" // define XM_AREA for xm_area -#define SS_PKG_NAVI_PROGRAM "NAVI_PROGRAM" // define NAVI_PROGRAM for navi_program -#define SS_PKG_NAVI_MAP "NAVI_MAP" // define NAVI_MAP for navi_map -#define SS_PKG_PHASE_INFO "PHASE_INFO" // define PHASE_INFO for phase_info - -#define SS_PKG_SERIES_INFO "SERIES_INFO" -#define SS_PKG_FPGA "FPGA" // define FPGA for fpga -#define SS_PKG_VP_CONFIG "VP_VEHICLEPARAMETERLIBRARY" // define VP_VEHICLEPARAMETERLIBRARY for vp_vehicleparameterlibrary -#define SS_PKG_VP__CWORD31_ "VP__CWORD31_" // define VP__CWORD31_ for vp__CWORD31_ -#define SS_PKG_PREINSTALL_DATA "PREINSTALL_DATA" // define PREINSTALL_DATA for preinstall_data +#define SS_PKG_NAVI_GPS _Pragma ("GCC warning \"'SS_NAVI_GPS' macro is deprecated\"") "NAVI_GPS" +#define SS_PKG_SERIES_INFO _Pragma ("GCC warning \"'SS_PKG_SERIES_INFO' macro is deprecated\"") "SERIES_INFO" #define MSG_PSM_REBOOT_NOTIFY 0x11 // define ps_psmshadow reboot notice id +// AGL reserved version list. +#define SS_PKG_DIAG_CPU_INFO_001 "DIAG_CPU_INFO_001" +#define SS_PKG_DIAG_CPU_INFO_002 "DIAG_CPU_INFO_002" +#define SS_PKG_DIAG_CPU_INFO_003 "DIAG_CPU_INFO_003" +#define SS_PKG_DIAG_CPU_INFO_004 "DIAG_CPU_INFO_004" +#define SS_PKG_DIAG_CPU_INFO_005 "DIAG_CPU_INFO_005" +#define SS_PKG_DIAG_CPU_INFO_006 "DIAG_CPU_INFO_006" +#define SS_PKG_DIAG_CPU_INFO_007 "DIAG_CPU_INFO_007" +#define SS_PKG_DIAG_CPU_INFO_008 "DIAG_CPU_INFO_008" +#define SS_PKG_DIAG_CPU_INFO_009 "DIAG_CPU_INFO_009" +#define SS_PKG_DIAG_CPU_INFO_010 "DIAG_CPU_INFO_010" +#define SS_PKG_DIAG_CPU_INFO_011 "DIAG_CPU_INFO_011" +#define SS_PKG_DIAG_CPU_INFO_012 "DIAG_CPU_INFO_012" +#define SS_PKG_DIAG_CPU_INFO_013 "DIAG_CPU_INFO_013" +#define SS_PKG_DIAG_CPU_INFO_014 "DIAG_CPU_INFO_014" +#define SS_PKG_DIAG_CPU_INFO_015 "DIAG_CPU_INFO_015" + #endif // CONFIG_LIBRARY_SYSTEM_MANAGER_CONFIG_INCLUDE_SYSTEM_SERVICE_SS_PACKAGE_H_ /** @}*/ /** @}*/ diff --git a/config/library/system_manager_config/include/system_service/ss_system_manager_conf.h b/config/library/system_manager_config/include/system_service/ss_system_manager_conf.h index d0125869..5354da85 100644 --- a/config/library/system_manager_config/include/system_service/ss_system_manager_conf.h +++ b/config/library/system_manager_config/include/system_service/ss_system_manager_conf.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/config/library/system_manager_config/include/system_service/system_manager_config.h b/config/library/system_manager_config/include/system_service/system_manager_config.h index 332a0bf0..2f44f987 100644 --- a/config/library/system_manager_config/include/system_service/system_manager_config.h +++ b/config/library/system_manager_config/include/system_service/system_manager_config.h @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2017-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2017-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/config/library/system_manager_config/last2order/Makefile b/config/library/system_manager_config/last2order/Makefile index 774eb703..f38ee770 100644 --- a/config/library/system_manager_config/last2order/Makefile +++ b/config/library/system_manager_config/last2order/Makefile @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/config/library/system_manager_config/order/Makefile b/config/library/system_manager_config/order/Makefile index aeb78366..38af0ee2 100644 --- a/config/library/system_manager_config/order/Makefile +++ b/config/library/system_manager_config/order/Makefile @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/config/library/system_manager_config/src/Makefile b/config/library/system_manager_config/src/Makefile index 34304640..9fbc9ccd 100644 --- a/config/library/system_manager_config/src/Makefile +++ b/config/library/system_manager_config/src/Makefile @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/config/library/system_manager_config/src/libsssmcfg.ver b/config/library/system_manager_config/src/libsssmcfg.ver index 7705441f..4d61996c 100644 --- a/config/library/system_manager_config/src/libsssmcfg.ver +++ b/config/library/system_manager_config/src/libsssmcfg.ver @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/config/library/system_manager_config/src/ss_system_manager_conf.cpp b/config/library/system_manager_config/src/ss_system_manager_conf.cpp index df1cd41e..16ec02a4 100644 --- a/config/library/system_manager_config/src/ss_system_manager_conf.cpp +++ b/config/library/system_manager_config/src/ss_system_manager_conf.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,7 +35,6 @@ #endif /* Environment variable name */ -const CHAR BoardEnvVariable[] = "VEHICLEPARAMETERLIBRARY_BOARD"; const CHAR LaunchConfigFileNameEnvVariable[] = "APPS_CONFIG_FILENAME"; const CHAR AreaTypeEnvVariable[] = "VEHICLEPARAMETERLIBRARY_AREA"; const CHAR BrandTypeEnvVariable[] = "VEHICLEPARAMETERLIBRARY_BRAND"; @@ -131,7 +130,7 @@ static EFrameworkunifiedStatus setEvnVariableForLaunchConfigFile(std::string f_s l_pLaunchConfigFile = LaunchConfigFileName2; } - std::string cnfPath = "/usr/agl/conf/systemmanager/"; + std::string cnfPath = "/usr/agl/conf/BS/ss/system_manager/rwdata/"; cnfPath += l_pLaunchConfigFile; if (access(cnfPath.c_str(), F_OK) != 0) { l_pLaunchConfigFile = LaunchConfigFileName1; @@ -148,94 +147,6 @@ static EFrameworkunifiedStatus setEvnVariableForLaunchConfigFile(std::string f_s } /*********************************************************************** - * setEvnVariableForLaunchRadioHDArbiter - ***********************************************************************/ -static EFrameworkunifiedStatus setEvnVariableForLaunchRadioHDArbiter( - std::string & f_sEnvBoard, std::string f_sEnvArea) { - EFrameworkunifiedStatus l_eStatus = eFrameworkunifiedStatusOK; - const CHAR LaunchRadioHDArbiterEnvVariable[] = "SM_CONF_LAUNCH_RADIOHDARBITER"; - const CHAR Board1[] = "Gen1Board1"; - const CHAR Board2[] = "Gen1Board2"; - - const CHAR *l_pSetValue = EnvValueNo; - - BOOL l_bArea1 = (f_sEnvArea == EnvValueArea1) ? TRUE : FALSE; - - if (f_sEnvBoard.empty()) { - // Set "n" if not set - SS_ASERT_ERRNO(0); - } else if ((Board1 == f_sEnvBoard) || (Board2 == f_sEnvBoard)) { - l_pSetValue = (TRUE == l_bArea1) ? EnvValueYes : EnvValueNo; - } - - if (0 != setenv(LaunchRadioHDArbiterEnvVariable, l_pSetValue, 1)) { - SS_ASERT_ERRNO(0); - l_eStatus = eFrameworkunifiedStatusFail; - } - - return l_eStatus; -} - -/*********************************************************************** - * setEvnVariableForLaunchDtvService - ***********************************************************************/ -static EFrameworkunifiedStatus setEvnVariableForLaunchDtvService(std::string f_sEnvBrand, - std::string f_sEnvArea, - std::string f_sEnvGrade) { - EFrameworkunifiedStatus l_eStatus = eFrameworkunifiedStatusOK; - const CHAR LaunchDtvServiceEnvVariable[] = "SM_CONF_LAUNCH_DTVSERVICE"; - - const CHAR *l_pSetValue = EnvValueNo; - - BOOL l_bBrand1 = (f_sEnvBrand == EnvValueBrand1) ? TRUE : FALSE; - BOOL l_bArea2 = (f_sEnvArea == EnvValueArea2) ? TRUE : FALSE; - BOOL l_bGrade1 = - ((f_sEnvBrand == EnvValueBrand2) && (f_sEnvGrade == EnvValueGrade1)) ? - TRUE : FALSE; - - if ((l_bBrand1 | l_bGrade1) && l_bArea2 ) { - l_pSetValue = EnvValueYes; - } else { - l_pSetValue = EnvValueNo; - } - - if (0 != setenv(LaunchDtvServiceEnvVariable, l_pSetValue, 1)) { - SS_ASERT_ERRNO(0); - l_eStatus = eFrameworkunifiedStatusFail; - } - - return l_eStatus; -} - -/*********************************************************************** - * setEvnVariableForLaunchHandWriting - ***********************************************************************/ -static EFrameworkunifiedStatus setEvnVariableForLaunchHandWriting(std::string f_sEnvBrand, - std::string f_sEnvArea) { - EFrameworkunifiedStatus l_eStatus = eFrameworkunifiedStatusOK; - const CHAR LaunchHandWritingEnvVariable[] = "SM_CONF_LAUNCH_HANDWRITING"; - - const CHAR *l_pSetValue = EnvValueNo; - - BOOL l_bBrand1 = (f_sEnvBrand == EnvValueBrand1) ? TRUE : FALSE; - BOOL l_bArea1 = (f_sEnvArea == EnvValueArea1) ? TRUE : FALSE; - BOOL l_bArea3 = (f_sEnvArea == EnvValueArea3) ? TRUE : FALSE; - - if ((l_bBrand1 && l_bArea1) || (l_bBrand1 && l_bArea3)) { - l_pSetValue = EnvValueYes; - } else { - l_pSetValue = EnvValueNo; - } - - if (0 != setenv(LaunchHandWritingEnvVariable, l_pSetValue, 1)) { - SS_ASERT_ERRNO(0); - l_eStatus = eFrameworkunifiedStatusFail; - } - - return l_eStatus; -} - -/*********************************************************************** * setEvnVariableForLaunchCus ***********************************************************************/ static EFrameworkunifiedStatus setEvnVariableForLaunchCus(std::string f_sEnvArea) { @@ -255,37 +166,6 @@ static EFrameworkunifiedStatus setEvnVariableForLaunchCus(std::string f_sEnvArea } /*********************************************************************** - * setEvnVariableForLaunchLSP - ***********************************************************************/ -static EFrameworkunifiedStatus setEvnVariableForLaunchLSP(std::string f_sEnvBrand, std::string f_sEnvArea, std::string f_sEnvGrade){ - - EFrameworkunifiedStatus l_eStatus = eFrameworkunifiedStatusOK; - const CHAR LaunchLSPEnvVariable[] = "SM_CONF_LAUNCH_LSP"; - - const CHAR *l_pSetValue = EnvValueNo; - - BOOL l_bBrand2 = (f_sEnvBrand == EnvValueBrand2) ? TRUE : FALSE; - BOOL l_bArea1 = (f_sEnvArea == EnvValueArea1) ? TRUE : FALSE; - BOOL l_bGrade2 = (f_sEnvGrade == EnvValueGrade2) ? TRUE : FALSE; - - if(l_bBrand2 && l_bArea1) { - l_pSetValue = EnvValueYes; - } else if(l_bGrade2) { - l_pSetValue = EnvValueYes; - } else { - l_pSetValue = EnvValueNo; - } - - - if (0 != setenv(LaunchLSPEnvVariable, l_pSetValue, 1)) { - SS_ASERT_ERRNO(0); - l_eStatus = eFrameworkunifiedStatusFail; - } - - return l_eStatus; -} - -/*********************************************************************** * setEvnVariableForLaunchTFF ***********************************************************************/ static EFrameworkunifiedStatus setEvnVariableForLaunchTFF(std::string f_sEnvArea) { @@ -312,60 +192,6 @@ static EFrameworkunifiedStatus setEvnVariableForLaunchTFF(std::string f_sEnvArea } /*********************************************************************** - * setEvnVariableForLaunchAwtPrimary - ***********************************************************************/ -static EFrameworkunifiedStatus -setEvnVariableForLaunchAwtPrimary(std::string f_sEnvGrade, std::string f_sEnvArea){ - EFrameworkunifiedStatus l_eStatus = eFrameworkunifiedStatusOK; - const CHAR LaunchAwtPrimaryEnvVariable[] = "SM_CONF_LAUNCH_AWTPRIMARY"; - - const CHAR *l_pSetValue = EnvValueNo; - - BOOL l_bArea1 = (f_sEnvArea == EnvValueArea1) ? TRUE : FALSE; - BOOL l_bArea2 = (f_sEnvArea == EnvValueArea2) ? TRUE : FALSE; - BOOL l_bGrade2 = (f_sEnvGrade == EnvValueGrade2) ? TRUE : FALSE; - - if (l_bArea1) { - try { - EFrameworkunifiedStatus ret = eFrameworkunifiedStatusOK; - SSVER_PkgInfo PhaseInfo = { 0 }; - CSSVer cVersion; - if (true != cVersion.empty()) { - ret = cVersion.getPkgInfo(SS_PKG_PHASE_INFO, &PhaseInfo); - if (ret == eFrameworkunifiedStatusOK) { - if ('3' == PhaseInfo.version[0]) { - l_pSetValue = EnvValueYes; - } else { - l_pSetValue = EnvValueNo; - } - } else { - l_pSetValue = EnvValueNo; - } - } else { - l_pSetValue = EnvValueNo; - } - } catch (EFrameworkunifiedStatus ee) { - l_pSetValue = EnvValueNo; - } - } else if (l_bArea2) { - if( l_bGrade2 ) { - l_pSetValue = EnvValueNo; - } else { - l_pSetValue = EnvValueYes; - } - } else { - l_pSetValue = EnvValueNo; - } - - if (0 != setenv(LaunchAwtPrimaryEnvVariable, l_pSetValue, 1)) { - SS_ASERT_ERRNO(0); - l_eStatus = eFrameworkunifiedStatusFail; - } - - return l_eStatus; -} - -/*********************************************************************** * getEnvValiavleWithDefault ***********************************************************************/ static std::string getEnvValiavleWithDefault(const CHAR *f_pEnvName, @@ -407,293 +233,6 @@ getPkgInfoWithDefault(const CHAR *f_pPkgName, const CHAR *f_pDefault){ return l_sReturnValue; } - -/*********************************************************************** - * setEvnVariableForLaunchVrService - ***********************************************************************/ -static EFrameworkunifiedStatus setEvnVariableForLaunchVrService(std::string f_sEnvBrand, - std::string f_sEnvArea) { - EFrameworkunifiedStatus l_eStatus = eFrameworkunifiedStatusOK; - const CHAR LaunchVrArea1Phase1EnvVariable[] = "SM_CONF_LAUNCH_VR_AREA1_PHASE1"; - const CHAR LaunchVrArea1Phase2EnvVariable[] = "SM_CONF_LAUNCH_VR_AREA1_PHASE2"; - const CHAR LaunchVrArea2Phase1EnvVariable[] = "SM_CONF_LAUNCH_VR_AREA2_PHASE1"; - const CHAR LaunchVrArea2Phase2EnvVariable[] = "SM_CONF_LAUNCH_VR_AREA2_PHASE2"; - - const CHAR *l_pSetValueArea1Phase1 = EnvValueNo; - const CHAR *l_pSetValueArea1Phase2 = EnvValueNo; - const CHAR *l_pSetValueArea2Phase1 = EnvValueNo; - const CHAR *l_pSetValueArea2Phase2 = EnvValueNo; - - BOOL l_bArea1 = (f_sEnvArea == EnvValueArea1) ? TRUE : FALSE; - BOOL l_bArea2 = (f_sEnvArea == EnvValueArea2) ? TRUE : FALSE; - - char buf[VP_MAX_LENGTH] = { 0 }; - - if (l_bArea1) { - VP_GetEnv(VP_VEHICLEPARAMETERLIBRARY__CWORD6_, buf); - if (strcmp(buf, "unavailable") == 0) { - l_pSetValueArea1Phase1 = EnvValueYes; - } else { - l_pSetValueArea1Phase2 = EnvValueYes; - } - } else if (l_bArea2) { - VP_GetEnv(VP_VEHICLEPARAMETERLIBRARY__CWORD6_, buf); - if (strcmp(buf, "unavailable") == 0) { - l_pSetValueArea2Phase1 = EnvValueYes; - } else { - l_pSetValueArea2Phase2 = EnvValueYes; - } - } - - if (0 != setenv(LaunchVrArea1Phase1EnvVariable, l_pSetValueArea1Phase1, 1)) { - SS_ASERT_ERRNO(0); - l_eStatus = eFrameworkunifiedStatusFail; - } - if (0 != setenv(LaunchVrArea1Phase2EnvVariable, l_pSetValueArea1Phase2, 1)) { - SS_ASERT_ERRNO(0); - l_eStatus = eFrameworkunifiedStatusFail; - } - if (0 != setenv(LaunchVrArea2Phase1EnvVariable, l_pSetValueArea2Phase1, 1)) { - SS_ASERT_ERRNO(0); - l_eStatus = eFrameworkunifiedStatusFail; - } - if (0 != setenv(LaunchVrArea2Phase2EnvVariable, l_pSetValueArea2Phase2, 1)) { - SS_ASERT_ERRNO(0); - l_eStatus = eFrameworkunifiedStatusFail; - } - - return l_eStatus; -} - -/*********************************************************************** - * setEvnVariableForLaunchMirrorLink - ***********************************************************************/ -static EFrameworkunifiedStatus setEvnVariableForLaunchMirrorLink(std::string f_sEnvBrand, std::string f_sEnvArea, std::string f_sSeriesInfo){ - EFrameworkunifiedStatus l_eStatus = eFrameworkunifiedStatusOK; - const CHAR LaunchMirrorLinkEnvVariable[] = "SM_CONF_LAUNCH_MIRRORLINK"; - - const CHAR *l_pSetValue = EnvValueNo; - - BOOL l_bBrand2 = (f_sEnvBrand == EnvValueBrand2) ? TRUE : FALSE; - BOOL l_bArea3 = (f_sEnvArea == EnvValueArea3) ? TRUE : FALSE; - BOOL l_bArea4 = (f_sEnvArea == EnvValueArea4) ? TRUE : FALSE; - BOOL l_bGen2 = (f_sSeriesInfo == PkgInfoGen2) ? TRUE : FALSE; - - if(l_bGen2){ - l_pSetValue = EnvValueNo; - } else { - if((l_bBrand2 && l_bArea3) || (l_bBrand2 && l_bArea4)) { - l_pSetValue = EnvValueYes; - } else { - l_pSetValue = EnvValueNo; - } - } - - - if (0 != setenv(LaunchMirrorLinkEnvVariable, l_pSetValue, 1)) { - SS_ASERT_ERRNO(0); - l_eStatus = eFrameworkunifiedStatusFail; - } - - return l_eStatus; -} - -/*********************************************************************** - * setEvnVariableForLaunchRadioService - ***********************************************************************/ -static EFrameworkunifiedStatus setEvnVariableForLaunchRadioService(std::string f_sEnvArea) { - EFrameworkunifiedStatus l_eStatus = eFrameworkunifiedStatusOK; - const CHAR LaunchRadioServiceEnvVariable[] = "SM_CONF_LAUNCH_RADIOSERVICE"; - - const CHAR *l_pSetValue = EnvValueNo; - - BOOL l_bArea1 = (f_sEnvArea == EnvValueArea1) ? TRUE : FALSE; - - if (l_bArea1) { - l_pSetValue = EnvValueYes; - } else { - l_pSetValue = EnvValueNo; - } - - if (0 != setenv(LaunchRadioServiceEnvVariable, l_pSetValue, 1)) { - SS_ASERT_ERRNO(0); - l_eStatus = eFrameworkunifiedStatusFail; - } - - return l_eStatus; -} - -/*********************************************************************** - * setEvnVariableForLaunchPLAYSRV - ***********************************************************************/ -static EFrameworkunifiedStatus -setEvnVariableForLaunchPLAYSRV(std::string f_sEnvArea, std::string f_sEnvBrand, std::string f_sEnvGrade, std::string f_sSeriesInfo){ - EFrameworkunifiedStatus l_eStatus = eFrameworkunifiedStatusOK; - const CHAR LaunchPLAYSRVEnvVariable[] = "SM_CONF_LAUNCH_PLAYSRV"; - - const CHAR *l_pSetValue = EnvValueNo; - BOOL l_bPhase1 = FALSE; - BOOL l_bPhase2 = FALSE; - BOOL l_bPhase3 = FALSE; - - BOOL l_bArea2 = (f_sEnvArea == EnvValueArea2) ? TRUE : FALSE; - BOOL l_bArea1 = (f_sEnvArea == EnvValueArea1) ? TRUE : FALSE; - BOOL l_bBrand2 = (f_sEnvBrand == EnvValueBrand2) ? TRUE : FALSE; - BOOL l_bBrand1 = (f_sEnvBrand == EnvValueBrand1) ? TRUE : FALSE; - BOOL l_bGrade1 = (f_sEnvGrade == EnvValueGrade1) ? TRUE : FALSE; - BOOL l_bGrade2 = (f_sEnvGrade == EnvValueGrade2) ? TRUE : FALSE; - BOOL l_bGrade3 = (f_sEnvGrade == EnvValueGrade3) ? TRUE : FALSE; - BOOL l_bGen2 = (f_sSeriesInfo == PkgInfoGen2) ? TRUE : FALSE; - - //VEHICLEPARAMETERLIBRARY_PHASE - EFrameworkunifiedStatus ret = eFrameworkunifiedStatusOK; - SSVER_PkgInfo PhaseInfo = {0}; - CSSVer cVersion; - if ( true != cVersion.empty() ) { - ret = cVersion.getPkgInfo( SS_PKG_PHASE_INFO, &PhaseInfo ); - if ( ret == eFrameworkunifiedStatusOK ) { - l_bPhase1 = ('1' == PhaseInfo.version[0]) ? TRUE : FALSE; - l_bPhase2 = ('2' == PhaseInfo.version[0]) ? TRUE : FALSE; - l_bPhase3 = ('3' == PhaseInfo.version[0]) ? TRUE : FALSE; - } - } - - FRAMEWORKUNIFIEDLOG(ZONE_INFO, __FUNCTION__, " Gen2[%d] Area1[%d] Area2[%d] Brand1[%d] Brand2[%d] Grade1[%d] Grade2[%d] Grade3[%d] P1[%d] P2[%d] P3[%d] " , - l_bGen2, l_bArea1, l_bArea2, l_bBrand1, l_bBrand2, l_bGrade1, l_bGrade2, l_bGrade3, - l_bPhase1, l_bPhase2, l_bPhase3); - - // Gen2 - if ( l_bGen2 ) { - // Grade2 - if ( l_bGrade2 ) - { - l_pSetValue = EnvValueNo; - } else { - l_pSetValue = EnvValueYes; - } - } else { - // Brand1 - if ( l_bBrand1 ) { - l_pSetValue = EnvValueYes; - } - // Brand2 - else if ( l_bBrand2 ) { - // Area2 - if ( l_bArea2 ) { - l_pSetValue = EnvValueYes; - } - // Area1 - else if ( l_bArea1 ) { - //_CWORD95_ - if ( l_bGrade3 ) { - // Phase3 - if ( l_bPhase3 ) { - l_pSetValue = EnvValueYes; - } else { - l_pSetValue = EnvValueNo; - } - } else { - l_pSetValue = EnvValueNo; - } - // Other - } else { - l_pSetValue = EnvValueNo; - } - // Other - } else { - l_pSetValue = EnvValueNo; - } - } - - FRAMEWORKUNIFIEDLOG(ZONE_INFO, __FUNCTION__, "SetValue : %s" , l_pSetValue); - - if (0 != setenv(LaunchPLAYSRVEnvVariable, l_pSetValue, 1)) { - SS_ASERT_ERRNO(0); - l_eStatus = eFrameworkunifiedStatusFail; - } - - return l_eStatus; -} - -/*********************************************************************** - * setEvnVariableForLaunch_CWORD27_ - ***********************************************************************/ -static EFrameworkunifiedStatus -setEvnVariableForLaunch_CWORD27_(std::string f_sEnvArea, std::string f_sSeriesInfo){ - EFrameworkunifiedStatus l_eStatus = eFrameworkunifiedStatusOK; - const CHAR Launch_CWORD27_EnvVariable[] = "SM_CONF_LAUNCH__CWORD27_"; - const CHAR *l_pSetValue = EnvValueNo; - - BOOL l_bArea1 = (f_sEnvArea == EnvValueArea1) ? TRUE : FALSE; - BOOL l_bGen2 = (f_sSeriesInfo == PkgInfoGen2) ? TRUE : FALSE; - - if (l_bGen2) { - l_pSetValue = EnvValueYes; - } else { - if (l_bArea1) { - try { - EFrameworkunifiedStatus ret = eFrameworkunifiedStatusOK; - SSVER_PkgInfo PhaseInfo = {0}; - CSSVer cVersion; - if ( true != cVersion.empty() ) { - ret = cVersion.getPkgInfo( SS_PKG_PHASE_INFO, &PhaseInfo ); - if ( ret == eFrameworkunifiedStatusOK ) { - if ( '3' == PhaseInfo.version[0] ) { - l_pSetValue = EnvValueYes; - } else { - l_pSetValue = EnvValueNo; - } - } else { - l_pSetValue = EnvValueNo; - } - } else { - l_pSetValue = EnvValueNo; - } - } catch ( EFrameworkunifiedStatus ee) { - l_pSetValue = EnvValueNo; - } - } else { - l_pSetValue = EnvValueNo; - } - } - - if (0 != setenv(Launch_CWORD27_EnvVariable, l_pSetValue, 1)) { - SS_ASERT_ERRNO(0); - l_eStatus = eFrameworkunifiedStatusFail; - } - - return l_eStatus; -} - - - -/*********************************************************************** - * setEvnVariableForLaunchVRBodyCtrl - ***********************************************************************/ -static EFrameworkunifiedStatus -setEvnVariableForLaunchVRBodyCtrl(std::string f_sEnvArea, std::string f_sSeriesInfo){ - EFrameworkunifiedStatus l_eStatus = eFrameworkunifiedStatusOK; - const CHAR LaunchVRBodyCtrlEnvVariable[] = "SM_CONF_LAUNCH_VRBODYCTRL"; - - const CHAR *l_pSetValue = EnvValueNo; - - BOOL l_bArea2 = (f_sEnvArea == EnvValueArea2) ? TRUE : FALSE; - BOOL l_bGen2 = (f_sSeriesInfo == PkgInfoGen2) ? TRUE : FALSE; - - if(l_bArea2 && l_bGen2) { - l_pSetValue = EnvValueYes; - } else { - l_pSetValue = EnvValueNo; - } - - if(0 != setenv(LaunchVRBodyCtrlEnvVariable, l_pSetValue, 1)) { - SS_ASERT_ERRNO(0); - l_eStatus = eFrameworkunifiedStatusFail; - } - - return l_eStatus; -} - /*********************************************************************** * setEvnVariableForPkgSeriesInfo ***********************************************************************/ @@ -743,32 +282,6 @@ static EFrameworkunifiedStatus setVerInfo_version_date(const char* VerPath) { return configRet; } - -/*********************************************************************** - * setVersionInfo subfunction(version settings) - ***********************************************************************/ -static EFrameworkunifiedStatus setVerInfo_version(const char* VerPath) { - EFrameworkunifiedStatus configRet = eFrameworkunifiedStatusOK; - CSSVer ver; - SSVER_PkgInfo pkgInfo; - - std::string line; - std::ifstream verFin(VerPath); - if (verFin) { - bzero(&pkgInfo, sizeof(pkgInfo)); - if (std::getline(verFin, line)) { - snprintf(pkgInfo.version, sizeof(pkgInfo.version), "%s", - line.c_str()); - } - configRet = ver.setPkgInfo(SS_PKG_SPI_LOADER, pkgInfo); - SS_ASERT(configRet == eFrameworkunifiedStatusOK); - } else { - SS_ASERT_ERRNO(0); - } - return configRet; -} - - /*********************************************************************** * Set version information ***********************************************************************/ @@ -787,20 +300,8 @@ static EFrameworkunifiedStatus setVersionInfo(void) { configRet = ver.setPkgInfo(SS_PKG_TARGETBOARD, pkgInfo); SS_ASERT(configRet == eFrameworkunifiedStatusOK); - // Set LPF version information - const char pfVersion[] = "/version/pf/version.txt"; - { - configRet = setVerInfo_version_date(pfVersion); - } - - // Set COMP SI version information - const char csiVersion[] = "/version/si/version.txt"; - { - configRet = setVerInfo_version_date(csiVersion); - } - // Set PRODUCT version information - const char prdVersion[] = "/version/product/version.txt"; + const char prdVersion[] = "/usr/agl/share/BS/ss/system_manager/rodata/version.txt"; { std::string line; std::ifstream prdFin(prdVersion); @@ -825,60 +326,12 @@ static EFrameworkunifiedStatus setVersionInfo(void) { } } - // Set SPI_LOADER version information - const char spiVersion[] = "/proc/device-tree/bootinfo/ver_spiloader"; - { - configRet = setVerInfo_version(spiVersion); - } - - // Set UBOOT version information - const char ubootVersion[] = "/proc/device-tree/bootinfo/ver_uboot"; - { - configRet = setVerInfo_version(ubootVersion); - } - - // Set SECURE_LOADER version information - const char secureVersion[] = "/proc/device-tree/bootinfo/ver_secureloader"; - { - configRet = setVerInfo_version(secureVersion); - } - // PHASE_INFO - const char phaseVersion[] = "/version/PhaseInfo/PhaseInfo.txt"; + const char phaseVersion[] = "/usr/agl/share/BS/ss/system_manager/rodata/PhaseInfo.txt"; { configRet = setVerInfo_version_date(phaseVersion); } - // VP_VEHICLEPARAMETERLIBRARY - { - std::string l_sEnvVpConfigVer = getEnvValiavleWithDefault(VP_VEHICLEPARAMETERLIBRARY_VERSION, - NULL); - if (!l_sEnvVpConfigVer.empty()) { - bzero(&pkgInfo, sizeof(pkgInfo)); - snprintf(pkgInfo.version, sizeof(pkgInfo.version), "%s", - l_sEnvVpConfigVer.c_str()); - - configRet = ver.setPkgInfo(SS_PKG_VP_CONFIG, pkgInfo); - SS_ASERT(configRet == eFrameworkunifiedStatusOK); - } else { - SS_ASERT(0); - } - } - - // VP__CWORD31_ - { - std::string l_sEnvVp_CWORD31_Ver = getEnvValiavleWithDefault( - VP__CWORD31__VERSION, NULL); - if (!l_sEnvVp_CWORD31_Ver.empty()) { - bzero(&pkgInfo, sizeof(pkgInfo)); - snprintf(pkgInfo.version, sizeof(pkgInfo.version), "%s", - l_sEnvVp_CWORD31_Ver.c_str()); - - configRet = ver.setPkgInfo(SS_PKG_VP__CWORD31_, pkgInfo); - SS_ASERT(configRet == eFrameworkunifiedStatusOK); - } - SS_ASERT(0); - } } catch (EFrameworkunifiedStatus ee) { SS_ASERT(0); configRet = ee; @@ -952,7 +405,6 @@ EFrameworkunifiedStatus ss_sm_initHook(HANDLE hApp, const T_SS_SM_INIT_HOOK_IN_P T_SS_SM_INIT_HOOK_OUT_PARAM *outPrm) { EFrameworkunifiedStatus l_eStatus = eFrameworkunifiedStatusOK; std::string l_sEnvFile; - std::string l_sEnvBoard; std::string l_sEnvArea; std::string l_sEnvBrand; std::string l_sEnvGrade; @@ -981,9 +433,6 @@ EFrameworkunifiedStatus ss_sm_initHook(HANDLE hApp, const T_SS_SM_INIT_HOOK_IN_P // APPS_CONFIG_FILENAME (not set by default) l_sEnvFile = getEnvValiavleWithDefault(LaunchConfigFileNameEnvVariable, NULL); - // VEHICLEPARAMETERLIBRARY_BOARD - l_sEnvBoard = getEnvValiavleWithDefault(BoardEnvVariable, NULL); - // VEHICLEPARAMETERLIBRARY_AREA l_sEnvArea = getEnvValiavleWithDefault(AreaTypeEnvVariable, EnvValueArea1); @@ -1013,78 +462,18 @@ EFrameworkunifiedStatus ss_sm_initHook(HANDLE hApp, const T_SS_SM_INIT_HOOK_IN_P SS_ASERT(0); } - // SM_CONF_LAUNCH_RadioHDArbiter - if (eFrameworkunifiedStatusOK - != setEvnVariableForLaunchRadioHDArbiter(l_sEnvBoard, l_sEnvArea)) { - SS_ASERT(0); - } - - // SM_CONF_LAUNCH_DTVSERVICE - if (eFrameworkunifiedStatusOK - != setEvnVariableForLaunchDtvService(l_sEnvBrand, l_sEnvArea, l_sEnvGrade)) { - SS_ASERT(0); - } - - // SM_CONF_LAUNCH_HANDWRITING - if (eFrameworkunifiedStatusOK - != setEvnVariableForLaunchHandWriting(l_sEnvBrand, l_sEnvArea)) { - SS_ASERT(0); - } // SM_CONF_LAUNCH_CUS if (eFrameworkunifiedStatusOK != setEvnVariableForLaunchCus(l_sEnvArea)) { SS_ASERT(0); } - // SM_CONF_LAUNCH_VR - if (eFrameworkunifiedStatusOK - != setEvnVariableForLaunchVrService(l_sEnvBrand, l_sEnvArea)) { - SS_ASERT(0); - } - - // SM_CONF_LAUNCH_LSP - if(eFrameworkunifiedStatusOK != setEvnVariableForLaunchLSP(l_sEnvBrand, l_sEnvArea, l_sEnvGrade)) { - SS_ASERT(0); - } - - // SM_CONF_LAUNCH_MIRRORLINK - if(eFrameworkunifiedStatusOK != setEvnVariableForLaunchMirrorLink(l_sEnvBrand, l_sEnvArea, l_sPkgSeriesInfo)) { - SS_ASERT(0); - } - // SM_CONF_LAUNCH_TFF if (eFrameworkunifiedStatusOK != setEvnVariableForLaunchTFF(l_sEnvArea)) { SS_ASERT(0); } - // SM_CONF_LAUNCH_AWTPRIMARY - if(eFrameworkunifiedStatusOK != setEvnVariableForLaunchAwtPrimary(l_sEnvGrade, l_sEnvArea)) { - SS_ASERT(0); - } - - // SM_CONF_LAUNCH_RADIOSERVICE - if (eFrameworkunifiedStatusOK - != setEvnVariableForLaunchRadioService(l_sEnvArea)) { - SS_ASERT(0); - } - - // SM_CONF_LAUNCH_PLAYSRV - if (eFrameworkunifiedStatusOK != setEvnVariableForLaunchPLAYSRV(l_sEnvArea, l_sEnvBrand, l_sEnvGrade, l_sPkgSeriesInfo)) { - SS_ASERT(0); - } - - // SM_CONF_LAUNCH__CWORD27_ - if (eFrameworkunifiedStatusOK != setEvnVariableForLaunch_CWORD27_(l_sEnvArea, l_sPkgSeriesInfo)) { - SS_ASERT(0); - } - - // SM_CONF_LAUNCH_VRBODYCTRL - if(eFrameworkunifiedStatusOK != setEvnVariableForLaunchVRBodyCtrl(l_sEnvArea, l_sPkgSeriesInfo)) { - SS_ASERT(0); - } - - if (eFrameworkunifiedStatusOK != (l_eStatus = FrameworkunifiedSubscribeNotificationWithCallback( hApp, NTFY_PSMShadowService_Availability, cbServiceNotificationFunc))) { diff --git a/config/library/system_manager_config/xml/Makefile b/config/library/system_manager_config/xml/Makefile index 20559111..e11288c4 100644 --- a/config/library/system_manager_config/xml/Makefile +++ b/config/library/system_manager_config/xml/Makefile @@ -1,5 +1,5 @@ # -# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. +# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/config/library/system_manager_config/xml/launch_cfg2xml.sh b/config/library/system_manager_config/xml/launch_cfg2xml.sh index ecaaca01..57b6ee22 100644 --- a/config/library/system_manager_config/xml/launch_cfg2xml.sh +++ b/config/library/system_manager_config/xml/launch_cfg2xml.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# Copyright (c) 2019 TOYOTA MOTOR CORPORATION +# Copyright (c) 2019-2020 TOYOTA MOTOR CORPORATION # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/config/library/system_manager_config/xml/launch_xml2cfg.sh b/config/library/system_manager_config/xml/launch_xml2cfg.sh index 16f81aea..20fa0979 100644 --- a/config/library/system_manager_config/xml/launch_xml2cfg.sh +++ b/config/library/system_manager_config/xml/launch_xml2cfg.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# Copyright (c) 2019 TOYOTA MOTOR CORPORATION +# Copyright (c) 2019-2020 TOYOTA MOTOR CORPORATION # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/system_service.mk b/system_service.mk index a8a06b06..5444eb4c 100644 --- a/system_service.mk +++ b/system_service.mk @@ -1,7 +1,7 @@ ############################################################# # # Common Makefile for system_service -# Copyright (C) 2017-2019 TOYOTA MOTOR CORPORATION +# Copyright (C) 2017-2020 TOYOTA MOTOR CORPORATION # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. |