[Feature][T8TSK-209][Modem]Update Modem version to P5 0531

Change-Id: I2e8eae57738092652f476deea2da04d69e7f8426
diff --git a/mcu/interface/service/nvram/ims_nvram_editor.h b/mcu/interface/service/nvram/ims_nvram_editor.h
index 1c04a1e..8661f4e 100755
--- a/mcu/interface/service/nvram/ims_nvram_editor.h
+++ b/mcu/interface/service/nvram/ims_nvram_editor.h
@@ -1483,8 +1483,8 @@
 
 #include "ims_nvram_def.h"
 
-#define NVRAM_EF_IMS_PROFILE_LID_VERNO                      "575"
-#define NVRAM_EF_IMS_PROFILE_LID_HASH                       0x138E3EAB
+#define NVRAM_EF_IMS_PROFILE_LID_VERNO                      "624"
+#define NVRAM_EF_IMS_PROFILE_LID_HASH                       0x1E63EE98
 
 #define NVRAM_EF_IMS_PROVISIONING_PROFILE_LID_VERNO         "001"
 #define NVRAM_EF_IMS_PROVISIONING_PROFILE_LID_HASH          0x21675CFC
@@ -1492,11 +1492,11 @@
 #define NVRAM_EF_DRP_IMS_PROFILE_LID_VERNO                  "000"
 #define NVRAM_EF_DRP_IMS_PROFILE_LID_HASH                   0xA796E8B6
 
-#define NVRAM_EF_LTECSR_PROFILE_LID_VERNO                   "006"
-#define NVRAM_EF_LTECSR_PROFILE_LID_HASH                    0xB66448BE
+#define NVRAM_EF_LTECSR_PROFILE_LID_VERNO                   "012"
+#define NVRAM_EF_LTECSR_PROFILE_LID_HASH                    0x3B54A9CA
 
-#define NVRAM_EF_DRP_LTECSR_PROFILE_LID_VERNO               "004"
-#define NVRAM_EF_DRP_LTECSR_PROFILE_LID_HASH                0xAB475187
+#define NVRAM_EF_DRP_LTECSR_PROFILE_LID_VERNO               "009"
+#define NVRAM_EF_DRP_LTECSR_PROFILE_LID_HASH                0x33A1F57F
 
 #define NVRAM_EF_VDM_ADS_PROFILE_LID_VERNO                    "070"
 #define NVRAM_EF_VDM_ADS_PROFILE_LID_HASH                     0x60BBA5B3
@@ -1944,6 +1944,7 @@
   kal_uint8     add_pani_in_cancel;    //0
   kal_bool      disable_conf_sub;                      //0
   kal_uint8     send_cancel_tcall_timeout_no_resp; //0
+  kal_uint8     disable_num_validity_check;  //0
 
   /* SMS */
   kal_uint8     psismsc_from_user;              // 0
@@ -2154,7 +2155,7 @@
   kal_uint8     allow_emergency_dereg;                // 0 (0: disable, 1: enable, 2: deactivate emergency PDN directly)
   kal_uint8     send_sip_dereg_at_23g;                // 1 (0: Don't send only deactivate Ims PDN, 1: send dereg in 23G (LTE->23g)
   kal_uint8     manual_cell_id[64];                  // 0
-  kal_uint8     pcscf_manual_list[16];               // default pcscsf address, 192.168.0.1
+  kal_uint8     pcscf_manual_list[64];               // default pcscsf address, 192.168.0.1
   kal_uint8     default_psismsc[64];                 // sip:smsc@ims.mnc001.mcc001.3gppnetwork.org
   kal_uint8     manual_impi[64];                     // 310886000000042@ims.mnc688.mcc310.3gppnetwork.org
   kal_uint8     manual_impu[64];                     // sip:+18860000042@srnims3.srnnam.nsn-rdnet.net
@@ -2339,6 +2340,7 @@
   kal_int32  ra_rsrp_good_th;
   kal_int32  ra_sinr_poor_th;
   kal_int32  ra_sinr_good_th;
+  kal_uint16 holdcall_dl_check_para;
 } nvram_ef_ltecsr_profile_record_struct;
 #endif /* __VOLTE_SUPPORT__ */
 
