From 912bf102811593c7264330440067cdefbcfd82a6 Mon Sep 17 00:00:00 2001
From: sinikang <sinikang@samsung.com>
Date: Fri, 29 May 2020 15:22:31 +0900
Subject: [PATCH] Add WEA 3.0 CB message info and chipset info

Change-Id: I2b0bbbd92efadef53ace515c4c2a2f2e693f7866
Signed-off-by: sinikang <sinikang@samsung.com>
---
 include/type/call.h     | 13 +++++++++++++
 include/type/sms.h      |  8 +++++---
 packaging/libtcore.spec |  2 +-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/include/type/call.h b/include/type/call.h
index 2d5d4a2..dee43dd 100644
--- a/include/type/call.h
+++ b/include/type/call.h
@@ -244,15 +244,25 @@ enum telephony_call_end_cause {
 	CALL_END_CAUSE_PROTOCOL_ERROR_UNSPECIFIED,	/**< Protocol error unspecified */
 	CALL_END_CAUSE_INTERWORKING_UNSPECIFIED,	/**< Interworking unspecified */
 	CALL_END_CAUSE_REORDER,				/**< Reorder */
+
+
 	CALL_END_CAUSE_ACCEPTED_EXTERNALLY = 54,	/**< Call accepted other device */
 	CALL_END_CAUSE_REJECTED_EXTERNALLY,	/**< Call rejected other device */
+
 	CALL_END_CAUSE_ALREADY_IN_USE, /**< Call rejected - secondary device already in use */
+	CALL_END_CAUSE_PULLED_BY_PD, /**<call pulled by primary device - CMC only*/
+	CALL_END_CAUSE_PULLED_BY_SD, /**<call pulled by secondary device - CMC only*/
+	CALL_END_CAUSE_ECC_NOT_SUPPORTED, /**<ECC call not supported - CMC only */
+	CALL_END_CAUSE_PD_UNREACHABLE = 60, /**<PD is out of reach, so unable to use PD's call - CMC only*/
+
+	CALL_END_CAUSE_PD_NOT_REGISTERED, /**<PD is not registered, so unable for SD to use call - CMC only*/
 
 	CALL_END_CAUSE_END = 128,
 
 	/* Reject causes*/
 	CALL_END_CAUSE_IMSI_UNKNOWN_IN_HLR,	/**< IMSI unknown in HLR */
 	CALL_END_CAUSE_ILLEGAL_MS,			/**< Illegal MS */
+
 	CALL_END_CAUSE_IMSI_UNKNOWN_IN_VLR,	/**< IMSI unknown in VLR */
 	CALL_END_CAUSE_IMEI_NOT_ACCEPTED,	/**< IMEI not accepted */
 	CALL_END_CAUSE_ILLEGAL_ME,			/**< Illegal ME */
@@ -321,6 +331,9 @@ enum telephony_call_end_cause {
 	CALL_END_CAUSE_CNM_REJ_NO_RESOURCES,	/**< Rejected due to unavailibilty of resources */
 	CALL_END_CAUSE_CNM_MM_REL_PENDING,		/**< MM release pending */
 	CALL_END_CAUSE_CNM_INVALID_USER_DATA,	/**< Invalid user data */
+
+	/*IMS protocol fail cause*/
+	CALL_END_CAUSE_RTP_TIMEOUT,  /**< RTP timeout */
 };
 
 enum telephony_call_no_cli_cause {
diff --git a/include/type/sms.h b/include/type/sms.h
index 1869dbe..96104d1 100644
--- a/include/type/sms.h
+++ b/include/type/sms.h
@@ -68,6 +68,7 @@ __BEGIN_DECLS
 
 #define SMS_MSG_SIZE_MAX					918		/**< Maximum Message Size */
 #define SMS_CB_SIZE_MAX						1252		/** Maximum CB Message Size */
+#define SMS_CB_WAC_SIZE_MAX					1024		/** Maximum CB Message Size */
 #define SMS_ETWS_SIZE_MAX					1252	/** Maximum ETWS Message Size */
 
 #define SMS_PDU_LENGTH_GSM		88			/** Maximum GSM Message Size */
@@ -302,7 +303,7 @@ enum telephony_sms_cb_enabled_id {
  */
 struct telephony_sms_DataPackageInfo {
 	enum telephony_sms_3gpp_type format;
-	unsigned char	sca[SMS_SMSP_ADDRESS_LEN];			/* Service Centre address - an optional parameter. If this parameter is not present, then this field will be Null.If present, the valid service centre address information is filled as per 3GPP TS23.040 9.1.2.5 Address fields */
+	unsigned char	sca[SMS_SMSP_ADDRESS_LEN];		/* Service Centre address - an optional parameter. If this parameter is not present, then this field will be Null.If present, the valid service centre address information is filled as per 3GPP TS23.040 9.1.2.5 Address fields */
 	int			msgLength;							/* Size of array szData (which is actual TPDU message) */
 	unsigned char tpduData[SMS_SMDATA_SIZE_MAX + 1];	/* SMS TPDU message */
 };
@@ -310,7 +311,6 @@ struct telephony_sms_DataPackageInfo {
 /**
  * This structure defines the fields related to an metainfo like RP-OA information which can be used SMS PP-Download
  */
-
 struct telephony_sms_metainfo {
 	int rp_oa_len; /*SMS PP download - RP-OA address comes if present & it's not same with SCA*/
 	unsigned char rp_oa[SMS_SMSP_ADDRESS_LEN];
@@ -367,6 +367,8 @@ struct telephony_sms_CbMsg {
 	enum telephony_sms_CbMsgType	cbMsgType;							/**< Cell Broadcast  message type */
 	unsigned short					length;								/**<Size of array szMsgData (which is actual TPDU message) */
 	char							msgData[SMS_CB_SIZE_MAX + 1]; /**<Cell broadcast message data[Refer 3GPP TS 23.041 9.4.1]*/
+	int wacLen; /** Size of actual wac Data */
+	char wacData[SMS_CB_WAC_SIZE_MAX]; /**< Warning Area Coordiantes [Refer 3GPP TS 36.413 version 15.3.0 Release 15]  */
 };
 
 struct telephony_sms_etws_msg {
@@ -403,7 +405,7 @@ union telephony_sms_cb_msg_info_u {
 
 struct telephony_sms_CbConfig {
 	int net3gppType;  /**< Type of 3gpp, 0x01 . 3gpp. 0x02 . 3gpp2(CDMA) */
-	int cbEnabled; /**< CB service state. If cb_enabled is true then cell broadcast service will be enabled and underlying modem will enable CB Channel to receiving CB messages. Otherwise CB service will be disabled, underlying modem will deactivate the CB channel. (enabled/disabled) */
+	enum telephony_sms_cb_enabled_id cbEnabled; /**< CB service state. If cb_enabled is true then cell broadcast service will be enabled and underlying modem will enable CB Channel to receiving CB messages. Otherwise CB service will be disabled, underlying modem will deactivate the CB channel. (enabled/disabled) */
 	unsigned char msgIdMaxCount; /**< CB Channel List Max Count For Response */
 	int msgIdRangeCount; /**< Range of CB message ID count */
 	union telephony_sms_cb_msg_info_u msgIDs[SMS_GSM_SMS_CBMI_LIST_SIZE_MAX]; /**< Range of CB message ID information */
diff --git a/packaging/libtcore.spec b/packaging/libtcore.spec
index 23f8c23..625ac53 100644
--- a/packaging/libtcore.spec
+++ b/packaging/libtcore.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 3
-%define patchlevel 34
+%define patchlevel 35
 
 Name:           libtcore
 Version:        %{major}.%{minor}.%{patchlevel}
-- 
2.7.4