[Feature][Modem]Merge MTK release P3 P4 patch
Change-Id: I1ef3d69e36378ee73a422ecb2721488d6b416427
diff --git a/mcu/interface/protocol/inet_protocols/http_tls/http/include/http_apis.h b/mcu/interface/protocol/inet_protocols/http_tls/http/include/http_apis.h
index 49f6f23..2e115d6 100755
--- a/mcu/interface/protocol/inet_protocols/http_tls/http/include/http_apis.h
+++ b/mcu/interface/protocol/inet_protocols/http_tls/http/include/http_apis.h
@@ -53,6 +53,11 @@
* ==========================================================================
* $Log$
*
+ * 08 11 2022 panu.peisa
+ * [MOLY00844196] [CR Review Excluded][SV Focus][Internal][MT6895][Pichon][S0][Pre-DCP][IMS][France][Orange][LiveNW][TCID: 59x.1.4.1.1.b] XCAP failures in flight mode + WFC
+ *
+ * .
+ *
* 09 18 2020 jing.cui
* [MOLY00565233] Telus requirement TELUS-v11.0_VOLTE-431 and TELUS-v11.0_VOLTE-432 UE SHALL NOT include the port number in the Host header of the HTTP request
* hide port: interface part.
@@ -101,6 +106,7 @@
HTTP_CONFIG_IDX_BOOL_AUTH_REQ_HANDLE_BY_APP,
HTTP_CONFIG_IDX_BOOL_ENABLE_QUICK_ATTEMPT,
HTTP_CONFIG_IDX_BOOL_HIDE_PORT_NUMBER,
+ HTTP_CONFIG_IDX_BOOL_DNS_FORCE_QUERY,
HTTP_CONFIG_IDX_BOOL_END,
HTTP_CONFIG_IDX_INT_START,
@@ -132,6 +138,7 @@
kal_uint32 dns_ttl_value; // DNS query's response TTL value
kal_uint32 max_mtu_size; // Max MTU size of TCP/UDP
kal_bool hide_port_number; //xcap request hide port number. KAL_TRUE:hide, KAL_FALSE:display
+ kal_bool dns_force_query; // Force DNS query in AP mode for new PDN connection. When this flag is set, HTTP module pass it to DNS module and it should trigger new DNS query.
} app_http_config_struct;
void app_http_get_default_config(app_http_config_struct *config);
diff --git a/mcu/interface/protocol/sase/sase_if.h b/mcu/interface/protocol/sase/sase_if.h
index 75fc7d3..cdec60a 100755
--- a/mcu/interface/protocol/sase/sase_if.h
+++ b/mcu/interface/protocol/sase/sase_if.h
@@ -59,12 +59,12 @@
* sa silence in handover
*
* 02 14 2022 shih-yu.chen
- * [MOLY00663097] ?Clone from ALPS05378235?请??å©è¯ä¼°å®ç°SA??è?ä?å?æ¥?£
+ * [MOLY00663097] ?�Clone from ALPS05378235?�请??�助评估实现SA??��?��?��?�接?��
*
* sa_silence merge to MD700.
*
* 03 23 2021 shih-yu.chen
- * [MOLY00576678] 请å?å©è¯ä¼°å®ç°SA??è?ä?å?æ¥?£
+ * [MOLY00576678] 请�?�助评估实现SA??��?��?��?�接?��
*
* add sa_silence interface.
*
@@ -186,7 +186,22 @@
typedef struct {
LOCAL_PARA_HDR
sase_nrrc_scg_status_enum scg_status;
-}sase_nrrc_scg_info_ind_struct;
+} sase_nrrc_scg_info_ind_struct;
+
+typedef struct {
+ LOCAL_PARA_HDR
+ ims_access_rat_enum source_rat;
+ ims_access_rat_enum target_rat;
+ ims_reg_type_enum reg_type;
+} sase_atp_ims_handover_start_ind_struct;
+
+typedef struct {
+ LOCAL_PARA_HDR
+ ims_access_rat_enum source_rat;
+ ims_access_rat_enum target_rat;
+ kal_bool result;
+ ims_reg_type_enum reg_type;
+} sase_atp_ims_handover_end_ind_struct;
typedef enum {
SASE_ERROR_NONE = 0,
diff --git a/mcu/interface/protocol/xcap/xcap_if.h b/mcu/interface/protocol/xcap/xcap_if.h
index 9fb4cb2..1b76b2d 100755
--- a/mcu/interface/protocol/xcap/xcap_if.h
+++ b/mcu/interface/protocol/xcap/xcap_if.h
@@ -53,6 +53,11 @@
* ==========================================================================
* $Log$
*
+ * 08 11 2022 panu.peisa
+ * [MOLY00844196] [CR Review Excluded][SV Focus][Internal][MT6895][Pichon][S0][Pre-DCP][IMS][France][Orange][LiveNW][TCID: 59x.1.4.1.1.b] XCAP failures in flight mode + WFC
+ *
+ * XCAP IF.
+ *
* 04 22 2022 jani.manninen
* [MOLY00759459] [IMS][IMS-SS] TIM (VoLTE_IMS Smartphone and Tablet v2.2) - XCAP If-Match header support
*
@@ -575,6 +580,12 @@
typedef struct
{
+ XCAP_LOCAL_PARA_STRUCT local_param;
+ kal_bool is_wfc_only_pdn;
+} HTTP_IND_ILM_STRUCT;
+
+typedef struct
+{
#if defined(__HTTP_TLS_SUPPORT__)
XCAP_LOCAL_PARA_STRUCT local_param;
#else
@@ -682,7 +693,7 @@
typedef HTTP_RSP_ILM_STRUCT xcap_http_delegate_send_http_rsp_struct; // MSG_ID_XCAP_HTTP_DELEGATE_SEND_HTTP_RSP
typedef HTTP_REQ_ILM_STRUCT xcap_http_connection_send_http_req_struct; // MSG_ID_XCAP_HTTP_CONNECTION_SEND_HTTP_REQ
typedef HTTP_RSP_ILM_STRUCT xcap_http_connection_send_http_rsp_struct; // MSG_ID_XCAP_HTTP_CONNECTION_SEND_HTTP_RSP
-typedef XCAP_LOCAL_PARA_STRUCT xcap_http_connection_pdn_on_ind_struct; // MSG_ID_XCAP_HTTP_CONNECTION_PDN_ON_IND
+typedef HTTP_IND_ILM_STRUCT xcap_http_connection_pdn_on_ind_struct; // MSG_ID_XCAP_HTTP_CONNECTION_PDN_ON_IND
typedef XCAP_LOCAL_PARA_STRUCT xcap_http_connection_pdn_off_ind_struct; // MSG_ID_XCAP_HTTP_CONNECTION_PDN_OFF_IND
typedef XCAP_LOCAL_PARA_STRUCT xcap_http_connection_force_abort_ind_struct; //MSG_ID_XCAP_HTTP_CONNECTION_FORCE_ABORT_IND
typedef XCAP_LOCAL_PARA_STRUCT xcap_http_connection_force_abort_cnf_struct; //MSG_ID_XCAP_HTTP_CONNECTION_FORCE_ABORT_CNF