@@ -2496,7 +2498,7 @@
 
     kal_uint8 disable_retry_when_ongoing_wifi_ecc_fail;
     kal_uint8 send_ind_to_disable_nr_before_normal_search;
-    kal_uint8 allow_ims_with_vonr_switch_off;            
+    kal_uint8 allow_ims_with_vonr_switch_off;
     kal_uint8 reserved5;
 
     kal_uint8 reserved4;
@@ -5112,7 +5114,12 @@
                 1: "Enable";
             };
         };
-
+        ua_config.disable_num_validity_check:"[MCF]"{
+            disable_num_validity_check:8 "This is only for Nokia to allow calling numbers ending with # in SIP INVITE."{
+                0: "Disable";
+                1: "Enable";
+            };
+        };
 
         /*****************************************************************/
         /*                         IMC/IMCB part                         */
@@ -5648,6 +5655,14 @@
         ra_rsrp_good_th:"[MCF]Unit: ms. Good RSRP value threshold for rate adaption consideration. 0 means not supported. "{};
         ra_sinr_poor_th:"[MCF]Unit: ms. Poor SINR value threshold for rate adaption consideration. 0 means not supported. "{};
         ra_sinr_good_th:"[MCF]Unit: ms. Good SINR value threshold for rate adaption consideration. 0 means not supported. "{};
+        holdcall_dl_check_para:"[MCF]"
+        {
+            holdcall_dl_check_para:16 "HOLDCALL_DL_CHECK sub switch for different timer"
+            {
+                0x00: "Disable all timer";
+                0x01: "Enable RTCP expire timer check";
+            };
+        };
      };
 
 
@@ -5795,7 +5810,7 @@
             profile_emerg.timer_length_wait_normal_service_before_any_plmn_search:"timer length for waiting normal service before triggering ANY PLMN search in PLNM search ongoing case"{};
             profile_emerg.disable_retry_when_ongoing_wifi_ecc_fail:"disable_retry_when_ongoing_wifi_ecc_fail (0/1: 0 - disable NV, 1 - enable NV)"{};
             profile_emerg.send_ind_to_disable_nr_before_normal_search:"send_ind_to_disable_nr_before_normal_search (0/1: 0 - disable NV, 1 - enable NV)"{};
-            profile_emerg.allow_ims_with_vonr_switch_off:"To allow request IMS emergency MO even if vonr switch is off"{};					             
+            profile_emerg.allow_ims_with_vonr_switch_off:"To allow request IMS emergency MO even if vonr switch is off"{};
             profile_emerg.reserved5:"reserved5"{};
             profile_emerg.reserved4:"reserved4"{};
             profile_emerg.reserved3:"reserved3"{};
diff --git a/mcu/interface/service/nvram/iwlan_nvram_config.h b/mcu/interface/service/nvram/iwlan_nvram_config.h
index 8d9a171..75a6b9e 100755
--- a/mcu/interface/service/nvram/iwlan_nvram_config.h
+++ b/mcu/interface/service/nvram/iwlan_nvram_config.h
@@ -489,7 +489,7 @@
                                   0xF: "refer to WFC UI";
                               };
                           };)
