From 65fb6250500c1152a7705adf842896a9ed3f2f15 Mon Sep 17 00:00:00 2001 From: takeshi_hoshina Date: Thu, 22 Oct 2020 09:43:36 +0900 Subject: ss-romaccesslibrary branch 0.1 --- rom_access_library/Makefile.client | 2 +- rom_access_library/library/Makefile | 2 +- .../library/include/rom_access_library_nor.h | 2 +- .../library/include/rom_access_library_rom.h | 2 +- .../library/include/ss_rom_access_define.h | 2 +- .../include/ss_rom_access_if_romaccesslibrarylog.h | 2 +- .../library/include/ss_sm_checksum.h | 2 +- .../library/include/system_service/nor_backup.h | 2 +- .../include/system_service/rom_access_library.h | 2 +- .../include/system_service/ss_sm_boot_access.h | 2 +- .../include/system_service/ss_sm_ram_access.h | 12 +++--- .../include/system_service/ss_sm_rom_access.h | 2 +- rom_access_library/library/nor/Makefile | 2 +- rom_access_library/library/nor/libBlkDev_API.ver | 2 +- rom_access_library/library/nor/libssaccess.ver | 2 +- rom_access_library/library/nor/src/nor_backup.c | 2 +- rom_access_library/library/rom/Makefile | 5 +-- .../library/rom/src/ss_sm_boot_access.cpp | 2 +- .../library/rom/src/ss_sm_checksum.cpp | 2 +- .../library/rom/src/ss_sm_ram_access.cpp | 16 ++++---- .../library/rom/src/ss_sm_rom_access.cpp | 44 +++++++++++----------- system_service.mk | 2 +- 22 files changed, 55 insertions(+), 58 deletions(-) diff --git a/rom_access_library/Makefile.client b/rom_access_library/Makefile.client index 98aaecf1..adb1845b 100644 --- a/rom_access_library/Makefile.client +++ b/rom_access_library/Makefile.client @@ -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/rom_access_library/library/Makefile b/rom_access_library/library/Makefile index c3ea6d45..e8c64b2e 100644 --- a/rom_access_library/library/Makefile +++ b/rom_access_library/library/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/rom_access_library/library/include/rom_access_library_nor.h b/rom_access_library/library/include/rom_access_library_nor.h index 314f60ec..417b78f7 100644 --- a/rom_access_library/library/include/rom_access_library_nor.h +++ b/rom_access_library/library/include/rom_access_library_nor.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/rom_access_library/library/include/rom_access_library_rom.h b/rom_access_library/library/include/rom_access_library_rom.h index b09f94fc..1e02e6e2 100644 --- a/rom_access_library/library/include/rom_access_library_rom.h +++ b/rom_access_library/library/include/rom_access_library_rom.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/rom_access_library/library/include/ss_rom_access_define.h b/rom_access_library/library/include/ss_rom_access_define.h index 83b9d44b..689fea20 100644 --- a/rom_access_library/library/include/ss_rom_access_define.h +++ b/rom_access_library/library/include/ss_rom_access_define.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/rom_access_library/library/include/ss_rom_access_if_romaccesslibrarylog.h b/rom_access_library/library/include/ss_rom_access_if_romaccesslibrarylog.h index e4bc923a..e62b5af3 100644 --- a/rom_access_library/library/include/ss_rom_access_if_romaccesslibrarylog.h +++ b/rom_access_library/library/include/ss_rom_access_if_romaccesslibrarylog.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/rom_access_library/library/include/ss_sm_checksum.h b/rom_access_library/library/include/ss_sm_checksum.h index bb0feec7..271964c6 100644 --- a/rom_access_library/library/include/ss_sm_checksum.h +++ b/rom_access_library/library/include/ss_sm_checksum.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/rom_access_library/library/include/system_service/nor_backup.h b/rom_access_library/library/include/system_service/nor_backup.h index 596d2551..8c95a10c 100644 --- a/rom_access_library/library/include/system_service/nor_backup.h +++ b/rom_access_library/library/include/system_service/nor_backup.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/rom_access_library/library/include/system_service/rom_access_library.h b/rom_access_library/library/include/system_service/rom_access_library.h index 63a7db2a..50e44b11 100644 --- a/rom_access_library/library/include/system_service/rom_access_library.h +++ b/rom_access_library/library/include/system_service/rom_access_library.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/rom_access_library/library/include/system_service/ss_sm_boot_access.h b/rom_access_library/library/include/system_service/ss_sm_boot_access.h index f0820027..bac051cd 100644 --- a/rom_access_library/library/include/system_service/ss_sm_boot_access.h +++ b/rom_access_library/library/include/system_service/ss_sm_boot_access.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/rom_access_library/library/include/system_service/ss_sm_ram_access.h b/rom_access_library/library/include/system_service/ss_sm_ram_access.h index c8283c63..f96966ba 100644 --- a/rom_access_library/library/include/system_service/ss_sm_ram_access.h +++ b/rom_access_library/library/include/system_service/ss_sm_ram_access.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. @@ -86,9 +86,7 @@ class RAM_AccessIf{ RAM_SM_INFO_t m_buf; bool m_dirty; void initRamBackupEnable(RAM_WAKEUP_STATE wup_state); - void initRamBackupDisable(RAM_WAKEUP_STATE wup_state); void finalRamBackupEnable(void); - void finalRamBackupDisable(void); public: /** @@ -173,7 +171,7 @@ explicit RAM_AccessIf(RAM_WAKEUP_STATE wup_state = RAM_WAKEUP_STATE_DONT_CARE); * - The change in the internal status does not occur by this API. * \~english @par Conditions of processing failure * - If p_boot_info is NULL [eFrameworkunifiedStatusFail] - * - If read data from secondary storage area or /nv/romaccess/ramdata.dat + * - If read data from secondary storage area or /nv/BS/ss/rom_access_library/rwdata/ramdata.dat * failed [eFrameworkunifiedStatusFail] * \~english @par Classification: * Public @@ -181,7 +179,7 @@ explicit RAM_AccessIf(RAM_WAKEUP_STATE wup_state = RAM_WAKEUP_STATE_DONT_CARE); * Sync only(None communication) * \~english @par Detail: * Copy the system information stored in the secondary storage area or - * in /nv/romaccess/ramdata.dat to p_boot_info. \n + * in /nv/BS/ss/rom_access_library/rwdata/ramdata.dat to p_boot_info. \n * \~english @see setRamInfo */ EFrameworkunifiedStatus getRamInfo(RAM_SM_INFO_t* p_boot_info); @@ -216,7 +214,7 @@ explicit RAM_AccessIf(RAM_WAKEUP_STATE wup_state = RAM_WAKEUP_STATE_DONT_CARE); * - The change in the internal status does not occur by this API. * \~english @par Conditions of processing failure * - If p_boot_info is NULL [eFrameworkunifiedStatusFail] - * - If write data to secondary storage area or /nv/romaccess/ramdata.dat + * - If write data to secondary storage area or /nv/BS/ss/rom_access_library/rwdata/ramdata.dat * failed [eFrameworkunifiedStatusFail] * \~english @par Classification: * Public @@ -224,7 +222,7 @@ explicit RAM_AccessIf(RAM_WAKEUP_STATE wup_state = RAM_WAKEUP_STATE_DONT_CARE); * Sync only(None communication) * \~english @par Detail: * Write the system manegement information stored in p_boot_info to the - * secondary storage area or /nv/romaccess/ramdata.dat. \n + * secondary storage area or /nv/BS/ss/rom_access_library/rwdata/ramdata.dat. \n * \~english @see getRamInfo */ EFrameworkunifiedStatus setRamInfo(RAM_SM_INFO_t* p_boot_info); diff --git a/rom_access_library/library/include/system_service/ss_sm_rom_access.h b/rom_access_library/library/include/system_service/ss_sm_rom_access.h index d86d2bb9..4ba1a76a 100644 --- a/rom_access_library/library/include/system_service/ss_sm_rom_access.h +++ b/rom_access_library/library/include/system_service/ss_sm_rom_access.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/rom_access_library/library/nor/Makefile b/rom_access_library/library/nor/Makefile index 9b0f878d..f30c271a 100644 --- a/rom_access_library/library/nor/Makefile +++ b/rom_access_library/library/nor/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/rom_access_library/library/nor/libBlkDev_API.ver b/rom_access_library/library/nor/libBlkDev_API.ver index 9f668a46..5ebddcb6 100644 --- a/rom_access_library/library/nor/libBlkDev_API.ver +++ b/rom_access_library/library/nor/libBlkDev_API.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/rom_access_library/library/nor/libssaccess.ver b/rom_access_library/library/nor/libssaccess.ver index 8b89c2a8..c4bd070d 100644 --- a/rom_access_library/library/nor/libssaccess.ver +++ b/rom_access_library/library/nor/libssaccess.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/rom_access_library/library/nor/src/nor_backup.c b/rom_access_library/library/nor/src/nor_backup.c index 769171f6..8a133b02 100644 --- a/rom_access_library/library/nor/src/nor_backup.c +++ b/rom_access_library/library/nor/src/nor_backup.c @@ -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/rom_access_library/library/rom/Makefile b/rom_access_library/library/rom/Makefile index 064bf2cc..81acd8af 100644 --- a/rom_access_library/library/rom/Makefile +++ b/rom_access_library/library/rom/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. @@ -50,10 +50,9 @@ CPPFLAGS += -Wformat ######### linked library (dynamic) ############# LDLIBS += -Wl,-Bdynamic -lNS_FrameworkUnified -LDLIBS += -Wl,-Bdynamic -lvp LDLIBS += -Wl,-Bdynamic -lcommon LDLIBS += -Wl,-Bdynamic -lssaccess -#LDLIBS += -Wl,-Bdynamic -lextension +LDLIBS += -Wl,-Bdynamic -lextension CPPFLAGS_ss_sm_checksum.o += -fno-exceptions CPPFLAGS_ss_sm_checksum.os += -fno-exceptions diff --git a/rom_access_library/library/rom/src/ss_sm_boot_access.cpp b/rom_access_library/library/rom/src/ss_sm_boot_access.cpp index 36f3a9f4..44e8a531 100644 --- a/rom_access_library/library/rom/src/ss_sm_boot_access.cpp +++ b/rom_access_library/library/rom/src/ss_sm_boot_access.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. diff --git a/rom_access_library/library/rom/src/ss_sm_checksum.cpp b/rom_access_library/library/rom/src/ss_sm_checksum.cpp index 39a087ae..52cb1147 100644 --- a/rom_access_library/library/rom/src/ss_sm_checksum.cpp +++ b/rom_access_library/library/rom/src/ss_sm_checksum.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. diff --git a/rom_access_library/library/rom/src/ss_sm_ram_access.cpp b/rom_access_library/library/rom/src/ss_sm_ram_access.cpp index f101fb4b..b5cf244b 100644 --- a/rom_access_library/library/rom/src/ss_sm_ram_access.cpp +++ b/rom_access_library/library/rom/src/ss_sm_ram_access.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. @@ -21,7 +21,7 @@ #include #include #include -//#include +#include #include "system_service/ss_sm_boot_access.h" #include "ss_rom_access_if_romaccesslibrarylog.h" #include "ss_sm_checksum.h" @@ -29,7 +29,7 @@ -#define RAM_PATH "/nv/romaccess/ramdata.dat" +#define RAM_PATH "/nv/BS/ss/rom_access_library/rwdata/ramdata.dat" #define RAM_OLD_PATH RAM_PATH".old" static const uint8_t kSigNature[] = { 0xDE, 0xAD, 0xBE, 0xEF }; static const uint8_t kMagic[] = { 0xDE, 0xAD, 0xBE, 0xEF }; @@ -56,11 +56,11 @@ void RAM_AccessIf::initRamBackupEnable(RAM_WAKEUP_STATE wupState) { ROM_ACCESS_STATIC_ASERT((sizeof(RAM_SM_DRAM_INFO_t) % sizeof(UI_32)) == 0); if (g_m_bakup_map == MAP_FAILED) { -// g_m_bakup_map = EL_mem_exram_mmap( // LCOV_EXCL_BR_LINE 11:unexpected branch -// EL_MEM_TYPE_REGION_SYS, -// EL_mem_getOffset(EL_MEM_ID_SYS_BOOT) + SS_SYS_AREA_RAM_OFFSET, // LCOV_EXCL_BR_LINE 11:unexpected branch -// SS_SYS_AREA_RAM_MAX_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, -// EL_MEM_CACHE_INVALID); + g_m_bakup_map = EL_mem_exram_mmap( // LCOV_EXCL_BR_LINE 11:unexpected branch + EL_MEM_TYPE_REGION_SYS, + EL_mem_getOffset(EL_MEM_ID_SYS_BOOT) + SS_SYS_AREA_RAM_OFFSET, // LCOV_EXCL_BR_LINE 11:unexpected branch + SS_SYS_AREA_RAM_MAX_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, + EL_MEM_CACHE_INVALID); // LCOV_EXCL_BR_START 6:impossible to confirm because g_m_bakup_map can not be changed if (g_m_bakup_map == MAP_FAILED) { // LCOV_EXCL_BR_STOP diff --git a/rom_access_library/library/rom/src/ss_sm_rom_access.cpp b/rom_access_library/library/rom/src/ss_sm_rom_access.cpp index 5c70846f..53589c29 100644 --- a/rom_access_library/library/rom/src/ss_sm_rom_access.cpp +++ b/rom_access_library/library/rom/src/ss_sm_rom_access.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. @@ -30,7 +30,7 @@ #include #include -//#include +#include #include #include @@ -38,7 +38,7 @@ #include "ss_sm_checksum.h" #include "ss_rom_access_define.h" -#define ROM_ACCESS_DIR "/nv/romaccess" +#define ROM_ACCESS_DIR "/nv/BS/ss/rom_access_library/rwdata" #define ROM_ACCESS_FILE "romdata.dat" const CHAR kDefaultRomDevice[] = ROM_ACCESS_DIR"/"ROM_ACCESS_FILE; const CHAR kRecoveryRomDevice[] = ROM_ACCESS_DIR"/"ROM_ACCESS_FILE".old"; @@ -259,11 +259,11 @@ EFrameworkunifiedStatus ROM_AccessIf::SystemInitialize(DRAM_BACKUP_STATE bkupSta // LCOV_EXCL_BR_START 6:impossible to confirm because g_m_bakup_map can not be changed if (g_m_bakup_map == MAP_FAILED) { // LCOV_EXCL_BR_STOP -// g_m_bakup_map = EL_mem_exram_mmap( -// EL_MEM_TYPE_REGION_SYS, -// EL_mem_getOffset(EL_MEM_ID_SYS_BOOT) + SS_SYS_AREA_ROM_OFFSET, -// SS_SYS_AREA_ROM_MAX_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, -// EL_MEM_CACHE_INVALID); + g_m_bakup_map = EL_mem_exram_mmap( + EL_MEM_TYPE_REGION_SYS, + EL_mem_getOffset(EL_MEM_ID_SYS_BOOT) + SS_SYS_AREA_ROM_OFFSET, + SS_SYS_AREA_ROM_MAX_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, + EL_MEM_CACHE_INVALID); if (g_m_bakup_map == MAP_FAILED) { ROM_ACCESS_ERRNO(0); return eFrameworkunifiedStatusFail; @@ -292,11 +292,11 @@ EFrameworkunifiedStatus ROM_AccessIf::Initialize() { CSMChecksum l_checksum; FRAMEWORKUNIFIEDLOG(ZONE_FUNC, __FUNCTION__, "+"); if (g_m_bakup_map == MAP_FAILED) { -// g_m_bakup_map = EL_mem_exram_mmap( // LCOV_EXCL_BR_LINE 11:unexpected branch -// EL_MEM_TYPE_REGION_SYS, -// EL_mem_getOffset(EL_MEM_ID_SYS_BOOT) + SS_SYS_AREA_ROM_OFFSET, // LCOV_EXCL_BR_LINE 11:unexpected branch -// SS_SYS_AREA_ROM_MAX_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, -// EL_MEM_CACHE_INVALID); + g_m_bakup_map = EL_mem_exram_mmap( // LCOV_EXCL_BR_LINE 11:unexpected branch + EL_MEM_TYPE_REGION_SYS, + EL_mem_getOffset(EL_MEM_ID_SYS_BOOT) + SS_SYS_AREA_ROM_OFFSET, // LCOV_EXCL_BR_LINE 11:unexpected branch + SS_SYS_AREA_ROM_MAX_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, + EL_MEM_CACHE_INVALID); // LCOV_EXCL_BR_START 6:impossible to confirm because g_m_bakup_map can not be changed if (g_m_bakup_map == MAP_FAILED) { // LCOV_EXCL_BR_STOP @@ -663,14 +663,14 @@ EFrameworkunifiedStatus ROM_AccessIf::GetDataResetModeFast(EDATARESET_MODE* pDat LBM_RAM_t* p_lbm = NULL; mapSize = SS_SYS_AREA_BOOT_MAX_SIZE; -// if (EL_mem_getLength(EL_MEM_ID_SYS_BOOT) < SS_SYS_AREA_BOOT_MAX_SIZE) { // LCOV_EXCL_BR_LINE 11:unexpected branch -// mapSize = EL_mem_getLength(EL_MEM_ID_SYS_BOOT); // LCOV_EXCL_BR_LINE 11:unexpected branch -// } + if (EL_mem_getLength(EL_MEM_ID_SYS_BOOT) < SS_SYS_AREA_BOOT_MAX_SIZE) { // LCOV_EXCL_BR_LINE 11:unexpected branch + mapSize = EL_mem_getLength(EL_MEM_ID_SYS_BOOT); // LCOV_EXCL_BR_LINE 11:unexpected branch + } // LCOV_EXCL_BR_START 11:unexpected branch -// p_map = reinterpret_cast(EL_mem_exram_mmap(EL_MEM_TYPE_REGION_SYS, -// EL_mem_getOffset(EL_MEM_ID_SYS_BOOT), -// mapSize, PROT_READ | PROT_WRITE, -// MAP_SHARED, EL_MEM_CACHE_INVALID)); + p_map = reinterpret_cast(EL_mem_exram_mmap(EL_MEM_TYPE_REGION_SYS, + EL_mem_getOffset(EL_MEM_ID_SYS_BOOT), + mapSize, PROT_READ | PROT_WRITE, + MAP_SHARED, EL_MEM_CACHE_INVALID)); // LCOV_EXCL_BR_STOP if (p_map == MAP_FAILED) { // LCOV_EXCL_BR_LINE 6:impossible to confirm because p_map can not be changed ROM_ACCESS_ERRNO(0); // LCOV_EXCL_BR_LINE 6:impossible to confirm because p_map can not be changed @@ -692,8 +692,8 @@ EFrameworkunifiedStatus ROM_AccessIf::GetDataResetModeFast(EDATARESET_MODE* pDat } // LCOV_EXCL_STOP if (p_map != MAP_FAILED) { // LCOV_EXCL_BR_LINE 6:impossible to confirm because p_map can not be changed -// ROM_ACCESS_ERRNO(0 == EL_mem_exram_munmap(p_map, // LCOV_EXCL_BR_LINE 11:unexpected branch -// mapSize)); + ROM_ACCESS_ERRNO(0 == EL_mem_exram_munmap(p_map, // LCOV_EXCL_BR_LINE 11:unexpected branch + mapSize)); } return eStatus; // LCOV_EXCL_BR_LINE 11:unexpected branch } 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. -- cgit 1.2.3-korg