test 132276 [基本移植]内置默认IMEI 132341 [基本移植]IMEI SVN改为01 wuxuhua 26/10326/1
author wuxuhua [email protected]
Wed, 16 May 2018 10:55:24 +0800 (10:55 +0800)
committer wuxuhua [email protected]
Wed, 16 May 2018 10:55:24 +0800 (10:55 +0800)
Change-Id: I567e6ca1c06a23b631005261f38d47030c8ef32a
TK_MD_BASIC_MOLY.LR12A.R2.MP.V8.6/mcu/pcore/custom/service/nvram/l4_nvram_def.c patch | blob | history
TK_MD_BASIC_MOLY.LR12A.R2.MP.V8.6/mcu/pcore/custom/service/nvram/nvram_data_items.c patch | blob | history
diff --git a/TK_MD_BASIC_MOLY.LR12A.R2.MP.V8.6/mcu/pcore/custom/service/nvram/l4_nvram_def.c b/TK_MD_BASIC_MOLY.LR12A.R2.MP.V8.6/mcu/pcore/custom/service/nvram/l4_nvram_def.c
index 384b03a…07b6979 100644 (file)
— a/TK_MD_BASIC_MOLY.LR12A.R2.MP.V8.6/mcu/pcore/custom/service/nvram/l4_nvram_def.c
+++ b/TK_MD_BASIC_MOLY.LR12A.R2.MP.V8.6/mcu/pcore/custom/service/nvram/l4_nvram_def.c
@@ -549,6 +549,9 @@ kal_uint8 const COMMON_NVRAM_EF_CB_DEFAULT_CH_DEFAULT[] =
#endif
+//Redmine132276 wuxuhua modified for default imei 2018-5-15 begin
+static kal_uint8 const NVRAM_EF_IMEI_DEFAULT_SAGEREAL[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+//Redmine132276 wuxuhua modified for default imei 2018-5-15 end
extern const kal_uint32 NVRAM_EF_CUST_HW_LEVEL_TBL_DEFAULT[NVRAM_EF_CUST_HW_LEVEL_TBL_SIZE];
#if defined(IC_SLT)
@@ -1780,7 +1783,9 @@ ltable_entry_struct logical_data_item_table_l4[] =
#if defined(__IC_SLT__)
NVRAM_NORMAL(NVRAM_EF_IMEI_DEFAULT),
#else
-
NVRAM_NORMAL(NVRAM_EF_FF_DEFAULT),
-
//Redmine132276 wuxuhua modified for default imei 2018-5-15 begin
-
NVRAM_NORMAL(NVRAM_EF_IMEI_DEFAULT_SAGEREAL), -
//Redmine132276 wuxuhua modified for default imei 2018-5-15 end
#endif
#ifdef NVRAM_OTP
diff --git a/TK_MD_BASIC_MOLY.LR12A.R2.MP.V8.6/mcu/pcore/custom/service/nvram/nvram_data_items.c b/TK_MD_BASIC_MOLY.LR12A.R2.MP.V8.6/mcu/pcore/custom/service/nvram/nvram_data_items.c
index e170cf5…141ba31 100644 (file)
— a/TK_MD_BASIC_MOLY.LR12A.R2.MP.V8.6/mcu/pcore/custom/service/nvram/nvram_data_items.c
+++ b/TK_MD_BASIC_MOLY.LR12A.R2.MP.V8.6/mcu/pcore/custom/service/nvram/nvram_data_items.c
+#endif
-
//Redmine132276 wuxuhua modified for default imei sv 2018-5-15 begin
-
SYS_CACHE_ENTRY(NVRAM_SYS_SVN,
-
NVRAM_APP_RESERVED, -
KAL_FALSE, -
"NVRAM_SYS_SVN", -
0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00), -
//Redmine132276 wuxuhua modified for default imei sv 2018-5-15 end
-
SYS_CACHE_ENTRY(NVRAM_SYS_USB_BOOT_MODE,
-
NVRAM_APP_RESERVED, -
KAL_FALSE, -
"NVRAM_SYS_USB_BOOT_MODE\0", -
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00), -
SYS_CACHE_ENTRY(NVRAM_SYS_USB_TETHERING_MODE,
-
NVRAM_APP_RESERVED, -
KAL_FALSE, -
"NVRAM_SYS_USB_TETHERING_MODE\0", -
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00), -
SYS_CACHE_ENTRY(NVRAM_SYS_AUTO_TEST,
-
NVRAM_APP_RESERVED, -
KAL_FALSE, -
"NVRAM_SYS_AUTO_TEST\0", -
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00), -
SYS_CACHE_ENTRY(NVRAM_SYS_MINI_LOG_IDX,
-
NVRAM_APP_RESERVED, -
KAL_FALSE, -
"NVRAM_SYS_MINI_LOG_IDX\0", -
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00), -
SYS_CACHE_ENTRY(NVRAM_SYS_SWLA, -
NVRAM_APP_RESERVED, -
KAL_FALSE, -
"NVRAM_SYS_SWLA\0", -
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00), -
SYS_CACHE_ENTRY(NVRAM_SYS_NVRAM_INIT_TIME_UT, -
NVRAM_APP_RESERVED, -
KAL_FALSE, -
"NVRAM_SYS_NVRAM_INIT_TIME_UT\0", -
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00), -
SYS_CACHE_ENTRY(NVRAM_SYS_NVRAM_INIT_TIME_UT2, -
NVRAM_APP_RESERVED, -
KAL_FALSE, -
"NVRAM_SYS_NVRAM_INIT_TIME_UT2\0", -
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00), -
/* !!Add a entry above this line by using SYS_CACHE_ENTRY macro */
-
SYS_CACHE_ENTRY(NVRAM_SYS_CACHE_MAX,
-
NVRAM_APP_RESERVED, -
KAL_FALSE, -
"The last record of system cache", -
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00), -
SYS_CACHE_ENTRY(NVRAM_SYS_CACHE_BEGIN,
-
NVRAM_APP_RESERVED, -
KAL_FALSE, -
"Record system cache will be restore or not", -
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00), -
SYS_CACHE_ENTRY(NVRAM_SYS_FLIGHTMODE_STATE,
-
NVRAM_APP_RESERVED, -
KAL_TRUE, -
"NVRAM_SYS_FLIGHTMODE_STATE", -
#if (GEMINI_PLUS == 4) -
0x00, 0x00, 0x0F, 0x00, 0x01, 0x0A, 0x00, 0x00), -
#elif (GEMINI_PLUS == 3) -
0x00, 0x00, 0x07, 0x00, 0x01, 0x0A, 0x00, 0x00), -
#elif (GEMINI_PLUS == 2) -
0x00, 0x00, 0x03, 0x00, 0x01, 0x0A, 0x00, 0x00), -
#else -
0x00, 0x00, 0x00, 0x00, 0x01, 0x0A, 0x00, 0x00), -
#endif -
SYS_CACHE_ENTRY(NVRAM_SYS_DSP_PATCH,
-
NVRAM_APP_RESERVED, -
KAL_FALSE, -
"NVRAM_SYS_DSP_PATCH", -
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00), -
SYS_CACHE_ENTRY(NVRAM_SYS_SIM_PLUS_SETTING,
-
NVRAM_APP_RESERVED, -
KAL_TRUE, -
"NVRAM_SYS_SIM_PLUS_SETTING", -
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00), -
SYS_CACHE_ENTRY(NVRAM_SYS_FIXED_GAIN_MECH_FOR_HELIOS2,
-
NVRAM_APP_RESERVED, -
KAL_FALSE, -
"NVRAM_SYS_FIXED_GAIN_MECH_FOR_HELIOS2", -
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00), -
SYS_CACHE_ENTRY(NVRAM_SYS_FACTORY_FLAG,
-
NVRAM_APP_RESERVED, -
KAL_TRUE, -
"NVRAM_SYS_FACTORY_FLAG", -
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00), -
SYS_CACHE_ENTRY(NVRAM_SYS_LAST_FAT_STATUS,
-
NVRAM_APP_RESERVED, -
KAL_TRUE, -
"NVRAM_SYS_LAST_FAT_STATUS", -
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00), -
SYS_CACHE_ENTRY(NVRAM_SYS_INFO,
-
NVRAM_APP_RESERVED, -
KAL_FALSE, -
"NVRAM_SYS_INFO", -
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00),
+#if defined(NEPTUNE_MMI)
-
SYS_CACHE_ENTRY(NVRAM_SYS_PHB_COMPARE_DIGIT,
-
NVRAM_APP_RESERVED, -
KAL_FALSE, -
"NVRAM_SYS_PHB_COMPARE_DIGIT", -
0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00),
+#else
-
SYS_CACHE_ENTRY(NVRAM_SYS_PHB_COMPARE_DIGIT,
-
NVRAM_APP_RESERVED, -
KAL_FALSE, -
"NVRAM_SYS_PHB_COMPARE_DIGIT", -
0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00),
+#endif
-
//Redmine132276 wuxuhua modified for default imei sv 2018-5-15 begin
-
SYS_CACHE_ENTRY(NVRAM_SYS_SVN,
-
NVRAM_APP_RESERVED, -
KAL_FALSE, -
"NVRAM_SYS_SVN", -
0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00), -
//Redmine132276 wuxuhua modified for default imei sv 2018-5-15 end
-
SYS_CACHE_ENTRY(NVRAM_SYS_USB_BOOT_MODE,
-
NVRAM_APP_RESERVED, -
KAL_FALSE, -
"NVRAM_SYS_USB_BOOT_MODE\0", -
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00), -
SYS_CACHE_ENTRY(NVRAM_SYS_USB_TETHERING_MODE,
-
NVRAM_APP_RESERVED, -
KAL_FALSE, -
"NVRAM_SYS_USB_TETHERING_MODE\0", -
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00), -
SYS_CACHE_ENTRY(NVRAM_SYS_AUTO_TEST,
-
NVRAM_APP_RESERVED, -
KAL_FALSE, -
"NVRAM_SYS_AUTO_TEST\0", -
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00), -
SYS_CACHE_ENTRY(NVRAM_SYS_MINI_LOG_IDX,