[Feature][Modem]Update MTK MODEM V1.6 baseline version: MOLY.NR15.R3.MD700.IVT.MP1MR3.MP.V1.6

MTK modem version: MT2735_IVT_MOLY.NR15.R3.MD700.IVT.MP1MR3.MP.V1.6.tar.gz
RF  modem version: NA

Change-Id: I45a4c2752fa9d1a618beacd5d40737fb39ab64fb
diff --git a/mcu/interface/sap/md/iwlan_msgid.h b/mcu/interface/sap/md/iwlan_msgid.h
new file mode 100644
index 0000000..0c0b713
--- /dev/null
+++ b/mcu/interface/sap/md/iwlan_msgid.h
@@ -0,0 +1,435 @@
+/*****************************************************************************
+*  Copyright Statement:
+*  --------------------
+*  This software is protected by Copyright and the information contained
+*  herein is confidential. The software may not be copied and the information
+*  contained herein may not be used or disclosed except with the written
+*  permission of MediaTek Inc. (C) 2013
+*
+*  BY OPENING THIS FILE, BUYER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
+*  THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
+*  RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO BUYER ON
+*  AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
+*  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
+*  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
+*  NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
+*  SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
+*  SUPPLIED WITH THE MEDIATEK SOFTWARE, AND BUYER AGREES TO LOOK ONLY TO SUCH
+*  THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. MEDIATEK SHALL ALSO
+*  NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE RELEASES MADE TO BUYER'S
+*  SPECIFICATION OR TO CONFORM TO A PARTICULAR STANDARD OR OPEN FORUM.
+*
+*  BUYER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND CUMULATIVE
+*  LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
+*  AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
+*  OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY BUYER TO
+*  MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
+*
+*  THE TRANSACTION CONTEMPLATED HEREUNDER SHALL BE CONSTRUED IN ACCORDANCE
+*  WITH THE LAWS OF THE STATE OF CALIFORNIA, USA, EXCLUDING ITS CONFLICT OF
+*  LAWS PRINCIPLES.  ANY DISPUTES, CONTROVERSIES OR CLAIMS ARISING THEREOF AND
+*  RELATED THERETO SHALL BE SETTLED BY ARBITRATION IN SAN FRANCISCO, CA, UNDER
+*  THE RULES OF THE INTERNATIONAL CHAMBER OF COMMERCE (ICC).
+*
+*****************************************************************************/
+
+/*****************************************************************************
+ *
+ * Filename:
+ * ---------
+ *   iwlan_msgid.h
+ *
+ * Project:
+ * --------
+ *	 UMOLYA 
+ *
+ * Description:
+ * ------------
+ * This module defines the messgae IDs for IWLAN.
+ *
+ * Author:
+ * -------
+ * -------
+ *
+ ****************************************************************************/
+#ifndef _IWLAN_MSG_ID_H
+#define _IWLAN_MSG_ID_H
+
+#include "module_msg_range.h"
+
+MODULE_MSG_BEGIN( MSG_ID_IWLAN_CODE_BEGIN )
+
+/****************************************************************************
+*                 <1> Desitnation: IWLAN 
+****************************************************************************/
+// <1.1> From ERRC
+    // LWI
+    MSG_ID_IWLAN_ERRC_LWI_STEER_STATUS_IND = MSG_ID_IWLAN_CODE_BEGIN,
+    MSG_ID_IWLAN_ERRC_WLAN_PARAMETER_IND,
+
+    // LWA
+    MSG_ID_IWLAN_ERRC_WLAN_LWA_CONNECT_IND,
+    MSG_ID_IWLAN_ERRC_WLAN_LWA_DISCONNECT_IND,
+    MSG_ID_IWLAN_ERRC_WLAN_MEASUREMENT_IND,
+    MSG_ID_IWLAN_ERRC_WLAN_MEASUREMENT_STOP_IND,
+
+// <1.2> From WIPC
+    // LWI
+    MSG_ID_CS_IWLAN_ASSOCIATE_REQ,
+    MSG_ID_IWLAN_WLFW_LWI_CONF_CNF,
+    MSG_ID_IWLAN_WLFW_LWI_START_STOP_CNF,
+    MSG_ID_IWLAN_WLFW_LWI_MEAS_IND,
+    MSG_ID_IWLAN_WLFW_MEAS_CAPA_FAIL_IND,
+    // LWA
+    MSG_ID_WIPC_IWLAN_WLAN_MEASUREMENT_REQ,
+    MSG_ID_WIPC_IWLAN_WLAN_LWA_CONNECT_RSP,
+    MSG_ID_WIPC_IWLAN_WLAN_LWA_DISCONNECT_RSP,
+    MSG_ID_WIPC_IWLAN_WLAN_LWA_LOST_REQ,
+
+// <1.3> To WIPC
+    // LWA
+    MSG_ID_WIPC_IWLAN_WLAN_LWA_CONNECT_IND,
+    MSG_ID_WIPC_IWLAN_WLAN_LWA_DISCONNECT_IND,
+    MSG_ID_WIPC_IWLAN_WLAN_MEASUREMENT_IND,
+    MSG_ID_WIPC_IWLAN_WLAN_MEASUREMENT_STOP_IND,
+
+// <1.3> From ATP
+    MSG_ID_ATP_IWLAN_WLAN_CAPABILITY_REQ,
+    MSG_ID_ATP_IWLAN_IMSCFG_REQ,
+    MSG_ID_ATP_IWLAN_L4_IMSCFG_RSP,
+    MSG_ID_ATP_IWLAN_L4_EXT_CELLTECH_URCRPT_REQ,
+    MSG_ID_ATP_IWLAN_L4_VOPS_URCRPT_REQ,
+    MSG_ID_ATP_IWLAN_L4_ECEVDP_URCRPT_REQ,
+    MSG_ID_ATP_IWLAN_ESRVSTATE_REQ,
+    MSG_ID_ATP_IWLAN_ECNCFG_REQ,
+    MSG_ID_ATP_IWLAN_EWIFIEN_REQ,
+    MSG_ID_ATP_IWLAN_EWFCPREF_REQ,
+    MSG_ID_ATP_IWLAN_ELOCAEN_REQ,    
+    MSG_ID_ATP_IWLAN_EIWLCFGSET_REQ,
+    MSG_ID_ATP_IWLAN_EIWLCFGGET_REQ,       
+    MSG_ID_ATP_IWLAN_EIMSGEO_REQ,
+    MSG_ID_ATP_IWLAN_EIWLPING_REQ,
+    MSG_ID_ATP_IWLAN_EPVSSET_REQ,
+    MSG_ID_ATP_IWLAN_EPVSGET_REQ,
+    MSG_ID_ATP_IWLAN_EIRAT_STATUS_REQ,
+    MSG_ID_ATP_IWLAN_EIMSRCSCONN_REQ,
+    MSG_ID_ATP_IWLAN_EIWLPLEN_REQ,
+    MSG_ID_ATP_IWLAN_CEUS_IND,
+    MSG_ID_ATP_IWLAN_EFUN_REQ,
+    MSG_ID_ATP_IWLAN_EAPMODE_REQ,
+    MSG_ID_ATP_IWLAN_SIP_CALL_PROGRESS_REQ,    
+    MSG_ID_ATP_IWLAN_DUMP_RUNTIME_PARA_REQ, // AT+ECFGDRP 
+// <1.4> From D2RM
+
+// <1.5> From IMC
+    MSG_ID_IMC_IWLAN_IMS_CALL_STATUS_REQ,
+    MSG_ID_IMC_IWLAN_CALL_MEDIA_INFO_REQ,
+    MSG_ID_IMC_IWLAN_MO_CONFIG_IND,
+    MSG_ID_IMC_IWLAN_WIFI_SERVICE_FAIL_REQ,
+    MSG_ID_IMC_IWLAN_REG_RAN_PRIO_UPDATE_REQ,
+    MSG_ID_IMC_IWLAN_IMS_ECC_HO_REQ,
+
+// <1.6> From SDM
+	MSG_ID_IWLAN_SDM_ECSCM_INFO_REQ,
+
+/****************************************************************************
+*                 <2> Desitnation: WMOB
+****************************************************************************/
+    MSG_ID_WMOB_WMOB_LWI_STAT_REQ,
+    MSG_ID_EVHD_WMOB_LWX_LWI_STEER_IND,
+    MSG_ID_EVHD_WMOB_LWX_LWI_PARA_IND,
+    MSG_ID_EVHD_WMOB_LWX_LWI_STEER_STATUS_REQ,
+    MSG_ID_EVHD_WMOB_LWX_WLAN_CAPABILITY_REQ,
+    MSG_ID_EVHD_WMOB_LWX_ERRC_WLAN_LWA_CONNECT_IND,
+    MSG_ID_EVHD_WMOB_LWX_ERRC_WLAN_LWA_CONNECT_RSP,
+    MSG_ID_EVHD_WMOB_LWX_ERRC_WLAN_LWA_DISCONNECT_IND,
+    MSG_ID_EVHD_WMOB_LWX_ERRC_WLAN_LWA_DISCONNECT_RSP,
+    MSG_ID_EVHD_WMOB_LWX_ERRC_WLAN_MEASUREMENT_IND,
+    MSG_ID_EVHD_WMOB_LWX_ERRC_WLAN_MEASUREMENT_STOP_IND,
+    MSG_ID_EVHD_WMOB_LWX_ERRC_WLAN_MEASUREMENT_REQ,
+    MSG_ID_EVHD_WMOB_LWX_ERRC_WLAN_LWA_LOST_REQ,
+
+    MSG_ID_EVHD_WMOB_LWX_CS_ASSOCIATE_REQ,
+    MSG_ID_EVHD_WMOB_LWX_WLFW_LWI_CONF_REQ,
+    MSG_ID_EVHD_WMOB_LWX_WLFW_LWI_CONF_CNF,
+    MSG_ID_EVHD_WMOB_LWX_WLFW_LWI_START_STOP_REQ,
+    MSG_ID_EVHD_WMOB_LWX_WLFW_LWI_START_STOP_CNF,
+    MSG_ID_EVHD_WMOB_LWX_WLFW_LWI_MEAS_IND,
+    MSG_ID_EVHD_WMOB_LWX_WLFW_MEAS_CAPA_FAIL_IND,
+    MSG_ID_EVHD_WMOB_LWX_LWAD_WLAN_MEASUREMENT_REQ,
+    MSG_ID_EVHD_WMOB_LWX_LWAD_WLAN_LWA_CONNECT_IND,
+    MSG_ID_EVHD_WMOB_LWX_LWAD_WLAN_LWA_CONNECT_RSP,
+    MSG_ID_EVHD_WMOB_LWX_LWAD_WLAN_LWA_DISCONNECT_IND,
+    MSG_ID_EVHD_WMOB_LWX_LWAD_WLAN_LWA_DISCONNECT_RSP,
+    MSG_ID_EVHD_WMOB_LWX_LWAD_WLAN_LWA_LOST_REQ,
+    MSG_ID_EVHD_WMOB_LWX_LWAD_WLAN_MEASUREMENT_IND,
+    MSG_ID_EVHD_WMOB_LWX_LWAD_WLAN_MEASUREMENT_STOP_IND,
+
+    MSG_ID_EVHD_WMOB_LWX_CS_WLAN_CAPABILITY_REQ,
+
+    MSG_ID_WMOB_LWX_LWX_STAT_REQ,
+    MSG_ID_WMOB_LWX_LWI_STEER_REQ,
+    MSG_ID_EVHD_WMOB_TMR_TO_IND,
+    MSG_ID_EVHD_WMOB_SIM_READY_IND,
+    MSG_ID_EVHD_WMOB_SIM_ERROR_IND,
+
+    /*Desitnation: WMOB WANS*/
+    MSG_ID_EVHD_WMOB_WANS_TMR_TO_IND,
+    MSG_ID_EVHD_WMOB_WANS_DATASRVSTATE_INFO_REQ, //FWK
+    MSG_ID_EVHD_WMOB_WANS_SIGLEVEL_INFO_REQ, //+ECSQ
+    MSG_ID_EVHD_WMOB_WANS_VOPSRPT_INFO_REQ, //+CIREPI
+    MSG_ID_EVHD_WMOB_WANS_PCSCFPING_INFO_REQ, //LTECSR
+    MSG_ID_EVHD_WMOB_WANS_WIFISRVSTATE_INFO_REQ, //WfcD
+    MSG_ID_EVHD_WMOB_WANS_WIFISIGLVL_INFO_REQ, //WfcD
+    MSG_ID_EVHD_WMOB_WANS_IMSCFG_REQ, //ATP
+    MSG_ID_EVHD_WMOB_WANS_L4_IMSCFG_RSP, // ATP
+    MSG_ID_EVHD_WMOB_WANS_WFCPREF_CFG_REQ, //ATP: for wfc_pref & wfc_wpref_en
+    MSG_ID_EVHD_WMOB_WANS_WIFIUI_CFG_REQ,
+    MSG_ID_EVHD_WMOB_WANS_ECSCM_INFO_REQ, //+ECSCM
+    MSG_ID_EVHD_WMOB_WANS_L4_VOPS_URCRPT_REQ,
+    MSG_ID_EVHD_WMOB_WANS_L4BNW_ATTACHED_RAT_IND,
+    MSG_ID_EVHD_WMOB_WANS_ESRVSTATE_REQ,
+    MSG_ID_EVHD_WMOB_WANS_ECNCFG_REQ,
+    MSG_ID_EVHD_WMOB_WANS_EWIFIEN_REQ,
+    MSG_ID_EVHD_WMOB_WANS_EWFCPREF_REQ,
+    MSG_ID_EVHD_WMOB_WANS_ELOCAEN_REQ,
+    MSG_ID_EVHD_WMOB_WANS_EIWLCFGSET_REQ,
+    MSG_ID_EVHD_WMOB_WANS_EIWLCFGGET_REQ,
+    MSG_ID_EVHD_WMOB_WANS_EPVSSET_REQ,
+    MSG_ID_EVHD_WMOB_WANS_EPVSGET_REQ,
+    MSG_ID_EVHD_WMOB_WANS_EIRAT_STATUS_REQ,
+
+    MSG_ID_EVHD_WMOB_WANS_WIFIMON_CFG_IND, // To WLC
+    MSG_ID_IPOL_WLC_UPDATE_PRIORITY_REQ,
+    MSG_ID_EVHD_WMOB_WANS_EIWLPLEN_REQ,    // AT+EIWLPLEN
+    MSG_ID_EVHD_WMOB_WANS_EIWLPL_IND,      // URC+EIWLPL
+
+    MSG_ID_EVHD_WMOB_WANS_LTECSR_INFO_CFG_REQ,
+    MSG_ID_EVHD_WMOB_WANS_LTECSR_INFO_CFG_CNF,
+    MSG_ID_EVHD_WMOB_WANS_LTECSR_INFO_RPT_IND,
+
+    MSG_ID_EVHD_WMOB_WANS_LTECSR_INFO_QUERY_REQ,
+    MSG_ID_EVHD_WMOB_WANS_LTECSR_INFO_QUERY_CNF,
+    MSG_ID_EVHD_WMOB_WANS_LTECSR_INFO_QUERY_IND,
+
+    // From WO
+    MSG_ID_EVHD_WMOB_WANS_WO_STATUS_IND,
+    MSG_ID_EVHD_WMOB_WANS_WO_DPD_CNF,
+    MSG_ID_EVHD_WMOB_WANS_WO_MOBIKE_IND,
+
+    MSG_ID_EVHD_WMOB_WANS_EIMSGEO_IND, // +EIMSGEO
+    MSG_ID_EVHD_WMOB_WANS_EIMSGEO_REQ, // AT+EIMSGEO
+
+    MSG_ID_EVHD_WMOB_WANS_EWFCRVOUT_IND, // +EWFCRVOUT
+    MSG_ID_EVHD_WMOB_WANS_EIWLPING_IND, //+EIWLPING
+    MSG_ID_EVHD_WMOB_WANS_EIWLPING_REQ, //AT+EIWLPING
+    MSG_ID_EVHD_WMOB_WANS_EIMSRCSCONN_REQ, //AT+EIMSRCSCONN
+    
+
+    MSG_ID_EVHD_WMOB_WANS_IMS_ECC_HO_REQ,
+    MSG_ID_EVHD_WMOB_WANS_IMS_CALL_STATUS_REQ,
+    MSG_ID_EVHD_WMOB_WANS_WIFI_SERVICE_FAIL_REQ,
+    MSG_ID_EVHD_WMOB_WANS_REG_RAN_PRIO_UPDATE_REQ,
+
+
+    MSG_ID_EVHD_WMOB_ME_DSBP_RECONFIGURE_REQ,
+    MSG_ID_EVHD_WMOB_WANS_L4C_SET_PWL_THRHD_CNF,
+    MSG_ID_EVHD_WMOB_WANS_L4C_IWLAN_PWR_LEVEL_IND,    
+    MSG_ID_EVHD_WMOB_WANS_L4C_IMS_SYS_INFO_IND,
+    MSG_ID_EVHD_WMOB_WANS_L4C_CSFB_FAIL_IND,
+
+    MSG_ID_EVHD_WMOB_WANS_SIP_CALL_PROGRESS_REQ,
+    MSG_ID_EVHD_WMOB_WANS_CALL_MEDIA_INFO_REQ,
+    MSG_ID_EVHD_WMOB_WANS_DUMP_RUNTIME_PARA_REQ, // AT+ECFGDRP 
+    
+    MSG_ID_EVHD_WMOB_WANS_PHONE_STATE_REQ,       // from L4BPWR
+    MSG_ID_EVHD_WMOB_WANS_MO_CONFIG_IND,         // from IMC: MO(Managed Object) config
+    MSG_ID_EVHD_WMOB_WANS_L4BNW_FORCE_BAR_IND,
+/****************************************************************************
+*                 <4> Desitnation: EVHD
+****************************************************************************/
+    /* from WMOB */
+    MSG_ID_EVHD_WMOB_WANS_CELL_SIGLEVEL_THRCGF_IND,
+    MSG_ID_EVHD_WMOB_WANS_WIFI_SIGLEVEL_THRCGF_IND,
+    MSG_ID_EVHD_WMOB_WANS_CALLQUALITY_THRCGF_IND,
+    MSG_ID_EVHD_WMOB_WANS_CELLREG_INFO_QUERY_IND,
+    MSG_ID_EVHD_WMOB_WANS_EOPS_INFO_QUERY_IND,
+    MSG_ID_EVHD_WMOB_WANS_SIGLEVEL_INFO_QUERY_IND,
+    MSG_ID_EVHD_WMOB_WANS_CALLQUALITY_INFO_QUERY_IND,
+    MSG_ID_EVHD_WMOB_WANS_ATP_IMSCFG_IND,             // To ATP
+    
+    MSG_ID_EVHD_WSEM_EWIFIPDNACT_IND,
+    MSG_ID_EVHD_WMOB_WANS_EWIFIEN_SYNCPS_IND,
+    MSG_ID_EVHD_WMOB_WANS_EWIFIASC_SYNCPS_IND,
+    MSG_ID_EVHD_WMOB_WANS_EWIFISIGLVL_SYNCPS_IND,
+    MSG_ID_EVHD_WMOB_WANS_EIWLCFGSET_IND, // for AT RSP
+    MSG_ID_EVHD_WMOB_WANS_EIWLCFGGET_IND, // for AT RSP
+    MSG_ID_EVHD_WMOB_WANS_EPVSSET_IND, // for AT RSP
+    MSG_ID_EVHD_WMOB_WANS_EPVSGET_IND, // for AT RSP
+
+    MSG_ID_EVHD_WMOB_ME_DSBP_RECONFIGURE_CNF,
+    MSG_ID_EVHD_WMOB_WANS_L4C_SET_PWL_THRHD_REQ,     // To L4C
+
+    MSG_ID_EVHD_WMOB_WANS_WO_DPD_REQ,                // To WO
+
+    MSG_ID_EVHD_WMOB_WANS_PHONE_STATE_CNF,           // To L4BPWR
+
+    MSG_ID_EVHD_WMOB_WANS_EAPMODE_REQ,
+
+    MSG_ID_EVHD_WMOB_WANS_IMS_ECC_HO_RSP,           // To IMC
+
+/****************************************************************************
+*                 <5> UT
+****************************************************************************/
+#ifdef __IWLAN_UT__
+    MSG_ID_IWLAN_WLFW_LWI_CONF_REQ,
+    MSG_ID_IWLAN_WLFW_LWI_START_STOP_REQ,
+    MSG_ID_WIPC_IWLAN_WLAN_LWA_CONNECT_IND,
+    MSG_ID_WIPC_IWLAN_WLAN_LWA_DISCONNECT_IND,
+    MSG_ID_WIPC_IWLAN_WLAN_MEASUREMENT_IND,
+    MSG_ID_WIPC_IWLAN_WLAN_MEASUREMENT_STOP_IND,
+    MSG_ID_IWLAN_ERRC_WLAN_MEASUREMENT_REQ,
+    MSG_ID_IWLAN_ERRC_WLAN_LWA_CONNECT_RSP,
+    MSG_ID_IWLAN_ERRC_WLAN_LWA_DISCONNECT_RSP,
+    MSG_ID_IWLAN_ERRC_WLAN_LWA_LOST_REQ,
+#endif
+    MSG_ID_IWLAN_IWLAN_CONFIG_LWX_REQ,
+    MSG_ID_IWLAN_IWLAN_QUERY_LWX_REQ,
+    MSG_ID_IWLAN_IWLAN_QUERY_LWX_CNF,
+    MSG_ID_IWLAN_WMOB_ILM_IT_EXT2INT_REQ,
+    MSG_ID_IWLAN_WMOB_ILM_IT_INT2EXT_REQ,
+    MSG_ID_IWLAN_WMOB_ILM_IT_EXT_REQ,    
+    MSG_ID_IWLAN_IWLAN_UT_DSBP_CALLBACK_REQ,
+    MSG_ID_EVHD_WMOB_UT_DSBP_CALLBACK_REQ,
+    MSG_ID_EVHD_WMOB_UT_CONFIG_IND,
+    MSG_ID_IWLAN_IWLAN_UT_MO_PARA_CFG_REQ,
+    MSG_ID_EVHD_WMOB_WANS_UT_MO_PARA_CFG_REQ,
+
+/******************************************************************************
+ *                      IWLAN TIMER EVENT                                     *
+ ******************************************************************************/
+    MSG_ID_IWLAN_TIMER_EVENT_NONE,
+
+    MSG_ID_MASF_TIMER_EVENT_TRTL_TIMEOUT,
+    MSG_ID_MASF_TIMER_EVENT_RAT_UNSTABLE_TIMEOUT,
+    MSG_ID_MASF_TIMER_EVENT_MEAS_TIMEOUT,
+    MSG_ID_MASF_TIMER_EVENT_EIWLPING_TIMEOUT,
+    MSG_ID_MASF_TIMER_EVENT_CALL_QOS_BKOFF_TIMEOUT,
+    MSG_ID_MASF_TIMER_EVENT_PCSCF_BKOFF_TIMEOUT,
+    MSG_ID_MASF_TIMER_EVENT_CALL_RECV_HO_HYS_TIMEOUT,
+    MSG_ID_MASF_TIMER_EVENT_RVOUT_ALERT_TIMEOUT,
+    
+/******************************************************************************
+ *                                 MASF                                       *
+ ******************************************************************************/
+
+
+// MTTsai TODO: define msgid for MASF, re-use wans MSG now
+// TODO: Only temp solution for functional UT
+    MSG_ID_IPOL_ICAP_UT_REQ,
+    MSG_ID_IPOL_ICAP_UT_RSP,
+
+/******************************************************************************
+ *                             GEN97 NEW MSG                                  *
+ ******************************************************************************/
+    MSG_ID_D2RM_IWLAN_PDN_INFO_NTF,
+    MSG_ID_MASF_SA_MODE_NTF,
+    MSG_ID_MASF_PDN_INFO_NTF,
+    MSG_ID_MASF_ECEVDP_URCRPT_REQ,
+    MSG_ID_MASF_DATA_INFO_UPDATE_NTF,
+
+    MSG_ID_D2RM_IWLAN_PDN_ACCSEL_REQ,
+    MSG_ID_D2RM_IWLAN_PDN_ACCSEL_IND,
+    MSG_ID_D2RM_IWLAN_PDN_ACCSEL_RSP,
+    MSG_ID_D2RM_IWLAN_PDN_ACCSEL_EVENT_IND,
+    MSG_ID_D2RM_IWLAN_WUIOFF_IND,
+
+    MSG_ID_EVHD_MASF_PDN_ACCSEL_REQ,
+    MSG_ID_EVHD_MASF_PDN_ACCSEL_IND,
+    MSG_ID_EVHD_MASF_PDN_ACCSEL_RSP,
+    MSG_ID_EVHD_MASF_PDN_ACCSEL_EVENT_IND,
+
+    MSG_ID_IWLAN_N3ANS_N3_PRIORITY_SUBSCRIBE_REQ,
+    MSG_ID_IWLAN_N3ANS_N3_PRIORITY_SUBSCRIBE_CNF,
+    MSG_ID_IWLAN_N3ANS_N3_PRIORITY_UNSUBSCRIBE_REQ,
+    MSG_ID_IWLAN_N3ANS_N3_PRIORITY_UNSUBSCRIBE_CNF,
+
+    MSG_ID_IWLAN_N3ANS_N3_PRIORITY_ACQUIRE_NTF,
+    MSG_ID_IWLAN_N3ANS_N3_PRIORITY_PROCESS_IND,
+    MSG_ID_IWLAN_N3ANS_N3_PRIORITY_PROCESS_RSP,
+
+    MSG_ID_EVHD_MASF_N3_PRIORITY_ACQUIRE_NTF,
+    MSG_ID_EVHD_MASF_N3_PRIORITY_PROCESS_IND,
+    MSG_ID_EVHD_MASF_N3_PRIORITY_PROCESS_RSP,
+
+    MSG_ID_IMC_IWLAN_IMS_CAP_INFO_IND,
+    MSG_ID_EVHD_MASF_IMS_CAP_INFO_IND,
+
+    MSG_ID_IMC_IWLAN_SRVCC_STATUS_UPDATE_REQ,
+    MSG_ID_MASF_SRVCC_STATUS_REQ,
+
+    MSG_ID_IMC_IWLAN_IMS_CC_SET_HVOLTE_CALL_DOMAIN_REQ,
+    MSG_ID_MASF_IMS_CC_SET_HVOLTE_CALL_DOMAIN_REQ,
+
+    MSG_ID_ATP_IWLAN_EVODATA_REQ,
+    MSG_ID_MASF_EVODATA_REQ,
+
+    /* Porting from ATP_IMC */
+    MSG_ID_ATP_IWLAN_EIMSINFO_REQ,
+    MSG_ID_MASF_EIMSINFO_REQ,
+
+    MSG_ID_ATP_IWLAN_EC2KREG_REQ,
+    MSG_ID_MASF_EC2KREG_REQ,
+
+    MSG_ID_ATP_IWLAN_EC2KCELL_REQ,
+    MSG_ID_MASF_EC2KCELL_REQ,
+
+    MSG_ID_ATP_IWLAN_EAFR_IND,
+    MSG_ID_MASF_EAFR_IND,
+
+    MSG_ID_ATP_IWLAN_ECMPCID_REQ,
+    MSG_ID_MASF_ECMPCID_REQ,
+
+    MSG_ID_ATP_IWLAN_MT_CS_PAGING_IND,
+    MSG_ID_MASF_MT_CS_PAGING_IND,
+
+    MSG_ID_ATP_IWLAN_CS_CALL_STATUS_IND,
+    MSG_ID_MASF_CS_CALL_STATUS_IND,
+
+    MSG_ID_ATP_IWLAN_SIM_INVALID_REQ,
+    MSG_ID_MASF_SIM_INVALID_REQ,
+
+    MSG_ID_ATP_IWLAN_OOS_START_REQ,
+    MSG_ID_MASF_OOS_START_REQ,
+
+    MSG_ID_ATP_IWLAN_OOS_END_REQ,
+    MSG_ID_MASF_OOS_END_REQ,
+
+    MSG_ID_IWLAN_DSBP_RECONFIGURE_IND,
+    MSG_ID_MASF_DSBP_RECONFIGURE_IND,
+
+    /* From IntCtrl */
+    MSG_ID_MASF_DATA_INFO_UPDATE_IND,
+
+    /* From WLC */
+    MSG_ID_MASF_WIFI_INFO_UPDATE_IND,
+    MSG_ID_MASF_EWIFIRSSITHR_REQ,
+    
+    /* To IMC */
+    MSG_ID_IMC_IWLAN_IMS_ROAMING_STATUS_IND,
+    MSG_ID_MASF_IMS_ROAMING_STATUS_IND,
+    
+    /* To L4 / from L4 */
+    MSG_ID_MASF_QUERY_CENTRIC_TYPE_REQ,    // AT+CEUS?
+    MSG_ID_MASF_CENTRIC_TYPE_IND,          // +CEUS:
+	
+	/* From ATP */
+    MSG_ID_ATP_IWLAN_CSFB_FAIL_IND,
+    MSG_ID_EVHD_WMOB_WANS_CSFB_FAIL_IND,
+
+/******************************************************************************
+ *                                MSG END                                     *
+ ******************************************************************************/
+MODULE_MSG_END( MSG_ID_IWLAN_CODE_TAIL )
+
+#endif  //_IWLAN_MSG_ID_H