-    IWLAN_CFG_L1_TYPE_DCL(comm_ans_cfg, pref_cfg, kal_uint32, WANS_ECC_PREF_SETTING, wans_ecc_pref_setting, UNDEF_CONFIG_8, UNDEF_CONFIG_8,
+    IWLAN_CFG_L1_TYPE_DCL(comm_ans_cfg, pref_cfg, kal_uint32, WANS_ECC_PREF_SETTING, wans_ecc_pref_setting, 0x0F, UNDEF_CONFIG_8,
                           "[MCF]ecc APN WIFI offload setting." {
                               pref:4 "" {
                                   0:"CELL ONLY";
@@ -737,8 +737,15 @@
                       "[MCF]When enable, UE will de-register IMS on WLAN, if WLAN RSSI value is below HO Low threshold";)
 IWLAN_CFG_L0_TYPE_DCL(ipol_ans_cfg, kal_uint8, IPOL_IMS_DEREG_DEAD_ZONE_ENABLE, ipol_ims_dereg_dead_zone_enable, KAL_FALSE, UNDEF_CONFIG_8,
                       "[MCF]When enable, UE will de-register IMS on WLAN, if WLAN RSSI value is below Low threshold and threre is no cellular coverage";)
-IWLAN_CFG_L0_TYPE_DCL(ipol_ans_cfg, kal_uint8, IPOL_IMS_NO_VOICE_SUP_SMS_ENABLE, ipol_ims_no_voice_sup_sms_enable, KAL_FALSE, UNDEF_CONFIG_8,
-                      "[MCF]When enable, IMS PDN will still be active for SMS even if NW (Wi-Fi or LTE) is voice not support";)
+IWLAN_CFG_L0_TYPE_DCL(ipol_ans_cfg, kal_uint8, IPOL_IMS_NO_VOICE_SUP_SMS_ENABLE, ipol_ims_no_voice_sup_sms_enable, 3, UNDEF_CONFIG_8,
+                      "[MCF]When enable, IMS PDN will still be activated for SMS even if the network has no VoPS ability" {
+                          ipol_ims_sms_only_by_centric_type_enable:8 "" {
+                              0: "No SMS-only for all centric types";
+                              1: "SMS-only for all centric types";
+                              2: "SMS-only for voice-centric devices";
+                              3: "SMS-only for data-centric devices";
+                          };
+                      };)
 IWLAN_CFG_L0_TYPE_DCL(ipol_ans_cfg, kal_uint8, IPOL_IMS_VOICE_CAP_PREF_ENABLE, ipol_ims_voice_cap_pref_enable, KAL_FALSE, UNDEF_CONFIG_8,
                       "[MCF]When enable, IMS PDN will select RAT which has voice capability rather than RAT no voice capability(e.g. VOPS OFF)";)
 IWLAN_CFG_L0_TYPE_DCL(ipol_ans_cfg, kal_uint8, IPOL_IMS_INCALL_VOICE_CAP_PREF, ipol_ims_incall_voice_cap_pref, KAL_FALSE, UNDEF_CONFIG_8,
diff --git a/mcu/interface/service/nvram/iwlan_nvram_def.h b/mcu/interface/service/nvram/iwlan_nvram_def.h
index ac544ee..7fab739 100755
--- a/mcu/interface/service/nvram/iwlan_nvram_def.h
+++ b/mcu/interface/service/nvram/iwlan_nvram_def.h
@@ -85,7 +85,7 @@
 } nvram_lid_iwlan_enum;
 
 // VERNO
-#define NVRAM_EF_IWLAN_PROFILE_LID_VERNO                          "083"
+#define NVRAM_EF_IWLAN_PROFILE_LID_VERNO                          "090"
 #define NVRAM_EF_WO_PROFILE_LID_VERNO                             "000"
 #define NVRAM_EF_IWLAN_PROVISION_PROFILE_LID_VERNO                "000"
 #define NVRAM_EF_DRP_IWLAN_PROFILE_LID_VERNO                      "078"
@@ -94,7 +94,7 @@
 #define NVRAM_EF_IWLAN_N3CF_DRP_LID_VERNO                         "007"
 
 // Hash Key
-#define NVRAM_EF_IWLAN_PROFILE_LID_HASH            0x4E8B7B55
+#define NVRAM_EF_IWLAN_PROFILE_LID_HASH            0xE303BFD2
 #define NVRAM_EF_WO_PROFILE_LID_HASH               0xACCFAF58
 #define NVRAM_EF_IWLAN_PROVISION_PROFILE_LID_HASH  0x830F271E
 #define NVRAM_EF_DRP_IWLAN_PROFILE_LID_HASH        0x9CCB96C0
diff --git a/mcu/interface/service/nvram/xcap_nvram_def.h b/mcu/interface/service/nvram/xcap_nvram_def.h
index f660f3c..78f883f 100755
--- a/mcu/interface/service/nvram/xcap_nvram_def.h
+++ b/mcu/interface/service/nvram/xcap_nvram_def.h
@@ -55,8 +55,8 @@
 }nvram_lid_xcap_enum;
 
 // VERNO
-#define NVRAM_EF_XCAP_PROFILE_LID_VERNO                          "087"
-#define NVRAM_EF_XCAP_PROFILE_LID_HASH                           0xC6C32320
+#define NVRAM_EF_XCAP_PROFILE_LID_VERNO                          "089"
+#define NVRAM_EF_XCAP_PROFILE_LID_HASH                           0x6D8E801E
 
 // Data Structure of Each LID
 typedef struct {
@@ -123,6 +123,8 @@
 	kal_uint8   remove_node_namespace;
     kal_uint8   support_put_cf_root_rules;
     kal_uint8   support_if_match_header;
+    kal_uint8   support_omit_cp_prefix_and_namespace;
+    kal_uint8   support_put_cb_root;
 } xcap_info_t;
 
 typedef struct {
diff --git a/mcu/interface/service/nvram/xcap_nvram_editor.h b/mcu/interface/service/nvram/xcap_nvram_editor.h
index fe9c688..d35bcf4 100755
--- a/mcu/interface/service/nvram/xcap_nvram_editor.h
+++ b/mcu/interface/service/nvram/xcap_nvram_editor.h
@@ -398,6 +398,22 @@
                     2: "If-Match handled on simservs level";
                 };
             };
+			xcap_info.support_omit_cp_prefix_and_namespace: "Support omitting cp-prefix and namespace"
+			{
+				support_omit_cp_prefix_and_namespace:8 ""
+				{
+					0: "Disabled";
+					1: "Enabled";
+				};
+			};
+            xcap_info.support_put_cb_root: "Support PUT the Whole CB Node"
+            {
+                support_put_cb_root:8 ""
+                {
+                    0: "Disabled";
+                    1: "Enabled";
+                };
+            };
         gba_info: "[MCF]GBA Configuration" {};
             gba_info.gba_url: "[STRING]GBA Server URL";
             gba_info.gba_protocol: "[STRING]GBA Server Protocol (http or https)";
diff --git a/mcu/interface/service/sbp/sbp_data.def b/mcu/interface/service/sbp/sbp_data.def
index a5f0ec8..d786cd9 100755
--- a/mcu/interface/service/sbp/sbp_data.def
+++ b/mcu/interface/service/sbp/sbp_data.def
@@ -5548,6 +5548,73 @@
 #endif
     SBP_DATA_DEF_END
 
+/****** SBP Document BEGIN ************************************************************************
+<SBP title="SBP_NR_IMS_EMC_ENH_CELL_BAR_TIME - Defines the NR cell excludsion time for cell IMS emergency support check">
+    <DESCRIPTION>
+        <PARAG>
+            This SBP defines the NR cell excludsion time for cell IMS emergency support check.
+            The unit of value is 10 seconds. The enhnacement will be considered disabled if the value is set to zero.
+        </PARAG>
+    </DESCRIPTION>
+    <CATEGORY>NR AS</CATEGORY>
+    <CONFIG>
+        <VALUE value="0">The enhnacement is disabled and NR cells would NOT be excluded.</VALUE>
+        <VALUE value="4">NR cells would be excluded for 40 seconds.</VALUE>
+        <VALUE value="N">NR cells would be excluded for 10*N seconds.</VALUE>
+        <VALUE value="60">NR cells would be excluded for 600 seconds.</VALUE>
+    </CONFIG>
+    <DEFAULT>255</DEFAULT>
+    <OP>N/A</OP>
+    <DEPENDENCY>N/A</DEPENDENCY>
+    <NOTE>
+        N/A
+        IS_VIOLATE_STANDARD=Y
+        VIOLATED_STANDARD=3GPP
+    </NOTE>
+    <AUTHOR>mtk10653</AUTHOR>
+</SBP>
+******* SBP Document END **************************************************************************/
+    SBP_DATA_DEF(163, SBP_NR_IMS_EMC_ENH_CELL_BAR_TIME, SBP_ATTR_NONE, "NR Cell excludsion time for cell IMS emergency support check")
+    SBP_DATA_DEFAULT_VAL(255)
+    SBP_DATA_DEF_END
+
+/****** SBP Document BEGIN ************************************************************************
+<SBP title="SBP_AT_URC_REPORT_MODE - Control the AT URC report mode">
+    <DESCRIPTION>
+        <PARAG>
+            This SBP controls the AT URC report mode.
+            0: Block all URCs until MD receives any AT commands.(still need to satisfy other report condition)
+            1: As long as the report condition is met, the URC will be reported.
+            2: Block all the URCs except +EIND:128 until MD receives any AT commands.(still need to satisfy other report condition)
+            Default is 1.
+        </PARAG>
+    </DESCRIPTION>
+    <CATEGORY>L5</CATEGORY>
+    <CONFIG>
+        <VALUE value="0x00">0</VALUE> 
+        <VALUE value="0x01">1</VALUE> 
+        <VALUE value="0x02">2</VALUE> 
+    </CONFIG>
+    <DEFAULT>0x01</DEFAULT>
+    <OP>N/A</OP>
+    <DEPENDENCY>N/A</DEPENDENCY>
+    <NOTE>
+    IS_VIOLATE_STANDARD=N
+    </NOTE>
+    <AUTHOR>mtk14954</AUTHOR>
+</SBP>
+******* SBP Document END **************************************************************************/
+    SBP_DATA_DEF(164, SBP_AT_URC_REPORT_MODE, SBP_ATTR_NONE, "Control the AT URC report mode")
+    SBP_DATA_DEF_VAL(0x00, "Block all URCs until MD receives any AT commands")
+    SBP_DATA_DEF_VAL(0x01, "As long as the report condition is met, the URC will be reported")
+    SBP_DATA_DEF_VAL(0x02, "Block all the URCs except +EIND:128 until MD receives any AT commands.")    
+#if defined(__MTK_TARGET__) && defined(MT6297) && defined(__MODEM_CARD__)
+    SBP_DATA_DEFAULT_VAL(0x00)
+#else
+    SBP_DATA_DEFAULT_VAL(0x01)
+#endif /* defined(__MTK_TARGET__) && defined(MT6297) && defined(__MODEM_CARD__) */
+    SBP_DATA_DEF_END
+    
 #undef SBP_DATA_DEF
 #undef SBP_DATA_DEFAULT_VAL
 #undef SBP_DATA_DEF_VAL
diff --git a/mcu/interface/service/sbp/sbp_public_utility.h b/mcu/interface/service/sbp/sbp_public_utility.h
index bbc0b7b..24883a0 100755
--- a/mcu/interface/service/sbp/sbp_public_utility.h
+++ b/mcu/interface/service/sbp/sbp_public_utility.h
@@ -397,6 +397,7 @@
     SBP_ID_TELKOM_KENYA = 190,
     SBP_ID_GRAMEENPHONE = 191,
     SBP_ID_ROBI = 192,
+	SBP_ID_BANGLALINK = 193,
     SBP_ID_O2       = 195,
     SBP_ID_FIRSTNET = 196,
     SBP_ID_SBERBANK = 198,
@@ -440,6 +441,7 @@
     SBP_ID_EASTLINK = 239,
     SBP_ID_XPLORE_MOBILE = 240,
     SBP_ID_CLARO_PUERTO_RICO = 241,
+    SBP_ID_INWI = 242,
     SBP_ID_GLOBE = 243,
 	SBP_ID_METFONE = 244,
     SBP_ID_VIETNAMOBILE = 245,
@@ -499,6 +501,7 @@
 	SBP_ID_NRJ = 299,
     SBP_ID_TANGO = 301,
     SBP_ID_OOREDOO_OMAN = 302,
+    SBP_ID_ILIAD = 303,
    	SBP_ID_CTMO = 304, 
     SBP_ID_CUHK = 306,
 	SBP_ID_CELLCOM = 307,
@@ -507,19 +510,29 @@
     SBP_ID_AXTEL = 313,
     SBP_ID_TELE_GREENLAND = 314,
 	SBP_ID_TELE2_KAZAK = 315,
-	SBP_ID_VIANOVA = 318,
-	SBP_ID_MONACO = 319,
+    SBP_ID_NTWLS = 316,
+    SBP_ID_COMMNET_WIRELESS = 317,
+    SBP_ID_VIANOVA = 318,
+    SBP_ID_MONACO = 319,
     SBP_ID_CORIOLIS = 320,
     SBP_ID_ORA_VITI = 321,
     SBP_ID_UPC = 322,
+    SBP_ID_LYCAMOBILE = 323,
 	SBP_ID_MOLDCELL = 324,
+    SBP_ID_JAMBOTEL = 325,
     SBP_ID_9MOBILE = 326,
 	SBP_ID_SASKTEL = 327,
 	SBP_ID_VOO = 328,
+    SBP_ID_PLINTRON = 329,
+    SBP_ID_SOUTHERN_LINC = 332,
+    SBP_ID_CELLCOM_USA = 333,
 	SBP_ID_TASHICELL = 334,
 	SBP_ID_TOT = 335,
+	SBP_ID_MOBIFONE = 336,
+    SBP_ID_ANTEL = 337,
 	SBP_ID_SPUSU = 338,
 	SBP_ID_UNITEL = 339,
+	SBP_ID_VODAFONE_PNG = 340,
 	SBP_ID_UCELL = 341,
 	SBP_ID_4KA = 344,
     SBP_ID_PRIMETEL = 345,
@@ -528,6 +541,7 @@
     SBP_ID_GIBTELECOM = 350,
     SBP_ID_MOD_EGYPT = 352,
 	SBP_ID_WE4G = 353,
+    SBP_ID_POSTEMOBILE = 354,
     SBP_ID_ALFA = 355,
 	SBP_ID_RAIN = 356,
     SBP_ID_CNT = 357,
@@ -535,8 +549,49 @@
     SBP_ID_ALIV = 359,
     SBP_ID_CTEXCEL = 360,
     SBP_ID_BMOBILE = 362,
+    SBP_ID_CSPIRE = 363,
+    SBP_ID_UNITED_WIRELESS = 364,
+    SBP_ID_IVCEL = 365,
+    SBP_ID_APPALACHIAN = 366,
+    SBP_ID_JAMES_VALLEY = 367,
+    SBP_ID_PIONEER = 368,
+    SBP_ID_PINE_BELT = 369,
+    SBP_ID_STRATA = 370,
+    SBP_ID_SILVER_STAR = 371,
+    SBP_ID_ONECOMM = 372,
+    SBP_ID_CORDOVA = 373,
+    SBP_ID_COPPER_VALLEY = 374,
+    SBP_ID_BLUE_WIRELESS = 375,
+    SBP_ID_INLAND = 376,
+	SBP_ID_OOREDOO_TUNISIA = 377,
+    SBP_ID_GEOVERSE = 378,
+    SBP_ID_PTCI = 379,
+	SBP_ID_ASIA_CELL = 381,
+	SBP_ID_ZEOP = 382,
+    SBP_ID_MAGTI = 383,
+	SBP_ID_BAKCEL = 384,
+    SBP_ID_BHMOBILE = 385,
+    SBP_ID_ENETWORKS = 386,
+	SBP_ID_WCW = 387,    
 	SBP_ID_CBN = 388,
+    SBP_ID_UNITEL_LAOS = 389,
+    SBP_ID_MOBILE_NATION = 392,
+    SBP_ID_THUMB = 396,
 	SBP_ID_LICT = 398,
+    SBP_ID_IMAGINE = 403,
+    SBP_ID_PROGRESIF = 404,
+    SBP_ID_UNN = 405,
+    SBP_ID_DST = 406,
+	SBP_ID_AMERICANET = 407,
+    SBP_ID_BITEL = 408,
+	SBP_ID_MTEL = 410,
+    SBP_ID_EVOLVE_BROADBAND = 411,
+    SBP_ID_STANDING_ROCK_TELECOM = 412,
+    SBP_ID_BRISANET = 416,
+    SBP_ID_ATLAS_TELECOM = 417,
+    SBP_ID_EMTEL = 418,
+    SBP_ID_REDBULL = 420,
+	SBP_ID_NLC = 426,
 
     /* Lab testing SBP ID */
     SBP_ID_ERICSSON = 1001,